Adjust mapping for expectedDelivery. Add integration test for dealing with data updates.