I personally prefer to avoid letting tests affect how I would normally write my code. It's probably a minor concern but sorting by 2 fields adds another index into play in the database which might be nice to avoid? I'd opt for fixing the tests instead.