Updates to TestToolSearchPageController and ToolSearch