Improved header field classes and added unit tests for them