Merge "Fix MSVS builds for unit test changes"