more tests passing on windows