Better content header error and slight refactor of test helper

https://www.pivotaltracker.com/story/show/69911182

[Delivers #69911182]