Completed unsorted class and added tests