Update the overlord solution

Sleeps in tests are super expensive, as I'm sure you've noticed while running these tests. For a single test, they may not add up to much, but one of the reasons that our Cnuapp test suite takes hours to run is that we use sleep in this manner. Find a way to do this without the sleep calls.