Fix tests (for precedent changes), remove get_basic_sort_link