Live test fixes
Code review mark-ups
Merge pull request #17 from Metaswitch/lt_fixes

[Reviewer: Graeme] Live test fixes