More Windows test fixes