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) {