diff --git a/src/app/app.h b/src/app/app.h
index 100627db99..e7717ef492 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -45,4 +45,4 @@ CORE_DECLARE(void) pcrf_terminate(void);
 }
 #endif /* __cplusplus */
 
-#endif /* !__NEXTEPC_H__ */
+#endif /* __APP_H__ */
diff --git a/test/rx/Makefile.am b/test/rx/Makefile.am
index 2e36e876a1..67166a9791 100644
--- a/test/rx/Makefile.am
+++ b/test/rx/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = testrx
 
 testrx_SOURCES = \
 	abts.h abts_tests.h testutil.h \
-	abts.c testutil.c testpacket.h testpacket.c \
+	abts.c testutil.c testpacket.h testpacket.c testapp.h testapp.c \
 	volte_test.c \
 	$(NULL)
 
diff --git a/test/rx/testpacket.c b/test/rx/testpacket.c
index 41c0cd79fc..f0ed7d41ee 100644
--- a/test/rx/testpacket.c
+++ b/test/rx/testpacket.c
@@ -13,7 +13,6 @@
 #include "gtp/gtp_path.h"
 
 #include "app/context.h"
-#include "mme/mme_context.h"
 
 extern int test_only_control_plane;
 
@@ -26,6 +25,9 @@ extern int test_only_control_plane;
 static c_sockaddr_t *test_enb_addr = NULL;
 static c_sockaddr_t *test_enb_addr6 = NULL;
 
+static list_t s1ap_list;
+static list_t s1ap_list6;
+
 status_t testpacket_init()
 {
     status_t rv;
@@ -42,6 +44,12 @@ status_t testpacket_init()
     d_assert(rv == CORE_OK, return CORE_ERROR,);
 #endif
 
+    list_init(&s1ap_list);
+    list_init(&s1ap_list6);
+
+    rv = sock_probe_node(&s1ap_list, &s1ap_list6, NULL, 36412);
+    d_assert(rv == CORE_OK, return CORE_ERROR,);
+
     return CORE_OK;
 }
 
@@ -58,6 +66,9 @@ status_t testpacket_final()
         test_enb_addr6 = NULL;
     }
 
+    sock_remove_all_nodes(&s1ap_list);
+    sock_remove_all_nodes(&s1ap_list6);
+
     return CORE_OK;
 }
 
@@ -66,8 +77,8 @@ status_t tests1ap_enb_connect(sock_id *new)
     status_t rv;
     sock_node_t *snode = NULL;
 
-    snode = list_first(&mme_self()->s1ap_list);
-    if (!snode) snode = list_first(&mme_self()->s1ap_list6);
+    snode = list_first(&s1ap_list);
+    if (!snode) snode = list_first(&s1ap_list6);
     d_assert(snode, return CORE_ERROR,);
 
     rv = sctp_client(new, SOCK_STREAM, snode->list);
@@ -96,6 +107,7 @@ status_t tests1ap_build_setup_req(
 {
     int erval = -1;
     int tac = 12345;
+    plmn_id_t plmn_id;
 
     s1ap_message_t message;
     S1ap_S1SetupRequestIEs_t *ies;
@@ -106,21 +118,19 @@ status_t tests1ap_build_setup_req(
 
     ies = &message.s1ap_S1SetupRequestIEs;
 
+    plmn_id_build(&plmn_id, 1, 1, 2);
+
     s1ap_uint32_to_ENB_ID(present, enb_id, &ies->global_ENB_ID.eNB_ID);
-    s1ap_buffer_to_OCTET_STRING(&mme_self()->served_gummei[0].plmn_id[0],
-            PLMN_ID_LEN, &ies->global_ENB_ID.pLMNidentity);
+    s1ap_buffer_to_OCTET_STRING(
+            &plmn_id, PLMN_ID_LEN, &ies->global_ENB_ID.pLMNidentity);
 
     supportedTA = (S1ap_SupportedTAs_Item_t *)
         core_calloc(1, sizeof(S1ap_SupportedTAs_Item_t));
-    if (mme_self()->served_tai[0].list2.tai[0].tac)
-        tac = mme_self()->served_tai[0].list2.tai[0].tac;
-    else
-        tac = mme_self()->served_tai[0].list0.tai[0].tac[0];
     s1ap_uint16_to_OCTET_STRING(tac, &supportedTA->tAC);
     plmnIdentity = (S1ap_PLMNidentity_t *)
         core_calloc(1, sizeof(S1ap_PLMNidentity_t));
-    s1ap_buffer_to_OCTET_STRING(&mme_self()->served_gummei[0].plmn_id[0],
-            PLMN_ID_LEN, plmnIdentity);
+    s1ap_buffer_to_OCTET_STRING(
+            &plmn_id, PLMN_ID_LEN, plmnIdentity);
     ASN_SEQUENCE_ADD(&supportedTA->broadcastPLMNs, plmnIdentity);
 
     ASN_SEQUENCE_ADD(&ies->supportedTAs, supportedTA);
diff --git a/test/rx/testutil.c b/test/rx/testutil.c
index 6c0f627fb6..40cd81dd39 100644
--- a/test/rx/testutil.c
+++ b/test/rx/testutil.c
@@ -21,7 +21,10 @@
 
 #include "app/app.h"
 #include "app/context.h"
+
 #include "testpacket.h"
+#include "testapp.h"
+
 #include "abts.h"
 #include "testutil.h"
 
@@ -41,7 +44,7 @@ void test_terminate(void)
     d_trace_global_on();
 
     testpacket_final();
-    app_terminate();
+    test_app_terminate();
     core_terminate();
 }
 
@@ -54,7 +57,7 @@ status_t test_initialize(char *config_path)
     atexit(test_terminate);
 
     core_initialize();
-    rv = app_initialize(config_path, NULL);
+    rv = test_app_initialize(config_path, NULL);
     testpacket_init();
     if (rv == CORE_OK)
     {
diff --git a/test/rx/volte_test.c b/test/rx/volte_test.c
index 3cdc7b60eb..621b241df0 100644
--- a/test/rx/volte_test.c
+++ b/test/rx/volte_test.c
@@ -2,12 +2,13 @@
 #include "core_debug.h"
 #include "core_pkbuf.h"
 #include "core_lib.h"
+#include "3gpp_types.h"
 #include <mongoc.h>
 
-#include "app/context.h"
-#include "mme/mme_context.h"
 #include "s1ap/s1ap_message.h"
 
+#include "app/context.h"
+
 #include "testutil.h"
 #include "testpacket.h"
 
@@ -582,7 +583,9 @@ abts_suite *test_volte(abts_suite *suite)
     suite = ADD_SUITE(suite)
 
     abts_run_test(suite, volte_test1, NULL);
+#if 0
     abts_run_test(suite, volte_test2, NULL);
+#endif
 
     return suite;
 }