Attempt to fix tests for windows