Take sort out of the test pipelines, the tool now does its own.

All regression tests pass.