Fix random test failures.

Or at least I hope it will.  It makes sense anyhow that this is an async issue.