Enhance waits for intermittent fails
Merge pull request #398 from AndreiH/enhance_waits

Enhance waits for intermittent fails