fixing windows tests, take 4