diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 5ae153f..91ccbb0 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -325,6 +325,9 @@
 type record of NSConfiguration NSConfigurations;
 type record of BssgpCellId BssgpCellIds;
 
+/* you cannot simply change this to any larger number of SGSNs and expect all test
+ * cases to work.  This would have overly complicated the code.  Check below for
+ * tests that use interleave on SGSN_MGMT.receive() for each SGSN NSEI for example */
 const integer NUM_SGSN := 2;
 
 type component test_CT {
@@ -2399,7 +2402,9 @@
 	/* expect state on both PCU and SGSN side to change */
 	interleave {
 	[] PCU_MGMT.receive(tr_BssgpStsInd(nsei_pcu, bvc_cfg.bvci, BVC_S_BLOCKED)) from bvc_ct;
-	[] SGSN_MGMT.receive(tr_BssgpStsInd(*, bvc_cfg.bvci, BVC_S_BLOCKED));
+	[] SGSN_MGMT.receive(tr_BssgpStsInd(mp_nsconfig_sgsn[0].nsei, bvc_cfg.bvci, BVC_S_BLOCKED));
+	[] SGSN_MGMT.receive(tr_BssgpStsInd(mp_nsconfig_sgsn[1].nsei, bvc_cfg.bvci, BVC_S_BLOCKED));
+	/* Doesn't auto-scale with NUM_SGSN */
 	}
 	setverdict(pass);
 }
@@ -2425,7 +2430,9 @@
 	/* expect state on both PCU and SGSN side to change */
 	interleave {
 	[] PCU_MGMT.receive(tr_BssgpStsInd(nsei_pcu, bvc_cfg.bvci, BVC_S_UNBLOCKED)) from bvc_ct;
-	[] SGSN_MGMT.receive(tr_BssgpStsInd(*, bvc_cfg.bvci, BVC_S_UNBLOCKED));
+	[] SGSN_MGMT.receive(tr_BssgpStsInd(mp_nsconfig_sgsn[0].nsei, bvc_cfg.bvci, BVC_S_UNBLOCKED));
+	[] SGSN_MGMT.receive(tr_BssgpStsInd(mp_nsconfig_sgsn[1].nsei, bvc_cfg.bvci, BVC_S_UNBLOCKED));
+	/* Doesn't auto-scale with NUM_SGSN */
 	}
 	setverdict(pass);
 }