Rename get_order_argument to get_sort_argument
Update test cases
merge