Few header tests and fixes