Try harder to fix test failures on Windows