Changes so it is possible to run tests on windows