Further fixes to windows tests (PR #402)