diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 97c5644..69ee7b3 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -895,11 +895,11 @@
 	timer T := 2.0;
 
 	HNBAP[hnb_idx].send(ts_HNBAP_HNBRegisterRequest(char2oct("TTCN3-HNB-" & int2str(hnb_idx)),
-					'00F110'O,
+					hex2oct(g_hnb_cfg[hnb_idx].lai.mcc_mnc),
 					int2bit(1 + cell_id, 28),
-					int2oct(2, 2),
-					int2oct(3, 1),
-					int2oct(4, 2)));
+					int2oct(g_hnb_cfg[hnb_idx].lai.lac, 2),
+					int2oct(0, 1),
+					int2oct(g_hnb_cfg[hnb_idx].sac, 2)));
 
 	T.start;
 	alt {
@@ -1531,7 +1531,8 @@
 	g_num_hnbs := 1;
 	f_init();
 
-	vc_conn := f_start_handler_with_pars(refers(f_tc_rab_release), t_pars(8, rab_rel_cause := ts_RanapCause_radio_conn_lost));
+	vc_conn := f_start_handler_with_pars(refers(f_tc_rab_release),
+					     t_pars(8, rab_rel_cause := ts_RanapCause_radio_conn_lost));
 	vc_conn.done;
 
 	f_shutdown_helper();