Fix remaining order by tests