modifications to pass tests on windows