Made tests pass on Windows