tweak for MSVC, ran win32 tests