Merge "Unit Tests for DeliveryQueue"