More support for windows in the tests