Issue #56 added tests for custom headers, renamed headers and their constants to be consistent with other headers