Further fixes to windows tests (PR #402)

(cherry picked from commit ce4e586565ab5881e17d01c97a4504a3eca64a0d)