Passing new win tests on and removing old ones