Fixing tests that were failing on Windows