Fix tests on MSVC, take 2.