Fixes some tests to pass on windows