Some cleaning and bug fixes

Change-Id: Ic7660b9ec386b152262ac8502cc1ebadca8c56b6
Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>
diff --git a/pkg/control/ut_messaging_test.go b/pkg/control/ut_messaging_test.go
index 40207b3..2e8bc0e 100644
--- a/pkg/control/ut_messaging_test.go
+++ b/pkg/control/ut_messaging_test.go
@@ -56,7 +56,7 @@
 	waiter.WaitResult(t)
 
 	//Wait that subs is cleaned
-	mainCtrl.wait_subs_clean(t, int(newSubsId), 10)
+	mainCtrl.wait_subs_clean(t, newSubsId, 10)
 
 	xappConn1.TestMsgCnt(t)
 	xappConn2.TestMsgCnt(t)
@@ -585,7 +585,7 @@
 	e2termConn.handle_e2term_subs_del_resp(t, delreq, delmsg)
 
 	// Wait that subs is cleaned
-	mainCtrl.wait_subs_clean(t, int(delreq.RequestId.Seq), 10)
+	mainCtrl.wait_subs_clean(t, delreq.RequestId.Seq, 10)
 
 	xappConn1.TestMsgCnt(t)
 	xappConn2.TestMsgCnt(t)
@@ -642,7 +642,7 @@
 	delreq, _ := e2termConn.handle_e2term_subs_del_req(t)
 
 	// Wait that subs is cleaned
-	mainCtrl.wait_subs_clean(t, int(delreq.RequestId.Seq), 15)
+	mainCtrl.wait_subs_clean(t, delreq.RequestId.Seq, 15)
 
 	xappConn1.TestMsgCnt(t)
 	xappConn2.TestMsgCnt(t)
@@ -1156,7 +1156,7 @@
 	e2termConn.handle_e2term_subs_del_resp(t, delreq1, delmsg1)
 
 	//Wait that subs is cleaned
-	mainCtrl.wait_subs_clean(t, int(delreq1.RequestId.Seq), 10)
+	mainCtrl.wait_subs_clean(t, delreq1.RequestId.Seq, 10)
 
 	xappConn1.TestMsgCnt(t)
 	xappConn2.TestMsgCnt(t)