diff --git a/test/xapp/forwarder.go b/test/xapp/forwarder.go
index 63ec16f..d6032a4 100755
--- a/test/xapp/forwarder.go
+++ b/test/xapp/forwarder.go
@@ -8,7 +8,8 @@
 }
 
 func (m Forwarder) Consume(params *xapp.RMRParams) (err error) {
-	xapp.Logger.Debug("Message received - type=%d subId=%d meid=%v xid=%v", params.Mtype, params.SubId, params.Meid, params.Xid)
+	xapp.Logger.Debug("Message received - type=%d txid=%s subId=%d meid=%v", 
+			params.Mtype, params.Xid, params.SubId, params.Meid)
 
 	// Store data and reply with the same message payload
 	if xapp.Config.GetInt("test.store") != 0 {
@@ -27,7 +28,7 @@
 		params.SubId = sid
 	}
 
-	if ok := xapp.Rmr.SendMsg(params); !ok {
+	if ok := xapp.Rmr.SendRts(params); !ok {
 		xapp.Logger.Info("Rmr.Send failed ...")
 	}
 	return
diff --git a/test/xapp/generator.go b/test/xapp/generator.go
index 7db5f80..25cb0c3 100755
--- a/test/xapp/generator.go
+++ b/test/xapp/generator.go
@@ -18,7 +18,7 @@
 }
 
 func (m Generator) Consume(params *xapp.RMRParams) (err error) {
-	xapp.Logger.Debug("message received - type=%d subId=%d meid=%v", params.Mtype, params.SubId, params.Meid)
+	xapp.Logger.Debug("message received - type=%d txid=%s ubId=%d meid=%v", params.Mtype, params.Xid, params.SubId, params.Meid)
 
 	mux.Lock()
 	rx++
@@ -59,7 +59,7 @@
 		params.SubId = subId
 		params.Payload = s
 		params.Meid = &xapp.RMRMeid{PlmnID: "123456", EnbID: "7788"}
-		params.Xid = "TestXID"
+		params.Xid = "TestXID1234"
 		if ok := xapp.Rmr.SendMsg(params); ok {
 			tx++
 			if ack != 0 {