Properly access header; begin to test
Make testing more generic