WIP: PUP-1133 Windows test failures