Try to fix test failures on Windows