Refactor headers tests out