Cleaned up unit test for HeaderTool