Fixing tests on windows...