Flesh out call diversion tests
More Barriers for reliability
Boilerplate reduction
More comments based on review feedback
Merge pull request #79 from Metaswitch/more_cdiv

[Reviewer: Mike] More CDiv tests