Shortened test time for utils/wait.py
More flakey goodness
Merge pull request #226 from psav/enhance_wait_for

Shortened test time for utils/wait.py

It's so fast!
Merge pull request #230 from psav/flakey-goodness

More flakey goodness