Get Bono UTs working
Code review mark-ups
Code review mark-ups
Merge pull request #1 from Metaswitch/sto318

[Reviewer Keith] Get Bono UTs working