Fix Delivery output and test