Some provisional changes to get more tests to run on Windows (I hope).
1 file changed