Design improvements to Versa pipeline tools. And a test case\!