Refactoring header tests