Make tests pass on win