Make self-test less flaky with more waits.