basic test coverage on headers, refactoring of header views