This reverts some of the previous attempts to get these test cases stable,
as those attempts actually prevented the testing of the desired code
paths.

Also make the test cases wait until the required requests are on the
waitinglist before continuing.