Fixed Windows test issues