Delivery service and test client added