Fix UT race condition
Merge pull request #107 from Metaswitch/jenkins_failures

[Reviewer: Rob][From: Alex] Fix intermittent UT race condition