Fixing some headers tests
Merge pull request #346 from untitaker/sprint-branch

Fixes