diff --git a/gbproxy/GBProxy_Tests.fr.cfg b/gbproxy/GBProxy_Tests.fr.cfg
index 9b31dfd..7b63125 100644
--- a/gbproxy/GBProxy_Tests.fr.cfg
+++ b/gbproxy/GBProxy_Tests.fr.cfg
@@ -20,7 +20,7 @@
 
 GBProxy_Tests.mp_nsconfig_pcu := {
 	{
-		nsei := 1,
+		nsei := 2001,
 		role_sgsn := false,
 		handle_sns := false,
 		nsvc := {
@@ -58,30 +58,56 @@
 				nsvci := 4
 			}
 		}
-	}
-}
-GBProxy_Tests.mp_gbconfigs := {
-		{
-			nsei := 1,
-			sgsn_role := false,
-			bvc := {
-				{
-					bvci := 196,
-					cell_id := {
-						ra_id := {
-							lai := {
-								mcc_mnc := '262F42'H,
-								lac := 13135
-							},
-							rac := 0
-						},
-						cell_id := 20960
-					},
-					depth := BSSGP_DECODE_DEPTH_BSSGP
-				}
+	},
+	{
+		nsei := 2002,
+		role_sgsn := false,
+		handle_sns := false,
+		nsvc := {
+			{
+				provider := {
+					fr := {
+						netdev := "hdlc5",
+						dlci := 20
+					}
+				},
+				nsvci := 5
+			}, {
+				provider := {
+					fr := {
+						netdev := "hdlc6",
+						dlci := 21
+					}
+				},
+				nsvci := 6
 			}
 		}
-	};
+	},
+	{
+		nsei := 2003,
+		role_sgsn := false,
+		handle_sns := false,
+		nsvc := {
+			{
+				provider := {
+					fr := {
+						netdev := "hdlc7",
+						dlci := 22
+					}
+				},
+				nsvci := 7
+			}, {
+				provider := {
+					fr := {
+						netdev := "hdlc8",
+						dlci := 23
+					}
+				},
+				nsvci := 8
+			}
+		}
+	}
+}
 
 [MAIN_CONTROLLER]