Merge "Add Unit Tests for Delivery"