Merge "Unit test cases improvements - Some fixed delays replaced with function which...

diff --cc pkg/control/ut_messaging_test.go
index 23a12a9,10e10b7..4117aff
--- 1/pkg/control/ut_messaging_test.go
--- 2/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@@ -3289,9 -3294,9 +3293,9 @@@ func TestRESTSubReqRetransmissionV5(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)