Address race condition in client tests (closes #784)
Merge pull request #794 from stevvooe/ng-client-race-condition

Address race condition in client tests (closes #784)