Fix breaking tests (sort_name issues)