fix shipments creation during checkout process
green tests
small cleanup
cleanup