Now tests pass on windows.