[test_delivery_ind] Housekeeping