Clean up CreateOrderPolicy spec
Add AddAddressToCustomerPolicy