Fixes problems with tests on Windows