diff --git a/src/tests/ranap_common_cn.c b/src/tests/ranap_common_cn.c
index a26df03..be0c583 100644
--- a/src/tests/ranap_common_cn.c
+++ b/src/tests/ranap_common_cn.c
@@ -27,8 +27,9 @@
 
 #include "ranap_common.h"
 #include "ranap_ies_defs.h"
+#include "ranap_common_cn.h"
 
-#include "cn_ranap_common.h"
+#include "hnbgw.h"
 
 static int cn_ranap_rx_initiating_msg_co(void *ctx, RANAP_InitiatingMessage_t *imsg,
 					 ranap_message *message)
@@ -148,7 +149,6 @@
 
 	memset(&message, 0, sizeof(message));
 
-	memset(pdu, 0, sizeof(*pdu));
 	dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu,
 			      data, len, 0, 0);
 	if (dec_ret.code != RC_OK) {
@@ -282,7 +282,6 @@
 
 	memset(&message, 0, sizeof(message));
 
-	memset(pdu, 0, sizeof(*pdu));
 	dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu,
 			      data, len, 0, 0);
 	if (dec_ret.code != RC_OK) {
diff --git a/src/tests/rua_helper.c b/src/tests/rua_helper.c
index 70e7724..d1dcbf6 100644
--- a/src/tests/rua_helper.c
+++ b/src/tests/rua_helper.c
@@ -58,8 +58,6 @@
 	if (rc < 0)
 		return NULL;
 
-	msgb_free(inmsg);
-
 	msg = rua_generate_initiating_message(RUA_ProcedureCode_id_Connect,
 					      RUA_Criticality_reject,
 					      &asn_DEF_RUA_Connect,
@@ -96,8 +94,6 @@
 	if (rc < 0)
 		return NULL;
 
-	msgb_free(inmsg);
-
 	msg = rua_generate_initiating_message(RUA_ProcedureCode_id_DirectTransfer,
 					      RUA_Criticality_reject,
 					      &asn_DEF_RUA_DirectTransfer,
@@ -132,16 +128,14 @@
 	if (inmsg && inmsg->data&& msgb_length(inmsg)) {
 		ies.presenceMask |= DISCONNECTIES_RUA_RANAP_MESSAGE_PRESENT;
 		OCTET_STRING_fromBuf(&ies.ranaP_Message.buf, inmsg->data, msgb_length(inmsg));
-		msgb_free(inmsg);
 	}
+	msgb_free(inmsg);
 
 	memset(&out, 0, sizeof(out));
 	rc = rua_encode_disconnecties(&out, &ies);
 	if (rc < 0)
 		return NULL;
 
-	msgb_free(inmsg);
-
 	msg = rua_generate_initiating_message(RUA_ProcedureCode_id_Disconnect,
 					      RUA_Criticality_reject,
 					      &asn_DEF_RUA_Disconnect,