Fix headers tests
Move and rename