windows tests fixes