Fix the e2e test to remove a race.