Restore old order for MR lists. Fix failing tests