Order, OrderItem models, factories and tests add-ons & other minor improvements