This removes PumpingWait from our test infrastructure and replaces it with proper await calls on the Task(s) in question.