Some tidy-ups
made the wait-period longer for this test.