Cleaning up the shipment packer some more
Changing to ordinary class to prevent ferrying bunches of variables
Adding missing tests for new shipments