diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn
index 311cab6..a2c5e82 100644
--- a/fr/FR_Tests.ttcn
+++ b/fr/FR_Tests.ttcn
@@ -119,7 +119,9 @@
 type record UE_Pars {
 	hexstring imsi,
 	OCT4 tlli,
-	float tguard
+	float tguard,
+	BssgpBvci bvci,
+	BssgpCellId cell_id
 };
 
 type function void_fn(charstring id) runs on UE_CT;
@@ -158,14 +160,16 @@
 }
 
 /* start a single UE component; connect it to BSSGP */
-function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0)
+function f_start_ue(void_fn fn, charstring id, BssgpBvcConfig bvc, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0)
 runs on test_CT return UE_CT
 {
 	var UE_CT ue_comp;
 	var UE_Pars ue_pars := {
 		imsi := f_gen_imsi(imsi_suffix),
 		tlli := f_gprs_tlli_random(),
-		tguard := t_guard
+		tguard := t_guard,
+		bvci := bvc.bvci,
+		cell_id := bvc.cell_id
 	};
 
 	ue_comp := UE_CT.create(id);
@@ -203,7 +207,7 @@
 			for (var integer k := 0; k < ue_per_bvc; k := k+1) {
 				var charstring id := "gb" & int2str(i) & "-bvc" & int2str(g_gb[i].cfg.bvc[j].bvci) & "-UEsim" & int2str(k);
 				var UE_CT ue;
-				ue := f_start_ue(ue_fn, id, g_gb[i], i*10000+j*100+k, bvc_comp,
+				ue := f_start_ue(ue_fn, id, g_gb[i].cfg.bvc[j], i*10000+j*100+k, bvc_comp,
 ue_tguard);
 				ues := ues & { ue };
 				/* a bit of staggering to ensure the timers above don't run all at the same time */