Got all tests to pass on windows!