tweak for MSVC build, ran win32 tests