Further fixes for windows tests