Cleaning up test suite for deliery service functionality. TRAD-51 #time 3h