Attempt to fix tests on MSVC