[PATCH v3 2/3] Fix windows tests