updates to trackers for shipments and some tests