Fix Windows test failures