Cleaned up imports in HeaderTool acceptance tests