fixups from PR comments
Attempt to remove sleep calls from tests