2nd attempt at making tests pass on Linux and Win