Unit test description improvements
[ric-plt/submgr.git] / pkg / control / ut_messaging_test.go
index 6ce7b51..b4edc3f 100644 (file)
@@ -20,7 +20,6 @@
 package control
 
 import (
-       //"os"
        "strings"
        "testing"
        "time"
@@ -33,6 +32,10 @@ import (
        "github.com/stretchr/testify/assert"
 )
 
+// In below test cases there is done only one retry for E2 messages
+// In Helm chart retry count is currently 2 By default. Retry count
+// used in test cases is defined in submgr-config.yaml file.
+
 func TestSuiteSetup(t *testing.T) {
        // The effect of this call shall endure though the UT suite!
        // If this causes any issues, the previous interface can be restored
@@ -46,6 +49,10 @@ func TestSuiteSetup(t *testing.T) {
 }
 func TestRanStatusChangeViaSDLNotification(t *testing.T) {
 
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cE2StateChangedToUp, 3},
+       })
+
        // Current UT test cases use these ran names
        xappRnibMock.CreateGnb("RAN_NAME_1", entities.ConnectionStatus_DISCONNECTED)
        xappRnibMock.CreateGnb("RAN_NAME_11", entities.ConnectionStatus_DISCONNECTED)
@@ -57,6 +64,8 @@ func TestRanStatusChangeViaSDLNotification(t *testing.T) {
        mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
        mainCtrl.SetE2State(t, "RAN_NAME_2_CONNECTED")
        mainCtrl.SetE2State(t, "RAN_NAME_11_CONNECTED")
+
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -78,11 +87,12 @@ func TestRanStatusChangeViaSDLNotification(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestRESTSubReqAfterE2ConnBreak(t *testing.T) {
-       CaseBegin("TestRESTSubReqAfterE2ConnBreak")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
                Counter{cRestReqRejDueE2Down, 1},
+               Counter{cE2StateChangedToDown, 1},
+               Counter{cE2StateChangedToUp, 1},
        })
 
        // E2 disconnect after E2term has received response
@@ -95,9 +105,8 @@ func TestRESTSubReqAfterE2ConnBreak(t *testing.T) {
        // Restore E2 connection for following test cases
        mainCtrl.SetE2State(t, "RAN_NAME_1_CONNECTED")
 
-       mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
-       //os.Exit(1)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -127,7 +136,6 @@ func TestRESTSubReqAfterE2ConnBreak(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTSubReqE2ConnBreak(t *testing.T) {
-       CaseBegin("TestRESTSubReqE2ConnBreak")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -135,6 +143,8 @@ func TestRESTSubReqE2ConnBreak(t *testing.T) {
                Counter{cSubReqToE2, 1},
                Counter{cSubRespFromE2, 1},
                Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cE2StateChangedToDown, 1},
+               Counter{cE2StateChangedToUp, 1},
        })
 
        // Req
@@ -212,6 +222,8 @@ func TestRESTSubscriptionDeleteAfterE2ConnectionBreak(t *testing.T) {
                Counter{cRestSubNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cRestSubDelRespToXapp, 1},
+               Counter{cE2StateChangedToDown, 1},
+               Counter{cE2StateChangedToUp, 1},
        })
 
        // Req
@@ -289,6 +301,7 @@ func TestRESTOtherE2ConnectionChanges(t *testing.T) {
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 1},
+               Counter{cE2StateChangedToUp, 1},
        })
 
        // Req
@@ -300,7 +313,7 @@ func TestRESTOtherE2ConnectionChanges(t *testing.T) {
        e2termConn1.SendSubsResp(t, crereq, cremsg)
        e2SubsId := xappConn1.WaitRESTNotification(t, restSubId)
 
-       // Submgr should not react any other connection state changes than CONNECTED and DISCONNECTED
+       // Submgr should not react to 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")
@@ -675,7 +688,6 @@ func TestSubDelReqAndRouteDeleteNok(t *testing.T) {
        xappConn2.TestMsgChanEmpty(t)
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
-
        mainCtrl.VerifyCounterValues(t)
 }
 
@@ -2375,9 +2387,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)
@@ -2459,6 +2468,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))
@@ -2553,7 +2566,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"})
@@ -2561,6 +2574,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))
@@ -2576,6 +2593,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)
@@ -2649,7 +2670,6 @@ func TestGetRestSubscriptions(t *testing.T) {
 //     |<----------------|              |
 //     |                 | RouteCreate  |
 //     |                 |------------->|
-//     |                 |              |
 //     |                 | RouteCreate  |
 //     |                 |  status:400  |
 //     |                 |(Bad request) |
@@ -2666,7 +2686,6 @@ func TestGetRestSubscriptions(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTSubReqAndRouteNok(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndRouteNok")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -2702,8 +2721,54 @@ func TestRESTSubReqAndRouteNok(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqAndRouteUpdateNok
+//
+//   stub        stub                         stub           stub
+// +-------+   +-------+    +---------+    +---------+    +---------+
+// | xapp1 |   | xapp2 |    | submgr  |    | rtmgr   |    | e2term  |
+// +-------+   +-------+    +---------+    +---------+    +---------+
+//     |           |             |              |              |
+//     | RESTSubReq1             |              |              |
+//     |------------------------>|              |              |
+//     |     RESTSubResp2        |              |              |
+//     |<------------------------|              |              |
+//     |           |             |              |              |
+//     |           |             | RouteCreate  |              |
+//     |           |             |------------->|              |
+//     |           |             | CreateResp   |              |
+//     |           |             |<-------------|              |
+//     |           |             | SubReq       |              |
+//     |           |             |---------------------------->|
+//     |           |             |      SubResp |              |
+//     |           |             |<----------------------------|
+//     |      RESTNotif1         |              |              |
+//     |<------------------------|              |              |
+//     |           |             |              |              |
+//     |           | RESTSubReq2 |              |              |
+//     |           |------------>|              |              |
+//     |           | RESTSubResp2|              |              |
+//     |           |<------------|              |              |
+//     |           |             | RouteUpdate  |              |
+//     |           |             |------------->|              |
+//     |           |             | RouteUpdate  |              |
+//     |           |             |  status:400  |              |
+//     |           |             |(Bad request) |              |
+//     |           |             |<-------------|              |
+//     |           | RESTNotif2(unsuccessful)   |              |
+//     |           |<------------|              |              |
+//     |           |             |              |              |
+//     |          [SUBS INT DELETE]             |              |
+//     |           |             |              |              |
+//     | RESTSubDelReq1          |              |              |
+//     |------------------------>|              |              |
+//     |  RESTSubDelResp1        |              |              |
+//     |<------------------------|              |              |
+//     |           |             |              |              |
+//     |           |             |        [SUBS DELETE]        |
+//
+//-----------------------------------------------------------------------------
 func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
-       CaseBegin("TestSubReqAndRouteUpdateNok")
 
        //Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -2722,7 +2787,7 @@ func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
 
        var params *teststube2ap.RESTSubsReqParams = nil
 
-       //Subs Create
+       // Subs create for xapp1
        restSubId, e2SubsId := createSubscription(t, xappConn1, e2termConn1, params)
 
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
@@ -2751,8 +2816,45 @@ func TestRESTSubReqAndRouteUpdateNok(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubDelReqAndRouteDeleteNok
+//
+//   stub                             stub           stub
+// +-------+        +---------+    +---------+    +---------+
+// | xapp  |        | submgr  |    | rtmgr   |    | e2term  |
+// +-------+        +---------+    +---------+    +---------+
+//     |                 |              |              |
+//     | RESTSubReq      |              |              |
+//     |---------------->|              |              |
+//     |                 |              |              |
+//     |     RESTSubResp |              |              |
+//     |<----------------|              |              |
+//     |                 | SubReq       |              |
+//     |                 |---------------------------->|
+//     |                 | SubResp      |              |
+//     |                 |<----------------------------|
+//     |       RESTNotif |              |              |
+//     |<----------------|              |              |
+//     |                 |              |              |
+//     |                 |              |              |
+//     | RESTSubDelReq   |              |              |
+//     |---------------->|              |              |
+//     |  RESTSubDelResp |              |              |
+//     |<----------------|              |              |
+//     |                 | SubSelReq    |              |
+//     |                 |---------------------------->|
+//     |                 | SubSelResp   |              |
+//     |                 |<----------------------------|
+//     |                 | RouteDelete  |              |
+//     |                 |------------->|              |
+//     |                 | Routedelete  |              |
+//     |                 |  status:400  |              |
+//     |                 |(Bad request) |              |
+//     |                 |<-------------|              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubDelReqAndRouteDeleteNok(t *testing.T) {
-       CaseBegin("TestRESTSubDelReqAndRouteDeleteNok")
 
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -2786,8 +2888,78 @@ func TestRESTSubDelReqAndRouteDeleteNok(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubMergeDelAndRouteUpdateNok
+//
+//   stub        stub                         stub           stub
+// +-------+   +-------+    +---------+    +---------+    +---------+
+// | xapp1 |   | xapp2 |    | submgr  |    | rtmgr   |    | e2term  |
+// +-------+   +-------+    +---------+    +---------+    +---------+
+//     |           |             |              |              |
+//     | RESTSubReq1             |              |              |
+//     |------------------------>|              |              |
+//     |     RESTSubResp2        |              |              |
+//     |<------------------------|              |              |
+//     |           |             |              |              |
+//     |           |             | RouteCreate  |              |
+//     |           |             |------------->|              |
+//     |           |             | CreateResp   |              |
+//     |           |             |<-------------|              |
+//     |           |             | SubReq       |              |
+//     |           |             |---------------------------->|
+//     |           |             |      SubResp |              |
+//     |           |             |<----------------------------|
+//     |      RESTNotif1         |              |              |
+//     |<------------------------|              |              |
+//     |           |             |              |              |
+//     |           | RESTSubReq2 |              |              |
+//     |           |------------>|              |              |
+//     |           | RESTSubResp2|              |              |
+//     |           |<------------|              |              |
+//     |           |             | RouteCreate  |              |
+//     |           |             |------------->|              |
+//     |           |             | CreateResp   |              |
+//     |           |             |<-------------|              |
+//     |           |             | SubReq       |              |
+//     |           |             |---------------------------->|
+//     |           |             |      SubResp |              |
+//     |           |             |<----------------------------|
+//     |           | RESTNotif2  |              |              |
+//     |           |<------------|              |              |
+//     |           |             |              |              |
+//     |          [SUBS INT DELETE]             |              |
+//     |           |             |              |              |
+//     | RESTSubDelReq1          |              |              |
+//     |------------------------>|              |              |
+//     |  RESTSubDelResp1        |              |              |
+//     |<------------------------|              |              |
+//     |           |             | SubDelReq    |              |
+//     |           |             |---------------------------->|
+//     |           |             | SubDelResp   |              |
+//     |           |             |<----------------------------|
+//     |           |             | RouteUpdate  |              |
+//     |           |             |------------->|              |
+//     |           |             | RouteUpdate  |              |
+//     |           |             |  status:400  |              |
+//     |           |             |(Bad request) |              |
+//     |           |             |<-------------|              |
+//     |           |             |              |              |
+//     |           | RESTSubDelReq2             |              |
+//     |           |------------>|              |              |
+//     |           | RESTSubDelResp2            |              |
+//     |           |<------------|              |              |
+//     |           |             | SubDelReq    |              |
+//     |           |             |---------------------------->|
+//     |           |             | SubdelResp   |              |
+//     |           |             |<----------------------------|
+//     |           |             | RouteDelete  |              |
+//     |           |             |------------->|              |
+//     |           |             | Deleteresp   |              |
+//     |           |             |<-------------|              |
+
+//-----------------------------------------------------------------------------
+
 func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
-       CaseBegin("TestRESTSubMergeDelAndRouteUpdateNok")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -2862,7 +3034,6 @@ func TestRESTSubMergeDelAndRouteUpdateNok(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestRESTSubReqRetransmission(t *testing.T) {
-       CaseBegin("TestRESTSubReqRetransmission")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -2953,7 +3124,6 @@ func TestRESTSubReqRetransmission(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestRESTSubReqRetransmissionV2(t *testing.T) {
-       CaseBegin("TestRESTSubReqRetransmissionV2")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
@@ -2974,19 +3144,21 @@ 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)
 
@@ -3037,7 +3209,6 @@ func TestRESTSubReqRetransmissionV2(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTSubReqRetransmissionV3(t *testing.T) {
-       CaseBegin("TestRESTSubReqRetransmissionV3")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
@@ -3058,7 +3229,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)
@@ -3066,7 +3237,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)
@@ -3074,7 +3245,7 @@ func TestRESTSubReqRetransmissionV3(t *testing.T) {
 
        assert.Equal(t, restSubId_resend2, restSubId)
 
-       <-time.After(100 * time.Millisecond)
+       mainCtrl.WaitOngoingRequestMapEmpty()
 
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId)
 
@@ -3141,7 +3312,6 @@ func TestRESTSubReqRetransmissionV3(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestRESTSubReqRetransmissionV4(t *testing.T) {
-       CaseBegin("TestRESTSubReqRetransmissionV4")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
@@ -3160,7 +3330,7 @@ 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)
@@ -3181,7 +3351,7 @@ func TestRESTSubReqRetransmissionV4(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)
@@ -3194,6 +3364,8 @@ func TestRESTSubReqRetransmissionV4(t *testing.T) {
        e2SubsId1 = xappConn1.WaitAnyRESTNotification(t)
        assert.Equal(t, e2SubsId, e2SubsId1)
 
+       mainCtrl.WaitOngoingRequestMapEmpty()
+
        // Delete both e2 subscriptions
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
        e2SubsIds := []uint32{e2SubsId, e2SubsId2}
@@ -3262,7 +3434,6 @@ func TestRESTSubReqRetransmissionV4(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestRESTSubReqRetransmissionV5(t *testing.T) {
-       CaseBegin("TestRESTSubReqRetransmissionV5")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
@@ -3281,9 +3452,9 @@ 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.
+       // Send modified  request, this time with e2 subscriptions.
        params2 := xappConn1.GetRESTSubsReqReportParams(subReqCount + 1)
        params2.SetSubscriptionID(&restSubId)
 
@@ -3304,7 +3475,7 @@ 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)
@@ -3317,6 +3488,8 @@ func TestRESTSubReqRetransmissionV5(t *testing.T) {
        e2SubsId1 = xappConn1.WaitAnyRESTNotification(t)
        assert.Equal(t, e2SubsId, e2SubsId1)
 
+       mainCtrl.WaitOngoingRequestMapEmpty()
+
        // Delete both e2 subscriptions
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
        e2SubsIds := []uint32{e2SubsId, e2SubsId2}
@@ -3394,7 +3567,6 @@ func TestRESTSubReqRetransmissionV5(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTSubReqRetransmissionV6(t *testing.T) {
-       CaseBegin("TestRESTSubReqRetransmissionV6")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 3},
@@ -3413,7 +3585,7 @@ 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)
@@ -3434,7 +3606,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)
@@ -3448,7 +3620,7 @@ 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)
 
@@ -3457,8 +3629,43 @@ func TestRESTSubReqRetransmissionV6(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubDelReqRetransmission
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     |      RESTNotif1 |              |
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubDelReqRetransmission(t *testing.T) {
-       CaseBegin("TestRESTSubDelReqRetransmission")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -3483,10 +3690,12 @@ func TestRESTSubDelReqRetransmission(t *testing.T) {
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
 
+       //Resend delete req
        seqBef := mainCtrl.get_msgcounter(t)
        xappConn1.SendRESTSubsDelReq(t, &restSubId)
        mainCtrl.wait_msgcounter_change(t, seqBef, 10)
 
+       // Del resp
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        waitSubsCleanup(t, e2SubsId, 10)
@@ -3524,7 +3733,6 @@ func TestRESTSubDelReqRetransmission(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTSubReqDelReq(t *testing.T) {
-       CaseBegin("TestRESTSubReqDelReq")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -3566,12 +3774,48 @@ func TestRESTSubReqDelReq(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
-func TestRESTSubDelReqCollision(t *testing.T) {
-       CaseBegin("TestRESTSubDelReqCollision - not relevant for REST API")
-}
+//-----------------------------------------------------------------------------
+// TestRESTSubReqAndSubDelOkTwoParallel
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
 
 func TestRESTSubReqAndSubDelOkTwoParallel(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndSubDelOkTwoParallel")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -3624,8 +3868,51 @@ func TestRESTSubReqAndSubDelOkTwoParallel(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSameSubsDiffRan
+// Same subscription to different RANs
+//
+//   stub                          stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RESTSubReq(r1)  |              |
+//     |---------------->|              |
+//     | RESTSubResp(r1) |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq(r1)   |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 | SubResp(r1)  |
+//     |                 |<-------------|
+//     |                 |              |
+//     | RESTNotif(r1)   |              |
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubReq(r2)  |              |
+//     |---------------->|              |
+//     |                 |              |
+//     | RESTSubResp(r2) |              |
+//     |<----------------|              |
+//     |                 | SubReq(r2)   |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 | SubResp(r2)  |
+//     |                 |<-------------|
+//     |                 |              |
+//     | RESTNotif(r2)   |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |          [SUBS r1 DELETE]      |
+//     |                 |              |
+//     |          [SUBS r2 DELETE]      |
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSameSubsDiffRan(t *testing.T) {
-       CaseBegin("TestRESTSameSubsDiffRan")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -3661,8 +3948,35 @@ func TestRESTSameSubsDiffRan(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqRetryInSubmgr
+//
+//   stub                          stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     | RESTSubResp     |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 | SubResp      |
+//     |                 |<-------------|
+//     |                 |              |
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqRetryInSubmgr(t *testing.T) {
-       CaseBegin("TestRESTSubReqRetryInSubmgr start")
 
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -3696,6 +4010,7 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) {
 
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
 
+       // Del
        deleteSubscription(t, xappConn1, e2termConn1, &restSubId)
 
        mainCtrl.wait_subs_clean(t, e2SubsId, 10)
@@ -3746,7 +4061,6 @@ func TestRESTSubReqRetryInSubmgr(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
-       CaseBegin("TestRESTSubReqTwoRetriesNoRespSubDelRespInSubmgr start")
 
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -3785,8 +4099,41 @@ func TestRESTSubReqRetryNoRespSubDelRespInSubmgr(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestREST2eTermNotRespondingToSubReq
+//
+//   stub                          stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     | RESTSubResp     |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     | RESTNotif(Unsuccessful)        |
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     | RESTSubDelResp  |              |
+//     |<----------------|              |
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestREST2eTermNotRespondingToSubReq(t *testing.T) {
-       CaseBegin("TestREST2eTermNotRespondingToSubReq start")
 
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -3868,7 +4215,6 @@ func TestREST2eTermNotRespondingToSubReq(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
-       CaseBegin("TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr start")
 
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -3938,8 +4284,8 @@ func TestRESTSubReqTwoRetriesNoRespAtAllInSubmgr(t *testing.T) {
 //     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
-       CaseBegin("TestRESTSubReqSubFailRespInSubmgr")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -4007,7 +4353,6 @@ func TestRESTSubReqSubFailRespInSubmgr(t *testing.T) {
 //
 //-----------------------------------------------------------------------------
 func TestRESTSubDelReqRetryInSubmgr(t *testing.T) {
-       CaseBegin("TestRESTSubDelReqRetryInSubmgr")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -4068,8 +4413,8 @@ func TestRESTSubDelReqRetryInSubmgr(t *testing.T) {
 //     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
-       CaseBegin("TestRESTSubDelReTwoRetriesNoRespInSubmgr")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -4130,8 +4475,8 @@ func TestRESTSubDelReqTwoRetriesNoRespInSubmgr(t *testing.T) {
 //     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
-       CaseBegin("TestRESTSubDelReqSubDelFailRespInSubmgr")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -4213,8 +4558,8 @@ func TestRESTSubDelReqSubDelFailRespInSubmgr(t *testing.T) {
 //     |             |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqAndSubDelOkSameAction(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndSubDelOkSameAction")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -4312,7 +4657,6 @@ func TestRESTSubReqAndSubDelOkSameAction(t *testing.T) {
 //     |<---------------------------|              |
 //
 func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndSubDelOkSameActionParallel")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -4358,7 +4702,6 @@ func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
-/*
 //-----------------------------------------------------------------------------
 // TestRESTSubReqAndSubDelNoAnswerSameActionParallel
 //
@@ -4410,8 +4753,8 @@ func TestRESTSubReqAndSubDelOkSameActionParallel(t *testing.T) {
 //     |<------------------------------|              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndSubDelNoAnswerSameActionParallel")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -4421,6 +4764,7 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
                Counter{cSubReqTimerExpiry, 2},
                Counter{cSubReReqToE2, 1},
                Counter{cRestSubFailNotifToXapp, 2},
+               Counter{cUnmergedSubscriptions, 1},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
@@ -4512,8 +4856,8 @@ func TestRESTSubReqAndSubDelNoAnswerSameActionParallel(t *testing.T) {
 //     |<------------------------------|              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndSubDelNokSameActionParallel")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -4522,6 +4866,7 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
                Counter{cSubReqToE2, 1},
                Counter{cSubFailFromE2, 1},
                Counter{cRestSubFailNotifToXapp, 2},
+               Counter{cUnmergedSubscriptions, 1},
                Counter{cRestSubDelReqFromXapp, 2},
                Counter{cRestSubDelRespToXapp, 2},
        })
@@ -4563,9 +4908,45 @@ func TestRESTSubReqAndSubDelNokSameActionParallel(t *testing.T) {
        mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
 }
-*/
+
+//-----------------------------------------------------------------------------
+// TestRESTSubReqPolicyAndSubDelOk
+//
+//   stub                          stub
+// +-------+       +---------+    +---------+
+// | xapp  |       | submgr  |    | e2term  |
+// +-------+       +---------+    +---------+
+//     |                |              |
+//     | RESTSubReq     |              |
+//     |--------------->|              |
+//     |  RESTSubResp   |              |
+//     |<---------------|              |
+//     |                |              |
+//     |                | SubReq       |
+//     |                |------------->|
+//     |                |              |
+//     |                |      SubResp |
+//     |                |<-------------|
+//     |                |              |
+//     |  RESTNotif     |              |
+//     |<---------------|              |
+//     |                |              |
+//     |                |              |
+//     | RESTSubDelReq  |              |
+//     |--------------->|              |
+//     | RESTSubDelResp |              |
+//     |<---------------|              |
+//     |                |              |
+//     |                | SubDelReq    |
+//     |                |------------->|
+//     |                |              |
+//     |                |   SubDelResp |
+//     |                |<-------------|
+//     |                |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqPolicyAndSubDelOk(t *testing.T) {
-       CaseBegin("TestRESTSubReqPolicyAndSubDelOk")
 
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -4649,8 +5030,8 @@ func TestRESTSubReqPolicyAndSubDelOk(t *testing.T) {
 //     |<----------------|              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqPolicyChangeAndSubDelOk(t *testing.T) {
-       CaseBegin("TestRESTSubReqPolicyAndSubDelOk")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -4735,8 +5116,8 @@ func TestRESTSubReqPolicyChangeAndSubDelOk(t *testing.T) {
 //     |<----------------|              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqPolicyChangeNOk(t *testing.T) {
-       CaseBegin("TestRESTSubReqPolicyChangeNOk")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -4818,8 +5199,8 @@ func TestRESTSubReqPolicyChangeNOk(t *testing.T) {
 //     |                 |              |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndSubDelOkTwoE2termParallel")
 
        // Init counter check
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -4881,35 +5262,6 @@ func TestRESTSubReqAndSubDelOkTwoE2termParallel(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
-//-----------------------------------------------------------------------------
-// TestRESTSubReqAsn1EncodeFail
-//
-// In this case submgr send RICSubscriptionDeleteRequest after encode failure which should not happen!
-//   stub                             stub
-// +-------+        +---------+    +---------+
-// | xapp  |        | submgr  |    | e2term  |
-// +-------+        +---------+    +---------+
-//     |                 |              |
-//     | RESTSubReq      |              |
-//     |---------------->|              |
-//     |                 |              |
-//     |     RESTSubResp |              |
-//     |<----------------|              |
-//     | RESTSubDelReq   |              |
-//     |---------------->|              |
-//     |  RESTSubDelResp |              |
-//     |     unsuccess   |              |
-//     |<----------------|              |
-//     |                 |              |
-//
-//-----------------------------------------------------------------------------
-func TestRESTSubReqAsn1EncodeFail(t *testing.T) {
-       CaseBegin("TestRESTSubReqAsn1EncodeFail")
-
-       xapp.Logger.Debug("Xapp-frame, v0.8.1 sufficient REST API validation")
-
-}
-
 //-----------------------------------------------------------------------------
 // TestRESTSubReqInsertAndSubDelOk
 //
@@ -4946,8 +5298,8 @@ func TestRESTSubReqAsn1EncodeFail(t *testing.T) {
 //     |<----------------|              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqInsertAndSubDelOk(t *testing.T) {
-       CaseBegin("TestRESTInsertSubReqAndSubDelOk")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -5020,8 +5372,8 @@ func TestRESTSubReqInsertAndSubDelOk(t *testing.T) {
 //     |<-------------|              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
-       CaseBegin("TestRESTSubReqNokAndSubDelOkWithRestartInMiddle")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -5030,16 +5382,12 @@ func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
                Counter{cSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
-               Counter{cRestSubFailNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cRestSubDelRespToXapp, 1},
        })
 
        const subReqCount int = 1
 
-       // Remove possible existing subscription
-       mainCtrl.removeExistingSubscriptions(t)
-
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
 
        //Req
@@ -5109,7 +5457,6 @@ func TestRESTSubReqNokAndSubDelOkWithRestartInMiddle(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndSubDelOkWithRestartInMiddle")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -5122,12 +5469,9 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
                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.Debug("Send REST subscriber request for subscriber : %v", restSubId)
 
@@ -5137,6 +5481,10 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(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 subscription
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
 
@@ -5204,9 +5552,7 @@ func TestRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
 //     |             |                 |              |
 //
 //-----------------------------------------------------------------------------
-
 func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
-       CaseBegin("TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5222,12 +5568,8 @@ 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.Debug("Send REST subscriber request for subscriber 1 : %v", restSubId1)
 
@@ -5244,15 +5586,24 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13560", "localhost:13660"})
 
        mainCtrl.SimulateRestart(t)
-       xapp.Logger.Debug("mainCtrl.SimulateRestart done")
+       xapp.Logger.Debug("mainCtrl.SimulateRestart done 1")
+
+       // 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")
+       xapp.Logger.Debug("mainCtrl.SimulateRestart done 2")
+
+       // 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)
+
        queryXappSubscription(t, int64(e2SubsId1), "RAN_NAME_1", []string{"localhost:13660"})
 
        // Delete subscription 2
@@ -5286,7 +5637,7 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
 //     |                 |<-------------|
 //     | RESTNotif       |              |
 //     |<----------------|              |
-//     |                 | SubReq       |
+//     |                 | SubReq       |   // Only one request sent in the teat case
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubResp |
@@ -5299,19 +5650,18 @@ func TestRESTSubReqAndSubDelOkSameActionWithRestartsInMiddle(t *testing.T) {
 //     | RESTSubDelReq   |              |
 //     |---------------->|              |
 //     |                 |              |
+//     |   RESTSubDelResp|              |
+//     |<----------------|              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelResp |
 //     |                 |<-------------|
 //     |                 |              |
-//     |   RESTSubDelResp|              |
-//     |<----------------|              |
 //
 //-----------------------------------------------------------------------------
 
 func TestRESTReportSubReqAndSubDelOk(t *testing.T) {
-       CaseBegin("TestRESTReportSubReqAndSubDelOk")
        const subReqCount int = 1
        testIndex := 1
        RESTReportSubReqAndSubDelOk(t, subReqCount, testIndex)
@@ -5320,6 +5670,18 @@ func TestRESTReportSubReqAndSubDelOk(t *testing.T) {
 func RESTReportSubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
        xapp.Logger.Debug("TEST: TestRESTReportSubReqAndSubDelOk with testIndex %v", testIndex)
 
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, uint64(subReqCount)},
+               Counter{cSubRespFromE2, uint64(subReqCount)},
+               Counter{cRestSubNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+               Counter{cSubDelReqToE2, uint64(subReqCount)},
+               Counter{cSubDelRespFromE2, uint64(subReqCount)},
+       })
+
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
@@ -5357,55 +5719,57 @@ func RESTReportSubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
-/*
-func TestRESTPolicySubReqAndSubDelOk(t *testing.T) {
-       CaseBegin("TestRESTPolicySubReqAndSubDelOk")
-
-       subReqCount := 2
-       testIndex := 1
-       RESTPolicySubReqAndSubDelOk(t, subReqCount, testIndex)
-
-       subReqCount = 19
-       testIndex = 2
-       RESTPolicySubReqAndSubDelOk(t, subReqCount, testIndex)
-}
-*/
-func RESTPolicySubReqAndSubDelOk(t *testing.T, subReqCount int, testIndex int) {
-       xapp.Logger.Debug("TEST: TestRESTPolicySubReqAndSubDelOk with testIndex %v", testIndex)
-
-       // Req
-       params := xappConn1.GetRESTSubsReqPolicyParams(subReqCount)
-       restSubId := xappConn1.SendRESTSubsReq(t, params)
-
-       var e2SubsId []uint32
-       for i := 0; i < subReqCount; i++ {
-               crereq, cremsg := e2termConn1.RecvSubsReq(t)
-               xappConn1.ExpectRESTNotification(t, restSubId)
-               e2termConn1.SendSubsResp(t, crereq, cremsg)
-               instanceId := xappConn1.WaitRESTNotification(t, restSubId)
-               xapp.Logger.Debug("TEST: REST notification received e2SubsId=%v", instanceId)
-               e2SubsId = append(e2SubsId, instanceId)
-       }
-
-       // Del
-       xappConn1.SendRESTSubsDelReq(t, &restSubId)
-
-       for i := 0; i < subReqCount; i++ {
-               delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
-               e2termConn1.SendSubsDelResp(t, delreq, delmsg)
-       }
-
-       // Wait that subs is cleaned
-       for i := 0; i < subReqCount; i++ {
-               mainCtrl.wait_subs_clean(t, e2SubsId[i], 10)
-       }
-       xappConn1.TestMsgChanEmpty(t)
-       e2termConn1.TestMsgChanEmpty(t)
-       mainCtrl.wait_registry_empty(t, 10)
-       mainCtrl.VerifyAllClean(t)
-}
+//-----------------------------------------------------------------------------
+// TestRESTTwoPolicySubReqAndSubDelOk
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |   RESTSubDelResp|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
 
 func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
 
@@ -5441,7 +5805,45 @@ func TestRESTTwoPolicySubReqAndSubDelOk(t *testing.T) {
        mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
 }
-func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
+
+//-----------------------------------------------------------------------------
+// TestRESTPolicySubReqAndSubDelOk19E2Subs
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |  ------
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |   E2 subscription x 19
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 |              |  ------
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |   RESTSubDelResp|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |  ------
+//     |                 |------------->|
+//     |                 |              |   E2 subscription delete x 19
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |  ------
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
+func TestRESTPolicySubReqAndSubDelOk19E2Subs(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 1},
@@ -5474,6 +5876,55 @@ func TestRESTPolicySubReqAndSubDelOkFullAmount(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTTwoPolicySubReqAndSubDelOk
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |   RESTSubDelResp|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
 
        subReqCount := 2
@@ -5509,6 +5960,55 @@ func TestRESTTwoReportSubReqAndSubDelOk(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTTwoReportSubReqAndSubDelOkNoActParams
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |   RESTSubDelResp|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
 
        subReqCount := 2
@@ -5544,7 +6044,44 @@ func TestRESTTwoReportSubReqAndSubDelOkNoActParams(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
-func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
+//-----------------------------------------------------------------------------
+// TestRESTReportSubReqAndSubDelOk19E2Subs
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RestSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 |              |  ------
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |   E2 subscription x 19
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     | RESTNotif       |              |
+//     |<----------------|              |
+//     |                 |              |  ------
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |   RESTSubDelResp|              |
+//     |<----------------|              |
+//     |                 | SubDelReq    |  ------
+//     |                 |------------->|
+//     |                 |              |   E2 subscription delete x 19
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |  ------
+//     |                 |              |
+//
+//-----------------------------------------------------------------------------
+
+func TestRESTReportSubReqAndSubDelOk19E2Subs(t *testing.T) {
 
        subReqCount := 19
 
@@ -5579,8 +6116,48 @@ func TestRESTFullAmountReportSubReqAndSubDelOk(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
-       CaseBegin("TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5626,8 +6203,48 @@ func TestRESTSubReqReportSameActionDiffEventTriggerDefinitionLen(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqReportSameActionDiffActionListLen
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
-       CaseBegin("TestRESTSubReqReportSameActionDiffActionListLen")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5678,8 +6295,48 @@ func TestRESTSubReqReportSameActionDiffActionListLen(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqReportSameActionDiffActionID
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
-       CaseBegin("TestRESTSubReqReportSameActionDiffActionID")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5724,8 +6381,48 @@ func TestRESTSubReqReportSameActionDiffActionID(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqDiffActionType
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqDiffActionType(t *testing.T) {
-       CaseBegin("TestRESTSubReqDiffActionType")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5775,8 +6472,48 @@ func TestRESTSubReqDiffActionType(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqPolicyAndSubDelOkSameAction
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
-       CaseBegin("TestRESTSubReqPolicyAndSubDelOkSameAction")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5826,8 +6563,48 @@ func TestRESTSubReqPolicyAndSubDelOkSameAction(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqReportSameActionDiffActionDefinitionLen
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
-       CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionLen")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5873,8 +6650,48 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionLen(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqReportSameActionDiffActionDefinitionContents
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
-       CaseBegin("TestRESTSubReqReportSameActionDiffActionDefinitionContents")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5920,8 +6737,48 @@ func TestRESTSubReqReportSameActionDiffActionDefinitionContents(t *testing.T) {
        mainCtrl.VerifyAllClean(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqReportSameActionDiffSubsAction
+//
+//   stub       stub                          stub
+// +-------+  +-------+     +---------+    +---------+
+// | xapp2 |  | xapp1 |     | submgr  |    | e2term  |
+// +-------+  +-------+     +---------+    +---------+
+//     |          |              |              |
+//     |          | RESTSubReq1  |              |
+//     |          |------------->|              |
+//     |          | RESTSubResp1 |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              | SubReq1      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |       RESTSubReq2       |              |
+//     |------------------------>|              |
+//     |       RESTSubResp2      |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |              | SubReq2      |
+//     |          |              |------------->|
+//     |          |              |              |
+//     |          |              |    SubResp1  |
+//     |          |              |<-------------|
+//     |          | RESTNotif1   |              |
+//     |          |<-------------|              |
+//     |          |              |              |
+//     |          |              |    SubResp2  |
+//     |          |              |<-------------|
+//     |       RESTNotif2        |              |
+//     |<------------------------|              |
+//     |          |              |              |
+//     |          |        [SUBS 1 DELETE]      |
+//     |          |              |              |
+//     |          |        [SUBS 2 DELETE]      |
+//     |          |              |              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
-       CaseBegin("TestRESTSubReqReportSameActionDiffSubsAction")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -5983,7 +6840,7 @@ func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubResp | ASN.1 decode fails
-//     |                 |<-------------|
+//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubReq       |
 //     |                 |------------->|
@@ -5993,11 +6850,26 @@ func TestRESTSubReqReportSameActionDiffSubsAction(t *testing.T) {
 //     | RESTNotif (fail)|              |
 //     |<----------------|              |
 //     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //
 //-----------------------------------------------------------------------------
 
 func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseDecodeFail")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 1},
+               Counter{cSubReReqToE2, 1},
+               Counter{cSubRespFromE2, 1},
+               Counter{cSubFailFromE2, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+       })
+
        const subReqCount int = 1
 
        // Req
@@ -6030,6 +6902,7 @@ func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6050,13 +6923,13 @@ func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubResp | Unknown instanceId
-//     |                 |<-------------|
+//     |                 |<-------------| No valid subscription found with subIds [0]
 //     |                 |              |
 //     |                 | SubReq       |
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubFail | Duplicated action
-//     |                 |<-------------|
+//     |                 |<-------------| No valid subscription found with subIds [0]
 //     | RESTNotif (fail)|              |
 //     |<----------------|              |
 //     |                 | SubDelReq    |
@@ -6064,11 +6937,29 @@ func TestRESTUnpackSubscriptionResponseDecodeFail(t *testing.T) {
 //     |                 |              |
 //     |                 |   SubDelResp |
 //     |                 |<-------------|
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //
 //-----------------------------------------------------------------------------
 
 func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseUnknownInstanceId")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 2},
+               Counter{cSubReReqToE2, 1},
+               Counter{cSubRespFromE2, 1},
+               Counter{cSubFailFromE2, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelRespFromE2, 1},
+       })
+
        const subReqCount int = 1
 
        // Req
@@ -6077,7 +6968,7 @@ func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
 
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
 
-       // Unknown instanceId in this response which will result resending original request
+       // Unknown instanceId in this response which will result resending original request
        orgInstanceId := crereq.RequestId.InstanceId
        crereq.RequestId.InstanceId = 0
        e2termConn1.SendSubsResp(t, crereq, cremsg)
@@ -6086,7 +6977,7 @@ func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
 
        xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
-       // Subscription already created in E2 Node.
+       // Subscription already created in E2 Node. E2 Node responds with failure but there is also same unknown instanceId 0
        fparams := &teststube2ap.E2StubSubsFailParams{}
        fparams.Set(crereq)
        fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
@@ -6107,6 +6998,7 @@ func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6127,30 +7019,51 @@ func TestRESTUnpackSubscriptionResponseUnknownInstanceId(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubResp | No transaction for the response
-//     |                 |<-------------|
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubReq       |
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubFail | Duplicated action
-//     |                 |<-------------|
+//     |                 |<-------------|Ongoing transaction not found. This will result timer expiry and sending delete
 //     | RESTNotif (fail)|              |
 //     |<----------------|              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelResp |
-//     |                 |<-------------|
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelResp |
-//     |                 |<-------------|
+//     |                 |<-------------| Ongoing transaction not found.
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionResponseNoTransaction")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 2},
+               Counter{cSubReReqToE2, 1},
+               Counter{cSubRespFromE2, 1},
+               Counter{cSubFailFromE2, 1},
+               Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 2},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cSubDelRespFromE2, 2},
+       })
+
        const subReqCount int = 1
 
        // Req
@@ -6192,6 +7105,7 @@ func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6212,7 +7126,7 @@ func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubFail | ASN.1 decode fails
-//     |                 |<-------------|
+//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubReq       |
 //     |                 |------------->|
@@ -6222,10 +7136,25 @@ func TestRESTUnpackSubscriptionResponseNoTransaction(t *testing.T) {
 //     | RESTNotif (fail)|              |
 //     |<----------------|              |
 //     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureDecodeFail")
+
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 1},
+               Counter{cSubReReqToE2, 1},
+               Counter{cSubFailFromE2, 2},
+               Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+       })
+
        const subReqCount int = 1
 
        // Req
@@ -6259,6 +7188,7 @@ func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6279,13 +7209,13 @@ func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubFail | Unknown instanceId
-//     |                 |<-------------|
+//     |                 |<-------------| No valid subscription found with subIds [0]. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubReq       |
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubFail | Duplicated action
-//     |                 |<-------------|
+//     |                 |<-------------|No valid subscription found with subIds [0]. This will result timer expiry and sending delete
 //     | RESTNotif (fail)|              |
 //     |<----------------|              |
 //     |                 | SubDelReq    |
@@ -6293,19 +7223,36 @@ func TestRESTUnpackSubscriptionFailureDecodeFail(t *testing.T) {
 //     |                 |              |
 //     |                 |   SubDelResp |
 //     |                 |<-------------|
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //
 //-----------------------------------------------------------------------------
 func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureUnknownInstanceId")
+
        const subReqCount int = 1
 
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 2},
+               Counter{cSubReReqToE2, 1},
+               Counter{cSubFailFromE2, 2},
+               Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelRespFromE2, 1},
+       })
+
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
 
        crereq, cremsg := e2termConn1.RecvSubsReq(t)
 
-       // Unknown instanceId in this response which will result resending original request
+       // Unknown instanceId in this response which will result resending original request
        fparams := &teststube2ap.E2StubSubsFailParams{}
        fparams.Set(crereq)
        fparams.Fail.RequestId.InstanceId = 0
@@ -6315,7 +7262,7 @@ func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
 
        xappConn1.ExpectRESTNotificationNok(t, restSubId, "allFail")
 
-       // Subscription already created in E2 Node.
+       // Subscription already created in E2 Node. E2 Node responds with failure but there is also same unknown instanceId 0
        fparams.SetCauseVal(0, 1, 3) // CauseRIC / duplicate-action
        e2termConn1.SendSubsFail(t, fparams, cremsg)
 
@@ -6334,6 +7281,7 @@ func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6354,26 +7302,52 @@ func TestRESTUnpackSubscriptionFailureUnknownInstanceId(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubFail | No transaction for the response
-//     |                 |<-------------|
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubReq       |
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |      SubFail | Duplicated action
-//     |                 |<-------------|
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and sending delete
 //     | RESTNotif (fail)|              |
 //     |<----------------|              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelResp |
-//     |                 |<-------------|
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------| Ongoing transaction not found.
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionFailureNoTransaction")
+
        const subReqCount int = 1
 
+       mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
+               Counter{cRestSubReqFromXapp, 1},
+               Counter{cRestSubRespToXapp, 1},
+               Counter{cSubReqToE2, 1},
+               Counter{cSubReqTimerExpiry, 2},
+               Counter{cSubReReqToE2, 1},
+               Counter{cSubFailFromE2, 2},
+               Counter{cRestSubFailNotifToXapp, 1},
+               Counter{cRestSubDelReqFromXapp, 1},
+               Counter{cRestSubDelRespToXapp, 1},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 2},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cSubDelRespFromE2, 2},
+       })
+
        // Req
        params := xappConn1.GetRESTSubsReqReportParams(subReqCount)
        restSubId := xappConn1.SendRESTSubsReq(t, params)
@@ -6414,6 +7388,7 @@ func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6436,19 +7411,36 @@ func TestRESTUnpackSubscriptionFailureNoTransaction(t *testing.T) {
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelResp | ASN.1 decode fails
-//     |                 |<-------------|
+//     |                 |   SubDelResp | ASN.1 decode fails.
+//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |   SubDelFail | Subscription does exist any more in E2 node
 //     |                 |<-------------|
 //     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseDecodeFail")
+
+       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},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 1},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cSubDelFailFromE2, 1},
+               Counter{cSubDelRespFromE2, 1},
+       })
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6461,7 +7453,7 @@ func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
 
        // Decode of this response fails which will result resending original request
-       e2termConn1.SendInvalidE2Asn1Resp(t, delmsg, xapp.RIC_SUB_DEL_REQ)
+       e2termConn1.SendInvalidE2Asn1Resp(t, delmsg, xapp.RIC_SUB_DEL_RESP)
 
        // E2t: Receive 2nd SubsDelReq and send SubsDelResp
        delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
@@ -6476,6 +7468,7 @@ func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6499,17 +7492,34 @@ func TestRESTUnpackSubscriptionDeleteResponseDecodeFail(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelResp | Unknown instanceId
-//     |                 |<-------------|
+//     |                 |<-------------| No valid subscription found with subIds [0]. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |   SubDelFail | Subscription does exist any more in E2 node
 //     |                 |<-------------|
-//
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId")
+
+       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},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 1},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cSubDelRespFromE2, 1},
+               Counter{cSubDelFailFromE2, 1},
+       })
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6538,6 +7548,7 @@ func TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6561,17 +7572,34 @@ func TestRESTUnpackSubscriptionDeleteResponseUnknownInstanceId(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelResp | No transaction for the response
-//     |                 |<-------------|
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelFail | Subscription does exist any more
-//     |                 |<-------------|
-//
+//     |                 |   SubDelFail | Subscription does exist any more in E2 node
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionDeleteResponseNoTransaction(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteResponseNoTransaction")
+
+       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},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 2},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cSubDelRespFromE2, 1},
+               Counter{cSubDelFailFromE2, 1},
+       })
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6601,6 +7629,7 @@ func TestRESTUnpackSubscriptionDeleteResponseNoTransaction(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6624,17 +7653,33 @@ func TestRESTUnpackSubscriptionDeleteResponseNoTransaction(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelFail | ASN.1 decode fails
-//     |                 |<-------------|
+//     |                 |<-------------| Decode failed. More data needed. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelFail | Subscription does exist any more
+//     |                 |   SubDelFail | Subscription does exist any more in E2 node
 //     |                 |<-------------|
-//
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionDeleteFailureDecodeFail(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteFailureDecodeFail")
+
+       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},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 1},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cSubDelFailFromE2, 2},
+       })
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6662,6 +7707,7 @@ func TestRESTUnpackSubscriptionDeleteFailureDecodeFail(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6685,17 +7731,33 @@ func TestRESTUnpackSubscriptionDeleteFailureDecodeFail(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelFail | Unknown instanceId
-//     |                 |<-------------|
+//     |                 |<-------------| No valid subscription found with subIds [0]. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelFail | Subscription does exist any more
-//     |                 |<-------------|
-//
+//     |                 |   SubDelFail | Subscription does exist any more in E2 node
+//     |                 |<-------------| No valid subscription found with subIds [0].
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId")
+
+       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},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 1},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cSubDelFailFromE2, 2},
+       })
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6707,14 +7769,14 @@ func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
        // E2t: Receive 1st SubsDelReq
        delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
 
-       // Unknown instanceId in this response which will result resending original request
+       // Unknown instanceId in this response which will result resending original request
        delreq.RequestId.InstanceId = 0
        e2termConn1.SendSubsDelFail(t, delreq, delmsg)
 
        // E2t: Receive 2nd SubsDelReq
        delreq, delmsg = e2termConn1.RecvSubsDelReq(t)
 
-       // Subscription does not exist in in E2 Node.
+       // Subscription does not exist in in E2 Node. E2 Node responds with failure but there is also same unknown instanceId 0
        e2termConn1.SendSubsDelFail(t, delreq, delmsg)
 
        // Wait that subs is cleaned
@@ -6724,6 +7786,7 @@ func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6747,17 +7810,33 @@ func TestRESTUnpackSubscriptionDeleteailureUnknownInstanceId(t *testing.T) {
 //     |                 |------------->|
 //     |                 |              |
 //     |                 |   SubDelFail | No transaction for the response
-//     |                 |<-------------|
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry and resending
 //     |                 |              |
 //     |                 | SubDelReq    |
 //     |                 |------------->|
 //     |                 |              |
-//     |                 |   SubDelFail | Subscription does exist any more
-//     |                 |<-------------|
-//
+//     |                 |   SubDelFail | Subscription does exist any more in E2 node
+//     |                 |<-------------| Ongoing transaction not found. This will result timer expiry
+//     |                 |              |
+//     |           [SUBS DELETE]        |
+//     |                 |              |
 //-----------------------------------------------------------------------------
+
 func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
-       xapp.Logger.Debug("TEST: TestRESTUnpackSubscriptionDeleteFailureNoTransaction")
+
+       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},
+               Counter{cSubDelReqToE2, 1},
+               Counter{cSubDelReqTimerExpiry, 2},
+               Counter{cSubDelReReqToE2, 1},
+               Counter{cSubDelFailFromE2, 2},
+       })
 
        // Req
        var params *teststube2ap.RESTSubsReqParams = nil
@@ -6787,6 +7866,7 @@ func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
        e2termConn1.TestMsgChanEmpty(t)
        mainCtrl.wait_registry_empty(t, 10)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6819,6 +7899,7 @@ func TestRESTUnpackSubscriptionDeleteFailureNoTransaction(t *testing.T) {
 //     |                 |              |
 //
 //-----------------------------------------------------------------------------
+
 func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
@@ -6851,12 +7932,59 @@ func TestRESTSubReqFailAsn1PackSubReqError(t *testing.T) {
 
        // Wait that subs is cleaned
        waitSubsCleanup(t, e2SubsId, 10)
-       mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
+//-----------------------------------------------------------------------------
+// TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction
+//
+//   stub                             stub
+// +-------+        +---------+    +---------+
+// | xapp  |        | submgr  |    | e2term  |
+// +-------+        +---------+    +---------+
+//     |                 |              |
+//     | RESTSubReq      |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |      SubResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |       RESTNotif |              |
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubReq      |              |  Policy modification
+//     |---------------->|              |
+//     |                 |              |
+//     |     RESTSubResp |              |
+//     |<----------------|              |
+//     |                 | SubReq       |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |              |
+//     |       RESTNotif(Unsuccessful)  |  E2 timeout
+//     |<----------------|              |
+//     |                 |              |
+//     | RESTSubDelReq   |              |
+//     |---------------->|              |
+//     |                 |              |
+//     |                 | SubDelReq    |
+//     |                 |------------->|
+//     |                 |              |
+//     |                 |   SubDelResp |
+//     |                 |<-------------|
+//     |                 |              |
+//     |  RESTSubDelResp |              |
+//     |<----------------|              |
+//
+//-----------------------------------------------------------------------------
+
 func TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction(t *testing.T) {
-       CaseBegin("TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -6910,9 +8038,8 @@ func TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction(t *testing.T) {
        e2termConn1.SendSubsDelResp(t, delreq, delmsg)
 
        waitSubsCleanup(t, e2SubsId, 10)
-
-       mainCtrl.VerifyCounterValues(t)
        mainCtrl.VerifyAllClean(t)
+       mainCtrl.VerifyCounterValues(t)
 }
 
 //-----------------------------------------------------------------------------
@@ -6962,7 +8089,6 @@ func TestRESTSubReqPolicyUpdateTimeoutAndSubDelOkSameAction(t *testing.T) {
 //-----------------------------------------------------------------------------
 
 func TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
-       CaseBegin("TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle")
 
        mainCtrl.CounterValuesToBeVeriefied(t, CountersToBeAdded{
                Counter{cRestSubReqFromXapp, 2},
@@ -6970,16 +8096,12 @@ func TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle(t *testing.T) {
                Counter{cSubReqToE2, 2},
                Counter{cSubRespFromE2, 1},
                Counter{cRestSubNotifToXapp, 1},
-               Counter{cRestSubFailNotifToXapp, 1},
                Counter{cRestSubDelReqFromXapp, 1},
                Counter{cSubDelReqToE2, 1},
                Counter{cSubDelRespFromE2, 1},
                Counter{cRestSubDelRespToXapp, 1},
        })
 
-       // Remove possible existing subscription
-       mainCtrl.removeExistingSubscriptions(t)
-
        const e2Timeout int64 = 1
        const e2RetryCount int64 = 0
        const routingNeeded bool = false
@@ -7017,6 +8139,10 @@ func TestPolicyUpdateRESTSubReqAndSubDelOkWithRestartInMiddle(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 subscription
        queryXappSubscription(t, int64(e2SubsId), "RAN_NAME_1", []string{"localhost:13560"})
 
@@ -7123,9 +8249,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) {