3.0 windows

Make a few more tests pass on Windows.
Those are around DS being wrong for comparison, thus the tests failed.