Renaming sorter. Add specs for sorting