Changed some sorter tests
Fixed some sort tests
Fixed some tests