cleans up setup of header integration test
Merge pull request #1632 from velesin/header_integration_test_clean_up

cleans up setup of header integration test