Fix assembly_shipment_serializer, and fix some other specs as well.