Merge "Unit tests for DeliveryRecord"