Cleanup of sort state testbench