diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 9b883c7..8e6bd55 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -1621,7 +1621,7 @@
 private function f_TC_paging_ps_sig_bss(charstring id) runs on BSSGP_ConnHdlr
 {
 	/* we expect the paging to arrive on all three NSE */
-	f_send_paging_ps_exp_multi(ts_BssgpP4BssArea, 0, {0, 1, 2});
+	f_send_paging_ps_exp_multi(ts_BssgpP4BssArea, g_pars.sgsn_idx, {0, 1, 2});
 }
 testcase TC_paging_ps_sig_bss() runs on test_CT {
 	f_init();
@@ -1633,12 +1633,12 @@
 private function f_TC_paging_ps_sig_lac(charstring id) runs on BSSGP_ConnHdlr
 {
 	/* The first LAC (13135) is shared by all three NSEs */
-	f_send_paging_ps_exp_multi(ts_BssgpP4LAC(pcu_bvc_cfg[0].cell_id.ra_id.lai), 0, {0, 1, 2});
+	f_send_paging_ps_exp_multi(ts_BssgpP4LAC(pcu_bvc_cfg[0].cell_id.ra_id.lai), g_pars.sgsn_idx, {0, 1, 2});
 	/* Reset state */
 	g_roi := {};
 	/* Make LAC (13300) available on pcu index 2 */
 	f_connect_to_pcu_bvc(port_idx := 2, nse_idx := 2, bvc_idx := 1);
-	f_send_paging_ps_exp_multi(ts_BssgpP4LAC(pcu_bvc_cfg[2].cell_id.ra_id.lai), 0, {2});
+	f_send_paging_ps_exp_multi(ts_BssgpP4LAC(pcu_bvc_cfg[2].cell_id.ra_id.lai), g_pars.sgsn_idx, {2});
 }
 testcase TC_paging_ps_sig_lac() runs on test_CT {
 	f_init();
@@ -1665,14 +1665,14 @@
 private function f_TC_paging_ps_sig_rac(charstring id) runs on BSSGP_ConnHdlr
 {
 	/* Only PCU index 0 has a matching BVC with the RA ID */
-	f_send_paging_ps_exp_multi(ts_BssgpP4RAC(pcu_bvc_cfg[0].cell_id.ra_id), 0, {0});
+	f_send_paging_ps_exp_multi(ts_BssgpP4RAC(pcu_bvc_cfg[0].cell_id.ra_id), g_pars.sgsn_idx, {0});
 	g_roi := {};
 	/* PCU index 1 and 2 have a matching BVC with the RA ID */
-	f_send_paging_ps_exp_multi(ts_BssgpP4RAC(pcu_bvc_cfg[2].cell_id.ra_id), 0, {1, 2});
+	f_send_paging_ps_exp_multi(ts_BssgpP4RAC(pcu_bvc_cfg[2].cell_id.ra_id), g_pars.sgsn_idx, {1, 2});
 	g_roi := {};
 	/* PCU index 2 has two matching BVCs with the RA ID */
 	f_connect_to_pcu_bvc(port_idx := 2, nse_idx := 2, bvc_idx := 1);
-	f_send_paging_ps_exp_multi(ts_BssgpP4RAC(pcu_bvc_cfg[2].cell_id.ra_id), 0, {2});
+	f_send_paging_ps_exp_multi(ts_BssgpP4RAC(pcu_bvc_cfg[2].cell_id.ra_id), g_pars.sgsn_idx, {2});
 }
 testcase TC_paging_ps_sig_rac() runs on test_CT {
 	f_init();
@@ -1701,7 +1701,7 @@
 /* PS-PAGING on SIG-BVC for BVCI (one cell) */
 private function f_TC_paging_ps_sig_bvci(charstring id) runs on BSSGP_ConnHdlr
 {
-	f_send_paging_ps_exp_multi(ts_BssgpP4Bvci(pcu_bvc_cfg[0].bvci), 0, {0});
+	f_send_paging_ps_exp_multi(ts_BssgpP4Bvci(pcu_bvc_cfg[0].bvci), g_pars.sgsn_idx, {0});
 }
 testcase TC_paging_ps_sig_bvci() runs on test_CT {
 	f_init();
@@ -1720,7 +1720,7 @@
 private function f_TC_paging_ps_reject_sig_bvci(charstring id) runs on BSSGP_ConnHdlr
 {
 	/* first send the PS-PAGING from SGSN -> PCU */
-	f_send_paging_ps_exp_multi(ts_BssgpP4Bvci(pcu_bvc_cfg[0].bvci), 0, {0});
+	f_send_paging_ps_exp_multi(ts_BssgpP4Bvci(pcu_bvc_cfg[0].bvci), g_pars.sgsn_idx, {0});
 	/* then simulate the PS-PAGING-REJECT from the PCU */
 	f_send_paging_ps_rej(use_sig:=true);