Fixing tests for Windows