Order by priority AND locale

I found the current order pretty confusing. Also removing test comment since we have a real comment now for sr.