New logic in order.
Fix tests.