some cleanup
TestSort is back cc @namin