Oops. New package ToolBuilderTests needed.