Fix order by tests