Order by priority and locale

Also removing test comment since we have a real comment now for sr.