Collection renamed to Shipment. Fixed template.
Test refactor