Update tests after changing default sort order