Fix Windows test issues