Update tests to have Waiter expect resumes prior to waiting