Removed header field enum, improved test coverage.