Added possibility to test the delivery