Added DataPersistenceEx to CourierServiceImpl + Mockito tests for DeliveryService