I didn't touch internal of that test case but replaced Thread.sleep by sleepSeconds(your suggestion) whenever i saw.
Those are just small refactorings...