all tests pass on windows with this commit