get some more tests to pass on windows