Windows test fixes

This makes all tests pass on Windows