Merge "Get test to build with MSVC" into nextgenv2