Refactored HeaderTool acceptance tests slightly