fixed several tests on windows