[#47242447] Add workflow test tools: two inputs and one/two outputs.  Code cleanup.