TST7337: Fix more tests in windows
Merge pull request #7414 from ahlmss/tst7337_again

TST7337: Fix more tests in windows