This *should* make tests pass on windows