Clean up and add test for ToolInformation