Fixing tests on Windows