Improve code coverage, stabilize build
Merge pull request #166 from Metaswitch/rf-billing-headers

Reviewer: None - Improve code coverage, stabilize build