more changes to get the test suite working on windows