Testcase fix-ups

[smurfix]

Some calls to sleep() are superfluous. Others are missing.

For missing sleep calls, retry a few times instead of using a worst-case timeout. The test run is slow enough as is.