Made tests pass on Win too