Using simple_order_cycle in spec

Before: 4 minutes 6.9 seconds
After:  3 minutes 27.4 seconds