diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn
index dd133a3..e819688 100644
--- a/pcu/PCU_Tests_SNS.ttcn
+++ b/pcu/PCU_Tests_SNS.ttcn
@@ -132,7 +132,7 @@
 
 /* PCU-originated SNS-SIZE: successful case */
 testcase TC_sns_po_size_success() runs on RAW_Test_CT {
-	f_init_ns_codec();
+	f_init_ns_codec(mp_nsconfig);
 	f_init_pcuif();
 	f_incoming_sns_size();
 	f_sleep(1.0);
@@ -141,7 +141,7 @@
 
 /* PCU-originated SNS-SIZE: NACK from our side */
 testcase TC_sns_po_size_nack() runs on RAW_Test_CT {
-	f_init_ns_codec();
+	f_init_ns_codec(mp_nsconfig);
 	f_init_pcuif();
 	f_incoming_sns_size(NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED);
 	/* FIXME: ensure we don't get a SNS-CONFIG */
@@ -152,7 +152,7 @@
 
 /* PCU-originated SNS-CONFIG: successful case */
 testcase TC_sns_po_config_success() runs on RAW_Test_CT {
-	f_init_ns_codec();
+	f_init_ns_codec(mp_nsconfig);
 	f_init_pcuif();
 	f_incoming_sns_size();
 	f_incoming_sns_config();
@@ -162,7 +162,7 @@
 
 /* PCU-originated SNS-CONFIG: successful case */
 testcase TC_sns_po_config_nack() runs on RAW_Test_CT {
-	f_init_ns_codec();
+	f_init_ns_codec(mp_nsconfig);
 	f_init_pcuif();
 	f_incoming_sns_size();
 	f_incoming_sns_config(NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED);
@@ -174,7 +174,7 @@
 
 /* SGSN-originated SNS-SIZE: successful case */
 testcase TC_sns_so_config_success() runs on RAW_Test_CT {
-	f_init_ns_codec();
+	f_init_ns_codec(mp_nsconfig);
 	f_init_pcuif();
 	f_incoming_sns_size();
 	f_incoming_sns_config();
@@ -199,8 +199,8 @@
 
 private function f_sns_bringup_1c1u(boolean sgsn_originated_reset := false) runs on RAW_Test_CT {
 	/* Activate two NS codec ports */
-	f_init_ns_codec();
-	f_init_ns_codec(1);
+	f_init_ns_codec(mp_nsconfig);
+	f_init_ns_codec(mp_nsconfig, 1);
 	f_init_pcuif();
 	/* Perform Size + BSS-originated config */
 	f_incoming_sns_size();
@@ -244,9 +244,9 @@
 
 private function f_sns_bringup_1c1u_separate(boolean sgsn_originated_reset := false) runs on RAW_Test_CT {
 	/* Activate two NS codec ports */
-	f_init_ns_codec();
-	f_init_ns_codec(1);
-	f_init_ns_codec(2);
+	f_init_ns_codec(mp_nsconfig);
+	f_init_ns_codec(mp_nsconfig, 1);
+	f_init_ns_codec(mp_nsconfig, 2);
 	f_init_pcuif();
 	/* Perform Size + BSS-originated config */
 	f_incoming_sns_size();
@@ -303,9 +303,9 @@
 /* Transmit BVC-RESET before NS-ALIVE of PCU was ACKed: expect no response */
 testcase TC_sns_1c1u_so_bvc_reset_too_early() runs on RAW_Test_CT {
 	/* Activate two NS codec ports */
-	f_init_ns_codec();
-	f_init_ns_codec(1);
-	f_init_ns_codec(2);
+	f_init_ns_codec(mp_nsconfig);
+	f_init_ns_codec(mp_nsconfig, 1);
+	f_init_ns_codec(mp_nsconfig, 2);
 	f_init_pcuif();
 	/* Perform Size + BSS-originated config */
 	f_incoming_sns_size();
@@ -331,7 +331,7 @@
 	f_sns_bringup_1c1u();
 
 	/* crate another NS codec port on the tester side */
-	f_init_ns_codec(2);
+	f_init_ns_codec(mp_nsconfig, 2);
 
 	f_outgoing_sns_add(idx_add := 2, w_sig := 0, w_user := 1, idx := 0);