Identity Test wait improvements
Merge pull request #544 from malconis/regression-fix

Regression Fix: Identity Test wait improvements