Tried to improve the tests on windows