msvc changes in tests, but tests not yet working there