update test suite to work with MSVC++