Unit test improvement
[ric-plt/submgr.git] / pkg / control / ut_messaging_test.go
index 63ffaaf..2a3ad96 100644 (file)
 package control
 
 import (
+       //"os"
        "strings"
        "testing"
        "time"
 
        "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
        "gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap_wrapper"
+       "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/teststube2ap"
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
        "github.com/stretchr/testify/assert"
 )
 
 func TestSuiteSetup(t *testing.T) {
-       // The effect of this call shall endure thgough the UT suite!
-       // If this causes any issues, the previout interface can be restored
+       // The effect of this call shall endure though the UT suite!
+       // If this causes any issues, the previous interface can be restored
        // like this:git log
        // SetPackerIf(e2ap_wrapper.NewAsn1E2APPacker())
 
+       mainCtrl.InitAllCounterMap()
        SetPackerIf(e2ap_wrapper.NewUtAsn1E2APPacker())
+       mainCtrl.c.restDuplicateCtrl.Init()
 
-       restDuplicateCtrl.Init()
+}
+func TestRanStatusChangeViaSDLNotification(t *testing.T) {
+
+       // Current UT test cases use these ran names
+       xappRnibMock.CreateGnb("RAN_NAME_1", entities.ConnectionStatus_DISCONNECTED)
+       xappRnibMock.CreateGnb("RAN_NAME_11", entities.ConnectionStatus_DISCONNECTED)
+       xappRnibMock.CreateGnb("RAN_NAME_2", entities.ConnectionStatus_DISCONNECTED)
+
+       mainCtrl.c.e2IfState.ReadE2ConfigurationFromRnib()
+       mainCtrl.c.e2IfState.SubscribeChannels()
+
+       mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
+       mainCtrl.SetE2State(t, "RAN_NAME_2_CONNECTED")
+       mainCtrl.SetE2State(t, "RAN_NAME_11_CONNECTED")
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTSubReqAfterE2ConnBreak
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |         [E2 Conn. DOWN]        |
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     |     RESTSubFail |              |
+//     |<----------------|              |
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
+func TestRESTSubReqAfterE2ConnBreak(t *testing.T) {
+       CaseBegin("TestRESTSubReqAfterE2ConnBreak")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestReqRejDueE2Down, 1},
+       })
+
+       // E2 disconnect after E2term has received response
+       mainCtrl.SetE2State(t, "RAN_NAME_1_DISCONNECTED")
+       // Req
+       const subReqCount int = 1
+       params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
+       xappConn1.SendRESTSubsReq(t, params)
+
+       // Restore E2 connection for following test cases
+       mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
+
+       mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
+       //os.Exit(0)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTSubReqE2ConnBreak
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |         [E2 Conn. DOWN]        |
+//     |        [Int. SUBS DELETE]      |
+//     |                 |              |
+//     |      RESTNotif(unsuccessful)   |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+func TestRESTSubReqE2ConnBreak(t *testing.T) {
+       CaseBegin("TestRESTSubReqE2ConnBreak")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubRespFromE2, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
+       })
+
+       // Req
+       const subReqCount int = 1
+       params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
+       restSubId := xappConn1.SendRESTSubsReq(t, params)
+
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       xappConn1.ExpectRESTNotification(t, restSubId)
+
+       // E2 disconnect after E2term has received response
+       mainCtrl.SetE2State(t, "RAN_NAME_1_DISCONNECTED")
+
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
+       e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
+
+       <-time.After(time.Second * 1)
+       assert.Equal(t, 0, len(mainCtrl.c.registry.register))
+       assert.Equal(t, 0, len(mainCtrl.c.registry.restSubscriptions))
+
+       subIds, register, err := mainCtrl.c.ReadAllSubscriptionsFromSdl()
+       if err != nil {
+               xapp.Logger.Error("%v", err)
+       } else {
+               assert.Equal(t, 65534, len(subIds)) // range 1-65535 , FFFF = 65535
+               assert.Equal(t, 0, len(register))
+       }
+
+       restSubscriptions, err := mainCtrl.c.ReadAllRESTSubscriptionsFromSdl()
+       if err != nil {
+               xapp.Logger.Error("%v", err)
+       } else {
+               assert.Equal(t, 0, len(restSubscriptions))
+       }
+
+       // Restore E2 connection for following test cases
+       mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
+
+       // Wait that subs is cleaned
+       waitSubsCleanup(t, e2SubsId, 10)
+       mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTSubscriptionDeleteAfterE2ConnectionBreak
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |            [SUBS CREATE]       |
+//     |                 |              |
+//     |           [E2 Conn. DOWN]      |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |  [No valid subscription found] |
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+func TestRESTSubscriptionDeleteAfterE2ConnectionBreak(t *testing.T) {
+       xapp.Logger.Debug("TEST: TestRESTSubscriptionDeleteAfterE2ConnectionBreak")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubRespFromE2, 1},
+               Counter{cRestSubNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+       })
+
+       // Req
+       var params *teststube2ap.RESTSubsReqParams = nil
+       restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
+
+       // E2 disconnect after E2term has received response
+       mainCtrl.SetE2State(t, "RAN_NAME_1_DISCONNECTED")
+
+       // Del
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
+       <-time.After(time.Second * 1)
+       assert.Equal(t, 0, len(mainCtrl.c.registry.register))
+       assert.Equal(t, 0, len(mainCtrl.c.registry.restSubscriptions))
+
+       subIds, register, err := mainCtrl.c.ReadAllSubscriptionsFromSdl()
+       if err != nil {
+               xapp.Logger.Error("%v", err)
+       } else {
+               assert.Equal(t, 65534, len(subIds)) // range 1-65535 , FFFF = 65535
+               assert.Equal(t, 0, len(register))
+       }
 
+       restSubscriptions, err := mainCtrl.c.ReadAllRESTSubscriptionsFromSdl()
+       if err != nil {
+               xapp.Logger.Error("%v", err)
+       } else {
+               assert.Equal(t, 0, len(restSubscriptions))
+       }
+
+       // Restore E2 connection for following test cases
+       mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
+
+       // Wait that subs is cleaned
+       mainCtrl.wait_subs_clean(t, e2SubsId, 10)
+
+       xappConn1.TestMsgChanEmpty(t)
+       e2termConn1.TestMsgChanEmpty(t)
+       mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
+}
+
+//-----------------------------------------------------------------------------
+// TestRESTOtherE2ConnectionChanges
+//
+
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     |            [SUBS CREATE]       |
+//     |                 |              |
+//     |  [E2 CONNECTED_SETUP_FAILED]   |
+//     |         [E2 CONNECTING]        |
+//     |        [E2 SHUTTING_DOWN]      |
+//     |          [E2 SHUT_DOWN]        |
+//     |                 |              |
+//     |            [SUBS DELETE]       |
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+func TestRESTOtherE2ConnectionChanges(t *testing.T) {
+       xapp.Logger.Debug("TEST: TestRESTOtherE2ConnectionChanges")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubRespFromE2, 1},
+               Counter{cRestSubNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelRespFromE2, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+       })
+
+       // Req
+       params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
+       restSubId := xappConn1.SendRESTSubsReq(t, params)
+
+       crereq, cremsg := e2termConn1.RecvSubsReq(t)
+       xappConn1.ExpectRESTNotification(t, restSubId)
+       e2termConn1.SendSubsResp(t, crereq, cremsg)
+       e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
+
+       // Submgr should not react any other connection state changes than CONNECTED and DISCONNECTED
+       mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED_SETUP_FAILED")
+       mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTING")
+       mainCtrl.SetE2State(t, "RAN_NAME_1_SHUTTING_DOWN")
+       mainCtrl.SetE2State(t, "RAN_NAME_1_SHUT_DOWN")
+
+       // Del
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+       // Restore E2 connection for following test cases
+       mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
+
+       // Wait that subs is cleaned
+       waitSubsCleanup(t, e2SubsId, 10)
+       mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -90,6 +367,7 @@ func TestRESTSubReqAndDeleteOkWithE2apUtWrapper(t *testing.T) {
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId)
 
        waitSubsCleanup(t, e2SubsId, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -136,6 +414,7 @@ func TestRESTSubReqAndE1apDeleteReqPackingError(t *testing.T) {
        defer e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_DEL_REQ, true)
 
        waitSubsCleanup(t, e2SubsId, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -198,6 +477,7 @@ func TestRESTSubReqAndE1apDeleteRespUnpackingError(t *testing.T) {
        defer e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_DEL_RESP, true)
 
        waitSubsCleanup(t, e2SubsId, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -455,6 +735,7 @@ func TestSubMergeDelAndRouteUpdateNok(t *testing.T) {
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cSubReqFromXapp, 2},
+               Counter{cMergedSubscriptions, 1},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
                Counter{cSubRespToXapp, 2},
@@ -463,6 +744,7 @@ func TestSubMergeDelAndRouteUpdateNok(t *testing.T) {
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cSubDelRespToXapp, 2},
+               Counter{cUnmergedSubscriptions, 1},
        })
 
        //Req1
@@ -989,6 +1271,7 @@ func TestSubReqRetryInSubmgr(t *testing.T) {
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cSubReqFromXapp, 1},
                Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubRespFromE2, 1},
                Counter{cSubRespToXapp, 1},
@@ -1175,12 +1458,6 @@ func TestSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
 //     |              |      SubFail |
 //     |              |<-------------|
 //     |              |              |
-//     |              | SubDelReq    |
-//     |              |------------->|
-//     |              |              |
-//     |              |   SubDelResp |
-//     |              |<-------------|
-//     |              |              |
 //     |      SubFail |              |
 //     |<-------------|              |
 //     |              |              |
@@ -1206,10 +1483,6 @@ func TestSubReqSubFailRespInSubmgr(t *testing.T) {
        fparams1.Set(crereq1)
        e2termConn1.SendSubsFail(t, fparams1, cremsg1)
 
-       // E2t: Receive SubsDelReq and send SubsDelResp (internal first)
-       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
-       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
-
        // Xapp: Receive SubsFail
        e2SubsId := xappConn1.RecvSubsFail(t, cretrans)
 
@@ -1484,8 +1757,6 @@ func TestSubReqAndSubDelOkSameAction(t *testing.T) {
        rparams2 := &teststube2ap.E2StubSubsReqParams{}
        rparams2.Init()
        cretrans2 := xappConn2.SendSubsReq(t, rparams2, nil)
-       //crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
-       //e2termConn1.SendSubsResp(t, crereq2, cremsg2)
        e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2)
 
        resp, _ := xapp.Subscription.QuerySubscriptions()
@@ -1495,11 +1766,7 @@ func TestSubReqAndSubDelOkSameAction(t *testing.T) {
 
        //Del1
        deltrans1 := xappConn1.SendSubsDelReq(t, nil, e2SubsId1)
-       //e2termConn1.RecvSubsDelReq(t)
-       //e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
        xappConn1.RecvSubsDelResp(t, deltrans1)
-       //Wait that subs is cleaned
-       //mainCtrl.wait_subs_clean(t, e2SubsId1, 10)
 
        //Del2
        deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2)
@@ -1621,11 +1888,6 @@ func TestSubReqAndSubDelOkSameActionParallel(t *testing.T) {
 //     |             |              |    SubFail1  |
 //     |             |              |<-------------|
 //     |             |              |              |
-//     |             |              | SubDelReq    |
-//     |             |              |------------->|
-//     |             |              |   SubDelResp |
-//     |             |              |<-------------|
-//     |             |              |              |
 //     |             |    SubFail1  |              |
 //     |             |<-------------|              |
 //     |             |              |              |
@@ -1656,10 +1918,6 @@ func TestSubReqAndSubDelNokSameActionParallel(t *testing.T) {
        fparams1.Set(crereq1)
        e2termConn1.SendSubsFail(t, fparams1, cremsg1)
 
-       // E2t: internal delete
-       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
-       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
-
        //Fail1
        e2SubsId1 := xappConn1.RecvSubsFail(t, cretrans1)
        //Fail2
@@ -2117,9 +2375,6 @@ func TestSubReqRetransmissionWithSameSubIdDiffXid(t *testing.T) {
 func TestSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
        CaseBegin("TestSubReqNokAndSubDelOkWithRestartInMiddle")
 
-       // Remove possible existing subscrition
-       mainCtrl.removeExistingSubscriptions(t)
-
        mainCtrl.SetResetTestFlag(t, true) // subs.DoNotWaitSubResp will be set TRUE for the subscription
        xappConn1.SendSubsReq(t, nil, nil)
        e2termConn1.RecvSubsReq(t)
@@ -2134,6 +2389,7 @@ func TestSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
        mainCtrl.SimulateRestart(t)
        xapp.Logger.Debug("mainCtrl.SimulateRestart done")
 
+       // Submgr send delete for uncompleted subscription
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
@@ -2200,6 +2456,10 @@ func TestSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
        mainCtrl.SimulateRestart(t)
        xapp.Logger.Debug("mainCtrl.SimulateRestart done")
 
+       // ReadE2Subscriptions() for testing is running in own go routine (go mainCtrl.c.ReadE2Subscriptions())
+       // That needs to be completed before successful subscription query is possible
+       <-time.After(time.Second * 1)
+
        // Check that subscription is restored correctly after restart
        resp, _ = xapp.Subscription.QuerySubscriptions()
        assert.Equal(t, resp[0].SubscriptionID, int64(e2SubsId))
@@ -2294,7 +2554,7 @@ func TestSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
        e2SubsId2 := xappConn2.RecvSubsResp(t, cretrans2)
 
        // Check subscription
-       resp, _ := xapp.Subscription.QuerySubscriptions() ////////////////////////////////
+       resp, _ := xapp.Subscription.QuerySubscriptions()
        assert.Equal(t, resp[0].SubscriptionID, int64(e2SubsId1))
        assert.Equal(t, resp[0].Meid, "RAN_NAME_1")
        assert.Equal(t, resp[0].ClientEndpoint, []string{"localhost:13560", "localhost:13660"})
@@ -2302,6 +2562,10 @@ func TestSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
        mainCtrl.SimulateRestart(t)
        xapp.Logger.Debug("mainCtrl.SimulateRestart done")
 
+       // ReadE2Subscriptions() for testing is running in own go routine (go mainCtrl.c.ReadE2Subscriptions())
+       // That needs to be completed before successful subscription query is possible
+       <-time.After(time.Second * 1)
+
        // Check that subscription is restored correctly after restart
        resp, _ = xapp.Subscription.QuerySubscriptions()
        assert.Equal(t, resp[0].SubscriptionID, int64(e2SubsId1))
@@ -2317,6 +2581,10 @@ func TestSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
        mainCtrl.SimulateRestart(t)
        xapp.Logger.Debug("mainCtrl.SimulateRestart done")
 
+       // ReadE2Subscriptions() for testing is running in own go routine (go mainCtrl.c.ReadE2Subscriptions())
+       // Submgr need be ready before successful subscription deletion is possible
+       <-time.After(time.Second * 1)
+
        //Del2
        deltrans2 := xappConn2.SendSubsDelReq(t, nil, e2SubsId2)
        delreq2, delmsg2 := e2termConn1.RecvSubsDelReq(t)
@@ -2370,6 +2638,11 @@ func TestPostEmptyDb(t *testing.T) {
        mainCtrl.sendPostRequest(t, "localhost:8080", "/ric/v1/test/emptydb")
 }
 
+func TestGetRestSubscriptions(t *testing.T) {
+
+       mainCtrl.sendGetRequest(t, "localhost:8080", "/ric/v1/restsubscriptions")
+}
+
 //-----------------------------------------------------------------------------
 // TestRESTSubReqAndRouteNok
 //
@@ -2414,6 +2687,7 @@ func TestRESTSubReqAndRouteNok(t *testing.T) {
        })
 
        const subReqCount int = 1
+
        // Add delay for rtmgt HTTP handling so that HTTP response is received before notify on XAPP side
        waiter := rtmgrHttp.AllocNextSleep(50, false)
        newSubsId := mainCtrl.get_registry_next_subid(t)
@@ -2425,7 +2699,7 @@ func TestRESTSubReqAndRouteNok(t *testing.T) {
        waiter.WaitResult(t)
 
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", e2SubsId)
 
        // Del
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
@@ -2434,6 +2708,7 @@ func TestRESTSubReqAndRouteNok(t *testing.T) {
        mainCtrl.wait_subs_clean(t, newSubsId, 10)
        waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
@@ -2448,10 +2723,10 @@ func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
                Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubFailNotifToXapp, 1},
                Counter{cRouteCreateUpdateFail, 1},
-               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
-               Counter{cRestSubDelRespToXapp, 1},
+               Counter{cRestSubDelRespToXapp, 2},
        })
 
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -2467,21 +2742,22 @@ func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
        params = xappConn2.GetRESTSubsReqReportParams(subReqCount)
        params.SetMeid("RAN_NAME_1")
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for second subscriber : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for second subscriber : %v", restSubId2)
        xappConn2.ExpectRESTNotificationNok(t, restSubId2, "allFail")
        waiter.WaitResult(t)
-       // e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2) - TOD: missing delete
        xappConn2.WaitRESTNotification(t, restSubId2)
 
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
 
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId)
+       xappConn2.SendRESTSubsDelReq(t, &restSubId2)
 
        mainCtrl.wait_subs_clean(t, newSubsId, 10)
        //Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubDelReqAndRouteDeleteNok(t *testing.T) {
@@ -2515,8 +2791,8 @@ func TestRESTSubDelReqAndRouteDeleteNok(t *testing.T) {
        waiter.WaitResult(t)
 
        waitSubsCleanup(t, e2SubsId, 10)
-
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
@@ -2524,6 +2800,7 @@ func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cMergedSubscriptions, 1},
                Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
@@ -2533,6 +2810,7 @@ func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 2},
+               Counter{cUnmergedSubscriptions, 1},
        })
 
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -2556,8 +2834,8 @@ func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
        deleteXapp2Subscription(t, &restSubId2)
 
        waitSubsCleanup(t, e2SubsId2, 10)
-
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -2613,33 +2891,32 @@ func TestRESTSubReqRetransmission(t *testing.T) {
        // Subs Create
        const subReqCount int = 1
 
-       // In order to force both XAPP's to create their own subscriptions, force rtmgr to block a while so that 2nd create
-       // gets into execution before the rtmgrg responds for the first one.
-       waiter := rtmgrHttp.AllocNextSleep(10, true)
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
-       restSubId1 := xappConn1.SendRESTSubsReq(t, params)
-       xappConn2.SendRESTSubsReq(t, params)
+       restSubId := xappConn1.SendRESTSubsReq(t, params)
 
-       waiter.WaitResult(t)
+       xappConn1.SendRESTSubsReq(t, params)
+       <-time.After(time.Second * 1)
 
-       xappConn1.WaitListedRestNotifications(t, []string{restSubId1})
+       xappConn1.WaitListedRestNotifications(t, []string{restSubId})
 
        // Depending one goroutine scheduling order, we cannot say for sure which xapp reaches e2term first. Thus
-       // the order is not significant he6re.
+       // the order is not significant here.
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
 
-       e2SubsIdA := <-xappConn1.ListedRESTNotifications
-       xapp.Logger.Info("TEST: 1.st XAPP notification received e2SubsId=%v", e2SubsIdA)
+       e2SubsId := <-xappConn1.ListedRESTNotifications
+
+       xapp.Logger.Debug("TEST: XAPP notification received e2SubsId=%v", e2SubsId)
 
        // Del1
-       xappConn1.SendRESTSubsDelReq(t, &restSubId1)
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
        delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
        e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
 
-       mainCtrl.wait_multi_subs_clean(t, []uint32{e2SubsIdA.E2SubsId}, 10)
+       mainCtrl.wait_multi_subs_clean(t, []uint32{e2SubsId.E2SubsId}, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -2689,6 +2966,7 @@ func TestRESTSubReqRetransmissionV2(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
+               Counter{cDuplicateE2SubReq, 2},
                Counter{cRestSubRespToXapp, 3},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
@@ -2705,26 +2983,27 @@ func TestRESTSubReqRetransmissionV2(t *testing.T) {
 
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
 
+       mainCtrl.WaitOngoingRequestMapEmpty()
+
        //1.st resend
        restSubId_resend := xappConn1.SendRESTSubsReq(t, params)
 
        assert.Equal(t, restSubId_resend, restSubId)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        //2.nd resend
        restSubId_resend2 := xappConn1.SendRESTSubsReq(t, params)
 
        assert.Equal(t, restSubId_resend2, restSubId)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId)
 
        waitSubsCleanup(t, e2SubsId, 10)
-
-       //Wait that subs is cleaned
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -2773,6 +3052,7 @@ func TestRESTSubReqRetransmissionV3(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
+               Counter{cDuplicateE2SubReq, 2},
                Counter{cRestSubRespToXapp, 3},
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
@@ -2789,7 +3069,7 @@ func TestRESTSubReqRetransmissionV3(t *testing.T) {
 
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        //1.st resend with subscription ID
        params.SetSubscriptionID(&restSubId)
@@ -2797,7 +3077,7 @@ func TestRESTSubReqRetransmissionV3(t *testing.T) {
 
        assert.Equal(t, restSubId_resend, restSubId)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        //2.nd resend without subscription ID (faking app restart)
        params = xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -2805,14 +3085,13 @@ func TestRESTSubReqRetransmissionV3(t *testing.T) {
 
        assert.Equal(t, restSubId_resend2, restSubId)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId)
 
        waitSubsCleanup(t, e2SubsId, 10)
-
-       //Wait that subs is cleaned
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -2877,6 +3156,7 @@ func TestRESTSubReqRetransmissionV4(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
+               Counter{cDuplicateE2SubReq, 2},
                Counter{cRestSubRespToXapp, 3},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
@@ -2891,43 +3171,50 @@ func TestRESTSubReqRetransmissionV4(t *testing.T) {
 
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        // Send modified  requst, this time with e2 subscriptions.
        params2 := xappConn1.GetRESTSubsReqReportParams(subReqCount + 1)
        params2.SetSubscriptionID(&restSubId)
 
        xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
-       xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+       xappConn1.ExpectAnyNotification(t)
        // Resend the original request with an additional e2 subscription (detail), this time with restsubsid
        restSubId_resend := xappConn1.SendRESTSubsReq(t, params2)
+       e2SubsId1 := xappConn1.WaitAnyRESTNotification(t)
+       assert.Equal(t, e2SubsId, e2SubsId1)
 
        crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
 
+       xappConn1.DecrementRequestCount()
        xappConn1.ExpectRESTNotification(t, restSubId_resend)
        e2termConn1.SendSubsResp(t, crereq2, cremsg2)
        e2SubsId2 := xappConn1.WaitRESTNotification(t, restSubId_resend)
        assert.NotEqual(t, e2SubsId2, 0)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
        params = xappConn1.GetRESTSubsReqReportParams(subReqCount)
        params.SetSubscriptionID(&restSubId)
-       xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+       xappConn1.ExpectAnyNotification(t)
        // Resend the original request again with only one e2 subscription (detail), this time with restsubsid
        restSubId_resend2 := xappConn1.SendRESTSubsReq(t, params)
        assert.Equal(t, restSubId_resend, restSubId_resend2)
 
+       e2SubsId1 = xappConn1.WaitAnyRESTNotification(t)
+       assert.Equal(t, e2SubsId, e2SubsId1)
+
+       mainCtrl.WaitOngoingRequestMapEmpty()
+
        // Delete both e2 subscriptions
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
        e2SubsIds := []uint32{e2SubsId, e2SubsId2}
        sendAndReceiveMultipleE2DelReqs(t, e2SubsIds, e2termConn1)
 
        waitSubsCleanup(t, e2SubsId, 10)
-
-       //Wait that subs is cleaned
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -2992,6 +3279,7 @@ func TestRESTSubReqRetransmissionV5(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
+               Counter{cDuplicateE2SubReq, 2},
                Counter{cRestSubRespToXapp, 3},
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 2},
@@ -3006,17 +3294,22 @@ func TestRESTSubReqRetransmissionV5(t *testing.T) {
 
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        // Send modified  requst, this time with e2 subscriptions.
        params2 := xappConn1.GetRESTSubsReqReportParams(subReqCount + 1)
        params2.SetSubscriptionID(&restSubId)
 
        xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
-       xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+       xappConn1.ExpectAnyNotification(t)
        // Resend the original request with an additional e2 subscription (detail), this time with restsubsid
        restSubId_resend := xappConn1.SendRESTSubsReq(t, params2)
 
+       e2SubsId1 := xappConn1.WaitAnyRESTNotification(t)
+       assert.Equal(t, e2SubsId, e2SubsId1)
+       // The first E2 subscription returns immediately, manually decrement expected request count for the remaining request handling
+       xappConn1.DecrementRequestCount()
+
        crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
 
        xappConn1.ExpectRESTNotification(t, restSubId_resend)
@@ -3024,25 +3317,29 @@ func TestRESTSubReqRetransmissionV5(t *testing.T) {
        e2SubsId2 := xappConn1.WaitRESTNotification(t, restSubId_resend)
        assert.NotEqual(t, e2SubsId2, 0)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
        params = xappConn1.GetRESTSubsReqReportParams(subReqCount)
-       xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+       xappConn1.ExpectAnyNotification(t)
        // Resend the original request again with only one e2 subscription (detail), WITHOUT restsubsid
        // md5sum shall find the original request
        restSubId_resend2 := xappConn1.SendRESTSubsReq(t, params)
        assert.Equal(t, restSubId_resend, restSubId_resend2)
 
+       e2SubsId1 = xappConn1.WaitAnyRESTNotification(t)
+       assert.Equal(t, e2SubsId, e2SubsId1)
+
+       mainCtrl.WaitOngoingRequestMapEmpty()
+
        // Delete both e2 subscriptions
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
        e2SubsIds := []uint32{e2SubsId, e2SubsId2}
        sendAndReceiveMultipleE2DelReqs(t, e2SubsIds, e2termConn1)
 
        waitSubsCleanup(t, e2SubsId, 10)
-
-       //Wait that subs is cleaned
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3116,6 +3413,7 @@ func TestRESTSubReqRetransmissionV6(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
+               Counter{cDuplicateE2SubReq, 1},
                Counter{cRestSubRespToXapp, 3},
                Counter{cSubReqToE2, 3},
                Counter{cSubRespFromE2, 3},
@@ -3130,17 +3428,20 @@ func TestRESTSubReqRetransmissionV6(t *testing.T) {
 
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        // Send modified  requst, this time with e2 subscriptions.
        params2 := xappConn1.GetRESTSubsReqReportParams(subReqCount + 1)
        params2.SetSubscriptionID(&restSubId)
 
        xapp.Subscription.SetResponseCB(xappConn1.SubscriptionRespHandler)
-       xappConn1.WaitRESTNotificationForAnySubscriptionId(t)
+       xappConn1.ExpectAnyNotification(t)
        // Resend the original request with an additional e2 subscription (detail), this time with restsubsid
        restSubId_resend := xappConn1.SendRESTSubsReq(t, params2)
 
+       e2SubsId1 := xappConn1.WaitAnyRESTNotification(t)
+       assert.Equal(t, e2SubsId, e2SubsId1)
+
        crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
 
        xappConn1.ExpectRESTNotification(t, restSubId_resend)
@@ -3148,7 +3449,7 @@ func TestRESTSubReqRetransmissionV6(t *testing.T) {
        e2SubsId2 := xappConn1.WaitRESTNotification(t, restSubId_resend)
        assert.NotEqual(t, e2SubsId2, 0)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        // Delete both e2 subscriptions
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
@@ -3162,14 +3463,13 @@ func TestRESTSubReqRetransmissionV6(t *testing.T) {
        // fresh create.
        restSubId, e2SubsId = createSubscription(t, xappConn1, e2termConn1, params)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId)
 
        waitSubsCleanup(t, e2SubsId, 10)
-
-       //Wait that subs is cleaned
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubDelReqRetransmission(t *testing.T) {
@@ -3184,7 +3484,7 @@ func TestRESTSubDelReqRetransmission(t *testing.T) {
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
-               Counter{cRestSubDelRespToXapp, 1},
+               Counter{cRestSubDelRespToXapp, 2},
        })
 
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -3205,8 +3505,8 @@ func TestRESTSubDelReqRetransmission(t *testing.T) {
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        waitSubsCleanup(t, e2SubsId, 10)
-
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3248,6 +3548,7 @@ func TestRESTSubReqDelReq(t *testing.T) {
                Counter{cSubRespFromE2, 1},
                Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 2},
+               Counter{cRestSubDelFailToXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 1},
@@ -3277,7 +3578,7 @@ func TestRESTSubReqDelReq(t *testing.T) {
        // Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubDelReqCollision(t *testing.T) {
@@ -3302,12 +3603,12 @@ func TestRESTSubReqAndSubDelOkTwoParallel(t *testing.T) {
        //Req1
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId1 := xappConn1.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send 1st REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send 1st REST subscriber request for subscriberId : %v", restSubId1)
 
        //Req2
        params = xappConn2.GetRESTSubsReqReportParams(subReqCount)
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send 2nd REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send 2nd REST subscriber request for subscriberId : %v", restSubId2)
 
        crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
        crereq2, cremsg2 := e2termConn1.RecvSubsReq(t)
@@ -3321,9 +3622,9 @@ func TestRESTSubReqAndSubDelOkTwoParallel(t *testing.T) {
        e2termConn1.SendSubsResp(t, crereq2, cremsg2)
 
        e2SubsIdA := <-xappConn1.ListedRESTNotifications
-       xapp.Logger.Info("TEST: 1.st XAPP notification received e2SubsId=%v", e2SubsIdA)
+       xapp.Logger.Debug("TEST: 1.st XAPP notification received e2SubsId=%v", e2SubsIdA)
        e2SubsIdB := <-xappConn1.ListedRESTNotifications
-       xapp.Logger.Info("TEST: 2.nd XAPP notification received e2SubsId=%v", e2SubsIdB)
+       xapp.Logger.Debug("TEST: 2.nd XAPP notification received e2SubsId=%v", e2SubsIdB)
 
        //Del1
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId1)
@@ -3335,7 +3636,7 @@ func TestRESTSubReqAndSubDelOkTwoParallel(t *testing.T) {
        waitSubsCleanup(t, e2SubsIdB.E2SubsId, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSameSubsDiffRan(t *testing.T) {
@@ -3355,12 +3656,12 @@ func TestRESTSameSubsDiffRan(t *testing.T) {
 
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send 1st REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send 1st REST subscriber request for subscriberId : %v", restSubId1)
 
        params = xappConn1.GetRESTSubsReqReportParams(subReqCount)
        params.SetMeid("RAN_NAME_2")
        restSubId2, e2SubsId2 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send 2nd REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send 2nd REST subscriber request for subscriberId : %v", restSubId2)
 
        //Del1
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId1)
@@ -3372,7 +3673,7 @@ func TestRESTSameSubsDiffRan(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqRetryInSubmgr(t *testing.T) {
@@ -3383,6 +3684,7 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) {
                Counter{cRestSubReqFromXapp, 1},
                Counter{cRestSubRespToXapp, 1},
                Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubRespFromE2, 1},
                Counter{cRestSubNotifToXapp, 1},
@@ -3395,11 +3697,11 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) {
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
 
-       xapp.Logger.Info("Send REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriber : %v", restSubId)
 
        // Catch the first message and ignore it
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
-       xapp.Logger.Info("Ignore REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore REST subscriber request for subscriber : %v", restSubId)
 
        // The second request is being handled normally
        crereq, cremsg = e2termConn1.RecvSubsReq(t)
@@ -3416,7 +3718,7 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) {
        waitSubsCleanup(t, e2SubsId, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3468,29 +3770,34 @@ func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
                Counter{cSubReqToE2, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubReqTimerExpiry, 2},
+               Counter{cRestSubFailNotifToXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
        })
 
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsReq(t)
-       xapp.Logger.Info("Ignore 1st REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 1st REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsReq(t)
-       xapp.Logger.Info("Ignore 2nd REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 2nd REST subscriber request for subscriber : %v", restSubId)
 
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
        xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
        xappConn1.WaitRESTNotification(t, restSubId)
 
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
        // Wait that subs is cleaned
        waitSubsCleanup(t, delreq.RequestId.InstanceId, 10)
-
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestREST2eTermNotRespondingToSubReq(t *testing.T) {
@@ -3503,33 +3810,38 @@ func TestREST2eTermNotRespondingToSubReq(t *testing.T) {
                Counter{cSubReqToE2, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubReqTimerExpiry, 2},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelReqTimerExpiry, 2},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
        })
 
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsReq(t)
-       xapp.Logger.Info("Ignore 1st REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 1st REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsReq(t)
-       xapp.Logger.Info("Ignore 2nd REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 2nd REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsDelReq(t)
-       xapp.Logger.Info("Ignore 1st INTERNAL delete request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 1st INTERNAL delete request for subscriber : %v", restSubId)
 
        xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
        e2termConn1.RecvSubsDelReq(t)
-       xapp.Logger.Info("Ignore 2nd INTERNAL delete request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 2nd INTERNAL delete request for subscriber : %v", restSubId)
 
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
 
-       waitSubsCleanup(t, e2SubsId, 10)
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
 
+       waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3580,33 +3892,38 @@ func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
                Counter{cSubReqToE2, 1},
                Counter{cSubReReqToE2, 1},
                Counter{cSubReqTimerExpiry, 2},
+               Counter{cRestSubFailNotifToXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelReReqToE2, 1},
                Counter{cSubDelReqTimerExpiry, 2},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
        })
 
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsReq(t)
-       xapp.Logger.Info("Ignore 1st REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 1st REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsReq(t)
-       xapp.Logger.Info("Ignore 2nd REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 2nd REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsDelReq(t)
-       xapp.Logger.Info("Ignore 1st INTERNAL delete request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 1st INTERNAL delete request for subscriber : %v", restSubId)
 
        xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
        e2termConn1.RecvSubsDelReq(t)
-       xapp.Logger.Info("Ignore 2nd INTERNAL delete request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Ignore 2nd INTERNAL delete request for subscriber : %v", restSubId)
 
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
 
-       waitSubsCleanup(t, e2SubsId, 10)
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
 
+       waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3628,12 +3945,6 @@ func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
 //     |                 |      SubFail |
 //     |                 |<-------------|
 //     |                 |              |
-//     |                 | SubDelReq    |
-//     |                 |------------->|
-//     |                 |              |
-//     |                 |   SubDelResp |
-//     |                 |<-------------|
-//     |                 |              |
 //     |       RESTNotif |              |
 //     |       unsuccess |              |
 //     |<----------------|              |
@@ -3652,23 +3963,26 @@ func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
                Counter{cSubFailFromE2, 1},
                Counter{cRestSubFailNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
        })
 
        const subReqCount int = 1
+       const e2Timeout int64 = 2
+       const e2RetryCount int64 = 1
+       const routingNeeded bool = true
 
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
 
        crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
        fparams1 := &teststube2ap.E2StubSubsFailParams{}
        fparams1.Set(crereq1)
+       xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
        e2termConn1.SendSubsFail(t, fparams1, cremsg1)
 
-       delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
-       xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
-       e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", e2SubsId)
 
        // REST subscription sill there to be deleted
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
@@ -3677,7 +3991,7 @@ func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
        waitSubsCleanup(t, e2SubsId, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3718,6 +4032,7 @@ func TestRESTSubDelReqRetryInSubmgr(t *testing.T) {
                Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 1},
                Counter{cSubDelReReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 1},
@@ -3740,6 +4055,7 @@ func TestRESTSubDelReqRetryInSubmgr(t *testing.T) {
        waitSubsCleanup(t, e2SubsId, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3778,6 +4094,7 @@ func TestRESTSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
                Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 1},
                Counter{cSubDelReReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 1},
@@ -3801,6 +4118,7 @@ func TestRESTSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
        waitSubsCleanup(t, e2SubsId, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3857,6 +4175,7 @@ func TestRESTSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
        waitSubsCleanup(t, e2SubsId, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -3938,13 +4257,13 @@ func TestRESTSubReqAndSubDelOkSameAction(t *testing.T) {
        params.SetMeid("RAN_NAME_1")
 
        xapp.Subscription.SetResponseCB(xappConn2.SubscriptionRespHandler)
-       xappConn2.WaitRESTNotificationForAnySubscriptionId(t)
+       xappConn2.ExpectAnyNotification(t)
        waiter := rtmgrHttp.AllocNextSleep(10, true)
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
        waiter.WaitResult(t)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
-       e2SubsId2 := <-xappConn2.RESTNotification
-       xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
+       e2SubsId2 := xappConn2.WaitAnyRESTNotification(t)
+       xapp.Logger.Debug("REST notification received e2SubsId=%v", e2SubsId2)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560", "localhost:13660"})
 
@@ -3956,8 +4275,8 @@ func TestRESTSubReqAndSubDelOkSameAction(t *testing.T) {
 
        //Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId2, 10)
-
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4050,8 +4369,8 @@ func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) {
        e2termConn1.SendSubsDelResp(t, delreq2, delmsg2)
 
        waitSubsCleanup(t, e2SubsId2, 10)
-
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4074,7 +4393,7 @@ func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) {
 //     | RESTSubReq2                   |              |
 //     |------------------------------>|              |
 //     |             |                 |              |
-//     |               RESTSubDelResp2 |              |
+//     |               RESTSubResp2    |              |
 //     |<------------------------------|              |
 //     |             |                 | SubReq1      |
 //     |             |                 |------------->|
@@ -4110,15 +4429,18 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cMergedSubscriptions, 1},
                Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 2},
+               Counter{cSubReReqToE2, 1},
                Counter{cRestSubFailNotifToXapp, 2},
+               Counter{cUnmergedSubscriptions, 1},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 2},
        })
-
        const subReqCount int = 1
 
        // Req1
@@ -4142,9 +4464,9 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
        e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
 
        e2SubsIdA := <-xappConn1.ListedRESTNotifications
-       xapp.Logger.Info("TEST: 1.st XAPP notification received e2SubsId=%v", e2SubsIdA)
+       xapp.Logger.Debug("TEST: 1.st XAPP notification received e2SubsId=%v", e2SubsIdA)
        e2SubsIdB := <-xappConn1.ListedRESTNotifications
-       xapp.Logger.Info("TEST: 2.nd XAPP notification received e2SubsId=%v", e2SubsIdB)
+       xapp.Logger.Debug("TEST: 2.nd XAPP notification received e2SubsId=%v", e2SubsIdB)
 
        // Del1
        xappConn1.SendRESTSubsDelReq(t, &restSubId1)
@@ -4156,8 +4478,8 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
 
        //Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsIdA.E2SubsId, 10)
-
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4191,12 +4513,8 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
 //     |                    RESTNotif2 |              |
 //     |             |       unsuccess |              |
 //     |<------------------------------|              |
-//     |             |                 | SubDelReq    |
-//     |             |                 |------------->|
-//     |             |                 |   SubDelResp |
-//     |             |                 |<-------------|
 //     |             |                 |              |
-//     |             | RESTSubDelReq1  |              |
+//     |             | RESTSubDelReq1  |              |   There is no need for xApp to send delete for failed subscriptions but some xApp might do so.
 //     |             |---------------->|              |
 //     |             |                 |              |
 //     |             | RESTSubDelResp1 |              |
@@ -4214,13 +4532,13 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
+               Counter{cMergedSubscriptions, 1},
                Counter{cRestSubRespToXapp, 2},
                Counter{cSubReqToE2, 1},
                Counter{cSubFailFromE2, 1},
                Counter{cRestSubFailNotifToXapp, 2},
+               Counter{cUnmergedSubscriptions, 1},
                Counter{cRestSubDelReqFromXapp, 2},
-               Counter{cSubDelReqToE2, 1},
-               Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 2},
        })
 
@@ -4243,15 +4561,11 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
        fparams1.Set(crereq1)
        e2termConn1.SendSubsFail(t, fparams1, cremsg1)
 
-       // E2t: internal delete
-       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
        xappConn1.WaitListedRestNotifications(t, []string{restSubId1, restSubId2})
-       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
-
        e2SubsIdA := <-xappConn1.ListedRESTNotifications
-       xapp.Logger.Info("TEST: 1.st XAPP notification received e2SubsId=%v", e2SubsIdA)
+       xapp.Logger.Debug("TEST: 1.st XAPP notification received e2SubsId=%v", e2SubsIdA)
        e2SubsIdB := <-xappConn1.ListedRESTNotifications
-       xapp.Logger.Info("TEST: 2.nd XAPP notification received e2SubsId=%v", e2SubsIdB)
+       xapp.Logger.Debug("TEST: 2.nd XAPP notification received e2SubsId=%v", e2SubsIdB)
 
        // Del1
        xappConn1.SendRESTSubsDelReq(t, &restSubId1)
@@ -4262,8 +4576,8 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
        //Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsIdA.E2SubsId, 10)
        waitSubsCleanup(t, e2SubsIdB.E2SubsId, 10)
-
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqPolicyAndSubDelOk(t *testing.T) {
@@ -4282,17 +4596,15 @@ func TestRESTSubReqPolicyAndSubDelOk(t *testing.T) {
                Counter{cRestSubDelRespToXapp, 1},
        })
 
-       const subReqCount int = 1
-
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST Policy subscriber request for subscriberId : %v", restSubId)
+       xapp.Logger.Debug("Send REST Policy subscriber request for subscriberId : %v", restSubId)
 
        crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
        xappConn1.ExpectRESTNotification(t, restSubId)
        e2termConn1.SendSubsResp(t, crereq1, cremsg1)
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId)
+       xapp.Logger.Debug("REST notification received e2SubsId=%v", e2SubsId)
 
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
@@ -4301,6 +4613,7 @@ func TestRESTSubReqPolicyAndSubDelOk(t *testing.T) {
        // Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4368,15 +4681,20 @@ func TestRESTSubReqPolicyChangeAndSubDelOk(t *testing.T) {
        })
 
        const subReqCount int = 1
+       const e2Timeout int64 = 1
+       const e2RetryCount int64 = 0
+       const routingNeeded bool = true
 
        // Req
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
 
        // Policy change
-       // GetRESTSubsReqPolicyParams sets some coutners on tc side.
+       // GetRESTSubsReqPolicyParams sets some counters on tc side.
 
        params = xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
        params.SetSubscriptionID(&restSubId)
        params.SetTimeToWait("w200ms")
        restSubId, e2SubsId = createSubscription(t, xappConn1, e2termConn1, params)
@@ -4390,6 +4708,7 @@ func TestRESTSubReqPolicyChangeAndSubDelOk(t *testing.T) {
        // Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4417,7 +4736,7 @@ func TestRESTSubReqPolicyChangeAndSubDelOk(t *testing.T) {
 //     | RESTSubReq      |              |
 //     |---------------->|              |
 //     |                 |              |
-//     |         RESTSubUpdateFail      |
+//     |         RESTSubUpdateFail(400 Bad request)
 //     |                 |              |
 //     | RESTSubDelReq   |              |
 //     |---------------->|              |
@@ -4448,17 +4767,14 @@ func TestRESTSubReqPolicyChangeNOk(t *testing.T) {
                Counter{cRestSubDelRespToXapp, 1},
        })
 
-       const subReqCount int = 1
-
        // Req
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
 
        // Policy change
-
        params = xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
 
-       restSubIdUpd := strings.ToUpper(restSubId)
+       restSubIdUpd := strings.ToUpper(restSubId) // This makes RESTSubReq to fail
        params.SetSubscriptionID(&restSubIdUpd)
        params.SetTimeToWait("w200ms")
 
@@ -4474,6 +4790,7 @@ func TestRESTSubReqPolicyChangeNOk(t *testing.T) {
        // Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4552,13 +4869,13 @@ func TestRESTSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
        xappConn1.ExpectRESTNotification(t, restSubId1)
        e2termConn1.SendSubsResp(t, crereq1, cremsg1)
        e2SubsId1 := xappConn1.WaitRESTNotification(t, restSubId1)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId1=%v", e2SubsId1)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId1=%v", e2SubsId1)
 
        // Resp2
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn2.SendSubsResp(t, crereq2, cremsg2)
        e2SubsId2 := xappConn2.WaitRESTNotification(t, restSubId2)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId2=%v", e2SubsId2)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId2=%v", e2SubsId2)
 
        // Delete1
        xappConn1.SendRESTSubsDelReq(t, &restSubId1)
@@ -4577,6 +4894,7 @@ func TestRESTSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4604,7 +4922,7 @@ func TestRESTSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
 func TestRESTSubReqAsn1EncodeFail(t *testing.T) {
        CaseBegin("TestRESTSubReqAsn1EncodeFail")
 
-       xapp.Logger.Info("Xapp-frame, v0.8.1 sufficient REST API validation")
+       xapp.Logger.Debug("Xapp-frame, v0.8.1 sufficient REST API validation")
 
 }
 
@@ -4676,6 +4994,7 @@ func TestRESTSubReqInsertAndSubDelOk(t *testing.T) {
        // Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4689,6 +5008,8 @@ func TestRESTSubReqInsertAndSubDelOk(t *testing.T) {
 //     | RESTSubReq   |              |
 //     |------------->|              |
 //     |              |              |
+//     |  RESTSubResp |              |
+//     |<-------------|              |
 //     |              | SubReq       |
 //     |              |------------->|
 //     |              |              |
@@ -4704,6 +5025,15 @@ func TestRESTSubReqInsertAndSubDelOk(t *testing.T) {
 //     |              |   SubDelResp |
 //     |              |<-------------|
 //     |              |              |
+//     |    RESTNotif |              |
+//     |    unsuccess |              |
+//     |<-------------|              |
+//     |              |              |
+//     | RESTSubDelReq|              |
+//     |------------->|              |
+//     |              |              |
+//     |RESTSubDelResp|              |
+//     |<-------------|              |
 //
 //-----------------------------------------------------------------------------
 func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
@@ -4716,19 +5046,18 @@ func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
                Counter{cSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
        })
 
        const subReqCount int = 1
 
-       // Remove possible existing subscription
-       mainCtrl.removeExistingSubscriptions(t)
-
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
 
        //Req
        mainCtrl.SetResetTestFlag(t, true) // subs.DoNotWaitSubResp will be set TRUE for the subscription
        restSubId := xappConn1.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriber : %v", restSubId)
 
        e2termConn1.RecvSubsReq(t)
 
@@ -4737,16 +5066,19 @@ func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
        mainCtrl.SimulateRestart(t)
        xapp.Logger.Debug("mainCtrl.SimulateRestart done")
 
-       //Del
+       // Deleletion of uncompleted subscription
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
+       //Del
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
        xappConn1.TestMsgChanEmpty(t)
-       xappConn2.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4799,27 +5131,24 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
                Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 1},
        })
 
-       // Remove possible existing subscription
-       mainCtrl.removeExistingSubscriptions(t)
-
-       var params *teststube2ap.RESTSubsReqParams = nil
-
        // Create subscription
+       var params *teststube2ap.RESTSubsReqParams = nil
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriber : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriber : %v", restSubId)
 
        // Check subscription
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
 
-       // When SDL support for the REST Interface is added
-       // the submgr restart statement below should be removed
-       // from the comment.
+       mainCtrl.SimulateRestart(t)
+       xapp.Logger.Debug("mainCtrl.SimulateRestart done")
 
-       //      mainCtrl.SimulateRestart(t)
-       //      xapp.Logger.Debug("mainCtrl.SimulateRestart done")
+       // ReadE2Subscriptions() for testing is running in own go routine (go mainCtrl.c.ReadE2Subscriptions())
+       // That needs to be completed before successful subscription query is possible
+       <-time.After(time.Second * 1)
 
        // Check subscription
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
@@ -4831,6 +5160,7 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
        waitSubsCleanup(t, e2SubsId, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -4887,7 +5217,6 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
 //     |             |                 |              |
 //
 //-----------------------------------------------------------------------------
-
 func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
        CaseBegin("TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle")
 
@@ -4905,45 +5234,42 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
                Counter{cRestSubDelRespToXapp, 2},
        })
 
-       // Remove possible existing subscription
-       mainCtrl.removeExistingSubscriptions(t)
-
-       var params *teststube2ap.RESTSubsReqParams = nil
-
        // Create subscription 1
+       var params *teststube2ap.RESTSubsReqParams = nil
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriber 1 : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriber 1 : %v", restSubId1)
 
        // Create subscription 2 with same action
        params = xappConn2.GetRESTSubsReqReportParams(subReqCount)
        params.SetMeid("RAN_NAME_1")
        xapp.Subscription.SetResponseCB(xappConn2.SubscriptionRespHandler)
-       xappConn2.WaitRESTNotificationForAnySubscriptionId(t)
+       xappConn2.ExpectAnyNotification(t)
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
-       e2SubsId2 := <-xappConn2.RESTNotification
-       xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
+       e2SubsId2 := xappConn2.WaitAnyRESTNotification(t)
+       xapp.Logger.Debug("REST notification received e2SubsId=%v", e2SubsId2)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560", "localhost:13660"})
 
-       // When SDL support for the REST Interface is added
-       // the submgr restart statement below should be removed
-       // from the comment.
+       mainCtrl.SimulateRestart(t)
+       xapp.Logger.Debug("mainCtrl.SimulateRestart done 1")
 
-       //      mainCtrl.SimulateRestart(t)
-       //      xapp.Logger.Debug("mainCtrl.SimulateRestart done")
+       // ReadE2Subscriptions() for testing is running in own go routine (go mainCtrl.c.ReadE2Subscriptions())
+       // That needs to be completed before successful subscription delete is possible
+       <-time.After(time.Second * 1)
 
        // Delete subscription 1, and wait until it has removed the first endpoint
-       subepcnt := mainCtrl.get_subs_entrypoint_cnt(t, e2SubsId1)
        xappConn1.SendRESTSubsDelReq(t, &restSubId1)
-       mainCtrl.wait_subs_entrypoint_cnt_change(t, e2SubsId1, subepcnt, 10)
+       mainCtrl.WaitRESTSubscriptionDelete(restSubId1)
+       // Above wait does not work correctly anymore as this delay makes this test case work
+
+       mainCtrl.SimulateRestart(t)
+       xapp.Logger.Debug("mainCtrl.SimulateRestart done 2")
 
-       // When SDL support for the REST Interface is added
-       // the submgr restart statement below should be removed
-       // from the comment.
+       // ReadE2Subscriptions() for testing is running in own go routine (go mainCtrl.c.ReadE2Subscriptions())
+       // That needs to be completed before successful subscription query is possible
+       <-time.After(time.Second * 1)
 
-       //      mainCtrl.SimulateRestart(t)
-       //      xapp.Logger.Debug("mainCtrl.SimulateRestart done")
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13660"})
 
        // Delete subscription 2
@@ -4953,6 +5279,7 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -5002,13 +5329,13 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
 
 func TestRESTReportSubReqAndSubDelOk(t *testing.T) {
        CaseBegin("TestRESTReportSubReqAndSubDelOk")
-       subReqCount := 1
+       const subReqCount int = 1
        testIndex := 1
        RESTReportSubReqAndSubDelOk(t, subReqCount, testIndex)
 }
 
 func RESTReportSubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
-       xapp.Logger.Info("TEST: TestRESTReportSubReqAndSubDelOk with testIndex %v", testIndex)
+       xapp.Logger.Debug("TEST: TestRESTReportSubReqAndSubDelOk with testIndex %v", testIndex)
 
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -5021,7 +5348,7 @@ func RESTReportSubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
 
                e2termConn1.SendSubsResp(t, crereq, cremsg)
                instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-               xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+               xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
                e2SubsId = append(e2SubsId, instanceId)
                resp, _ := xapp.Subscription.QuerySubscriptions()
                assert.Equal(t, resp[i].SubscriptionID, (int64)(instanceId))
@@ -5046,10 +5373,11 @@ func RESTReportSubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 /*
-func TestRESTPolicySubReqAndSubDelOk(t *testing.T) {
+func TestRESTPolicySubReqAndSubDelOk(t *testing.T) {  was in comments already
        CaseBegin("TestRESTPolicySubReqAndSubDelOk")
 
        subReqCount := 2
@@ -5062,13 +5390,11 @@ func TestRESTPolicySubReqAndSubDelOk(t *testing.T) {
 }
 */
 func RESTPolicySubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
-       xapp.Logger.Info("TEST: TestRESTPolicySubReqAndSubDelOk with testIndex %v", testIndex)
+       xapp.Logger.Debug("TEST: TestRESTPolicySubReqAndSubDelOk with testIndex %v", testIndex)
 
        // Req
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
-       //params := xappConn1.GetRESTSubsReqPolicyParams1(subReqCount)
-       //restSubId := xappConn1.SendRESTPolicySubsReq(t, params)
 
        var e2SubsId []uint32
        for i := 0; i < subReqCount; i++ {
@@ -5076,7 +5402,7 @@ func RESTPolicySubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
                xappConn1.ExpectRESTNotification(t, restSubId)
                e2termConn1.SendSubsResp(t, crereq, cremsg)
                instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-               xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+               xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
                e2SubsId = append(e2SubsId, instanceId)
        }
 
@@ -5095,12 +5421,11 @@ func RESTPolicySubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
 
-       subReqCount := 2
-
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
                Counter{cRestSubRespToXapp, 1},
@@ -5113,6 +5438,8 @@ func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
                Counter{cRestSubDelRespToXapp, 1},
        })
 
+       const subReqCount int = 2
+
        // Req
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
@@ -5129,11 +5456,10 @@ func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
        mainCtrl.wait_registry_empty(t, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
 
-       subReqCount := 19
-
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
                Counter{cRestSubRespToXapp, 1},
@@ -5146,6 +5472,7 @@ func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
                Counter{cRestSubDelRespToXapp, 1},
        })
 
+       const subReqCount int = 19
        // Req
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
@@ -5161,7 +5488,9 @@ func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
        mainCtrl.wait_registry_empty(t, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
+
 func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
 
        subReqCount := 2
@@ -5194,6 +5523,7 @@ func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
        mainCtrl.wait_registry_empty(t, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
@@ -5228,6 +5558,7 @@ func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
        mainCtrl.wait_registry_empty(t, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
@@ -5262,6 +5593,7 @@ func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
        mainCtrl.wait_registry_empty(t, 10)
 
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
@@ -5284,7 +5616,7 @@ func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
 
        //Subs Create
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId1)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
 
@@ -5295,7 +5627,7 @@ func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
        params.SetSubEventTriggerDefinition(eventTriggerDefinition)
 
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -5308,7 +5640,7 @@ func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
@@ -5331,7 +5663,7 @@ func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
 
        //Subs Create
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId1)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
 
@@ -5347,7 +5679,7 @@ func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
        params.AppendActionToActionToBeSetupList(actionId, actionType, actionDefinition, subsequestActionType, timeToWait)
 
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -5360,7 +5692,7 @@ func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
@@ -5383,7 +5715,7 @@ func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
 
        //Subs Create
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId1)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
 
@@ -5393,7 +5725,7 @@ func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
        params.SetSubActionIDs(int64(2))
 
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -5406,7 +5738,7 @@ func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqDiffActionType(t *testing.T) {
@@ -5424,21 +5756,27 @@ func TestRESTSubReqDiffActionType(t *testing.T) {
                Counter{cRestSubDelRespToXapp, 2},
        })
 
+       const e2Timeout int64 = 2
+       const e2RetryCount int64 = 2
+       const routingNeeded bool = true
+
        // Req1
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
 
        //Subs Create
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId1)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
 
        // Req2
        params = xappConn2.GetRESTSubsReqReportParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
        params.SetMeid("RAN_NAME_1")
 
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -5451,7 +5789,7 @@ func TestRESTSubReqDiffActionType(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
@@ -5469,21 +5807,27 @@ func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
                Counter{cRestSubDelRespToXapp, 2},
        })
 
+       const e2Timeout int64 = 2
+       const e2RetryCount int64 = 2
+       const routingNeeded bool = true
+
        // Req1
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
 
        //Subs Create
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId1)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
 
        // Req2
        params = xappConn2.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
        params.SetMeid("RAN_NAME_1")
 
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -5496,7 +5840,7 @@ func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
@@ -5519,7 +5863,7 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
 
        //Subs Create
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId1)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
 
@@ -5530,7 +5874,7 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
        params.SetSubActionDefinition(actionDefinition)
 
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -5543,7 +5887,7 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
@@ -5566,7 +5910,7 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
 
        //Subs Create
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId1)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
 
@@ -5577,7 +5921,7 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
        params.SetSubActionDefinition(actionDefinition)
 
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -5590,7 +5934,7 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
@@ -5613,7 +5957,7 @@ func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
 
        //Subs Create
        restSubId1, e2SubsId1 := createSubscription(t, xappConn1, e2termConn1, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId1)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId1)
 
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560"})
 
@@ -5622,7 +5966,7 @@ func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
        params.SetMeid("RAN_NAME_1")
        params.SetTimeToWait("w200ms")
        restSubId2 := xappConn2.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId2)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId2)
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
        xappConn2.ExpectRESTNotification(t, restSubId2)
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -5635,7 +5979,7 @@ func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
        waitSubsCleanup(t, e2SubsId2, 10)
 
        mainCtrl.VerifyCounterValues(t)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -5665,17 +6009,13 @@ func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
 //     |                 |<-------------|
 //     | RESTNotif (fail)|              |
 //     |<----------------|              |
-//     |                 | SubDelReq    |
-//     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelResp |
-//     |                 |<-------------|
 //
 //-----------------------------------------------------------------------------
 
 func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionResponseDecodeFail")
-       subReqCount := 1
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseDecodeFail")
+       const subReqCount int = 1
 
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -5695,11 +6035,10 @@ func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
        fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
        e2termConn1.SendSubsFail(t, fparams, cremsg)
 
-       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
-       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
-
        instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
+
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
 
        // Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
@@ -5707,6 +6046,7 @@ func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -5745,8 +6085,8 @@ func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionResponseUnknownInstanceId")
-       subReqCount := 1
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseUnknownInstanceId")
+       const subReqCount int = 1
 
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -5773,7 +6113,9 @@ func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
+
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
 
        // Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, orgInstanceId, 10)
@@ -5781,6 +6123,7 @@ func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -5824,8 +6167,8 @@ func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionResponseNoTransaction")
-       subReqCount := 1
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseNoTransaction")
+       const subReqCount int = 1
 
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -5855,7 +6198,9 @@ func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
+
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
 
        // Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
@@ -5863,7 +6208,7 @@ func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
-
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -5893,16 +6238,12 @@ func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
 //     |                 |<-------------|
 //     | RESTNotif (fail)|              |
 //     |<----------------|              |
-//     |                 | SubDelReq    |
-//     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelResp |
-//     |                 |<-------------|
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionFailureDecodeFail")
-       subReqCount := 1
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureDecodeFail")
+       const subReqCount int = 1
 
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -5923,11 +6264,10 @@ func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
        fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
        e2termConn1.SendSubsFail(t, fparams, cremsg)
 
-       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
-       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
-
        instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
+
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
 
        // Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
@@ -5935,6 +6275,7 @@ func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -5972,8 +6313,8 @@ func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionFailureUnknownInstanceId")
-       subReqCount := 1
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureUnknownInstanceId")
+       const subReqCount int = 1
 
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -5999,7 +6340,9 @@ func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
+
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
 
        // Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
@@ -6007,6 +6350,7 @@ func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6044,8 +6388,8 @@ func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionFailureNoTransaction")
-       subReqCount := 1
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureNoTransaction")
+       const subReqCount int = 1
 
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -6076,7 +6420,9 @@ func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", instanceId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
+
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
 
        // Wait that subs is cleaned
        mainCtrl.wait_subs_clean(t, crereq.RequestId.InstanceId, 10)
@@ -6084,6 +6430,7 @@ func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6118,7 +6465,7 @@ func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteResponseDecodeFail")
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseDecodeFail")
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6145,6 +6492,7 @@ func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6178,7 +6526,7 @@ func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId")
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId")
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6206,6 +6554,7 @@ func TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6239,7 +6588,7 @@ func TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionDeleteResponseNoTransaction(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteResponseNoTransaction")
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseNoTransaction")
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6268,6 +6617,7 @@ func TestRESTUnpackSubscriptionDeleteResponseNoTransaction(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6301,7 +6651,7 @@ func TestRESTUnpackSubscriptionDeleteResponseNoTransaction(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionDeleteFailureDecodeFail(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteFailureDecodeFail")
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteFailureDecodeFail")
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6328,6 +6678,7 @@ func TestRESTUnpackSubscriptionDeleteFailureDecodeFail(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6361,7 +6712,7 @@ func TestRESTUnpackSubscriptionDeleteFailureDecodeFail(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId")
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId")
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6389,6 +6740,7 @@ func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6422,7 +6774,7 @@ func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
-       xapp.Logger.Info("TEST: TestRESTUnpackSubscriptionDeleteFailureNoTransaction")
+       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteFailureNoTransaction")
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6451,6 +6803,7 @@ func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
        xappConn1.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
+       mainCtrl.VerifyAllClean(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6488,12 +6841,12 @@ func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
                Counter{cRestSubRespToXapp, 1},
-               Counter{cSubDelReqToE2, 1},
-               Counter{cSubDelFailFromE2, 1},
                Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
        })
 
-       subReqCount := 1
+       const subReqCount int = 1
 
        var params *teststube2ap.RESTSubsReqParams = nil
        params = xappConn1.GetRESTSubsReqReportParams(subReqCount)
@@ -6501,22 +6854,199 @@ func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
 
        // Req
        restSubId := xappConn1.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId)
 
        // E2t: Receive SubsDelReq
-       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
        xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
-       // Subscription does not exist in in E2 Node.
-       e2termConn1.SendSubsDelFail(t, delreq, delmsg)
-
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", e2SubsId)
 
        e2ap_wrapper.AllowE2apToProcess(e2ap_wrapper.SUB_REQ, true)
+
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
+
        // Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
        mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
+}
+
+func TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction(t *testing.T) {
+       CaseBegin("TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
+               Counter{cSubReqToE2, 2},
+               Counter{cSubReqTimerExpiry, 1},
+               Counter{cSubRespFromE2, 1},
+               Counter{cRestSubNotifToXapp, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelRespFromE2, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+       })
+
+       const e2Timeout int64 = 1
+       const e2RetryCount int64 = 0
+       const routingNeeded bool = false
+
+       // Req1
+       params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
+
+       // Subs Create
+       restSubId := xappConn1.SendRESTSubsReq(t, params)
+       xapp.Logger.Debug("Send REST subscribe request for subscriberId : %v", restSubId)
+
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+       xappConn1.ExpectRESTNotification(t, restSubId)
+       e2termConn1.SendSubsResp(t, crereq1, cremsg1)
+       e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
+       xapp.Logger.Debug("REST notification received e2SubsId=%v", e2SubsId)
+
+       // Policy change
+       params = xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
+       params.SetSubscriptionID(&restSubId)
+       params.SetTimeToWait("w200ms")
+       restSubId = xappConn1.SendRESTSubsReq(t, params)
+       xapp.Logger.Debug("Send REST subscribe request for subscriberId : %v", restSubId)
+
+       crereq1, cremsg1 = e2termConn1.RecvSubsReq(t)
+       xappConn1.ExpectRESTNotification(t, restSubId)
+       // SubsResp is missing, e2SubsId will be 0
+       zeroE2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", zeroE2SubsId)
+
+       // Del
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+       waitSubsCleanup(t, e2SubsId, 10)
+
+       mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
+}
+
+//-----------------------------------------------------------------------------
+// TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |       RESTNotif |              |
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                                |
+//     |           Submgr restart       |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//
+//-----------------------------------------------------------------------------
+
+func TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
+       CaseBegin("TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 2},
+               Counter{cRestSubRespToXapp, 2},
+               Counter{cSubReqToE2, 2},
+               Counter{cSubRespFromE2, 1},
+               Counter{cRestSubNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelRespFromE2, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+       })
+
+       const e2Timeout int64 = 1
+       const e2RetryCount int64 = 0
+       const routingNeeded bool = false
+
+       // Req1
+       params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
+       // Create subscription
+       restSubId := xappConn1.SendRESTSubsReq(t, params)
+       xapp.Logger.Debug("Send REST subscribe request for subscriberId : %v", restSubId)
+
+       crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
+       xappConn1.ExpectRESTNotification(t, restSubId)
+       e2termConn1.SendSubsResp(t, crereq1, cremsg1)
+       e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
+       xapp.Logger.Debug("REST notification received e2SubsId=%v", e2SubsId)
+
+       // Check subscription
+       queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
+
+       // Policy change
+       params = xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
+       params.SetSubscriptionDirectives(e2Timeout, e2RetryCount, routingNeeded)
+       params.SetSubscriptionID(&restSubId)
+       params.SetTimeToWait("w200ms")
+       mainCtrl.SetResetTestFlag(t, true) // subs.DoNotWaitSubResp will be set TRUE for the subscription
+       restSubId = xappConn1.SendRESTSubsReq(t, params)
+       xapp.Logger.Debug("Send REST subscribe request for subscriberId : %v", restSubId)
+
+       crereq1, cremsg1 = e2termConn1.RecvSubsReq(t)
+       mainCtrl.SetResetTestFlag(t, false)
+
+       // SubsResp is missing due to submgr restart
+
+       mainCtrl.SimulateRestart(t)
+       xapp.Logger.Debug("mainCtrl.SimulateRestart done")
+
+       // ReadE2Subscriptions() for testing is running in own go routine (go mainCtrl.c.ReadE2Subscriptions())
+       // That needs to be completed before successful subscription query is possible
+       <-time.After(time.Second * 1)
+
+       // Check subscription
+       queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
+
+       // Delete subscription
+       xappConn1.SendRESTSubsDelReq(t, &restSubId)
+       delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
+       e2termConn1.SendSubsDelResp(t, delreq, delmsg)
+
+       //Wait that subs is cleaned
+       waitSubsCleanup(t, e2SubsId, 10)
+
+       mainCtrl.VerifyCounterValues(t)
+       mainCtrl.VerifyAllClean(t)
 }
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -6530,13 +7060,13 @@ func createSubscription(t *testing.T, fromXappConn *teststube2ap.E2Stub, toE2ter
                params = fromXappConn.GetRESTSubsReqReportParams(subReqCount)
        }
        restSubId := fromXappConn.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId)
 
        crereq1, cremsg1 := toE2termConn.RecvSubsReq(t)
        fromXappConn.ExpectRESTNotification(t, restSubId)
        toE2termConn.SendSubsResp(t, crereq1, cremsg1)
        e2SubsId := fromXappConn.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId)
+       xapp.Logger.Debug("REST notification received e2SubsId=%v", e2SubsId)
 
        return restSubId, e2SubsId
 }
@@ -6550,23 +7080,24 @@ func createXapp2MergedSubscription(t *testing.T, meid string) (string, uint32) {
        xapp.Subscription.SetResponseCB(xappConn2.SubscriptionRespHandler)
        restSubId := xappConn2.SendRESTSubsReq(t, params)
        xappConn2.ExpectRESTNotification(t, restSubId)
-       xapp.Logger.Info("Send REST subscriber request for subscriberId : %v", restSubId)
+       xapp.Logger.Debug("Send REST subscriber request for subscriberId : %v", restSubId)
        e2SubsId := xappConn2.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId)
+       xapp.Logger.Debug("REST notification received e2SubsId=%v", e2SubsId)
 
        return restSubId, e2SubsId
 }
 
 func createXapp1PolicySubscription(t *testing.T) (string, uint32) {
+
        params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
-       xapp.Logger.Info("Send REST Policy subscriber request for subscriberId : %v", restSubId)
+       xapp.Logger.Debug("Send REST Policy subscriber request for subscriberId : %v", restSubId)
 
        crereq1, cremsg1 := e2termConn1.RecvSubsReq(t)
        xappConn1.ExpectRESTNotification(t, restSubId)
        e2termConn1.SendSubsResp(t, crereq1, cremsg1)
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("REST notification received e2SubsId=%v", e2SubsId)
+       xapp.Logger.Debug("REST notification received e2SubsId=%v", e2SubsId)
 
        return restSubId, e2SubsId
 }
@@ -6584,7 +7115,7 @@ func createXapp1ReportSubscriptionE2Fail(t *testing.T) (string, uint32) {
        xappConn1.ExpectRESTNotification(t, restSubId)
        e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
-       xapp.Logger.Info("TEST: REST notification received e2SubsId=%v", e2SubsId)
+       xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", e2SubsId)
 
        return restSubId, e2SubsId
 }
@@ -6609,9 +7140,9 @@ func deleteXapp2Subscription(t *testing.T, restSubId *string) {
 
 func queryXappSubscription(t *testing.T, e2SubsId int64, meid string, endpoint []string) {
        resp, _ := xapp.Subscription.QuerySubscriptions()
-       assert.Equal(t, resp[0].SubscriptionID, e2SubsId)
-       assert.Equal(t, resp[0].Meid, meid)
-       assert.Equal(t, resp[0].ClientEndpoint, endpoint)
+       assert.Equal(t, e2SubsId, resp[0].SubscriptionID)
+       assert.Equal(t, meid, resp[0].Meid)
+       assert.Equal(t, endpoint, resp[0].ClientEndpoint)
 }
 
 func waitSubsCleanup(t *testing.T, e2SubsId uint32, timeout int) {
@@ -6629,14 +7160,14 @@ func sendAndReceiveMultipleE2SubReqs(t *testing.T, count int, fromXappConn *test
        var e2SubsId []uint32
 
        for i := 0; i < count; i++ {
-               xapp.Logger.Info("TEST: %d ===================================== BEGIN CRE ============================================", i+1)
+               xapp.Logger.Debug("TEST: %d ===================================== BEGIN CRE ============================================", i+1)
                crereq, cremsg := toE2termConn.RecvSubsReq(t)
                fromXappConn.ExpectRESTNotification(t, restSubId)
                toE2termConn.SendSubsResp(t, crereq, cremsg)
                instanceId := fromXappConn.WaitRESTNotification(t, restSubId)
                e2SubsId = append(e2SubsId, instanceId)
-               xapp.Logger.Info("TEST: %v", e2SubsId)
-               xapp.Logger.Info("TEST: %d ===================================== END CRE ============================================", i+1)
+               xapp.Logger.Debug("TEST: %v", e2SubsId)
+               xapp.Logger.Debug("TEST: %d ===================================== END CRE ============================================", i+1)
                <-time.After(100 * time.Millisecond)
        }
        return e2SubsId
@@ -6645,11 +7176,11 @@ func sendAndReceiveMultipleE2SubReqs(t *testing.T, count int, fromXappConn *test
 func sendAndReceiveMultipleE2DelReqs(t *testing.T, e2SubsIds []uint32, toE2termConn *teststube2ap.E2Stub) {
 
        for i := 0; i < len(e2SubsIds); i++ {
-               xapp.Logger.Info("TEST: %d ===================================== BEGIN DEL ============================================", i+1)
+               xapp.Logger.Debug("TEST: %d ===================================== BEGIN DEL ============================================", i+1)
                delreq, delmsg := toE2termConn.RecvSubsDelReq(t)
                toE2termConn.SendSubsDelResp(t, delreq, delmsg)
                <-time.After(1 * time.Second)
-               xapp.Logger.Info("TEST: %d ===================================== END DEL ============================================", i+1)
+               xapp.Logger.Debug("TEST: %d ===================================== END DEL ============================================", i+1)
                <-time.After(100 * time.Millisecond)
        }