updates to cmd utils.
fixed the delivery unit test.