[PATCH v2 2/2] Fix windows tests