Fixing a few problems with the tests on windows