improve windows tests