[PATCH v4 2/4] Fix windows tests