Get the test suite passing on windows again.