Fix some more tests on Windows