Make test for headers more specific.
Refine helpers and tests.