Improve collection ordering.
Break total-order tests into smaller units.