diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index b791782..e37bc52 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -5721,7 +5721,7 @@
 	f_vty_transceive(MSCVTY, "configure terminal");
 	f_vty_transceive(MSCVTY, "msc");
 	f_vty_transceive(MSCVTY, "neighbor a cgi 262 42 23 42 ran-pc 0.24.1");
-	f_vty_transceive(MSCVTY, "neighbor a lac 5 ran-pc 0.24.2");
+	f_vty_transceive(MSCVTY, "neighbor a cgi 023 42 5 6 ran-pc 0.24.2");
 	f_vty_transceive(MSCVTY, "exit");
 	f_vty_transceive(MSCVTY, "exit");
 
@@ -5736,7 +5736,7 @@
 	var BssmapCause cause := enum2int(cause_val);
 
 	var template BSSMAP_FIELD_CellIdentificationList cil;
-	cil := { cIl_LAI := { ts_BSSMAP_CI_LAI('023'H, '42'H, 5) } };
+	cil := { cIl_CGI := { ts_BSSMAP_CI_CGI('023'H, '42'H, 5, 6) } };
 
 	/* old BSS sends Handover Required */
 	BSSAP.send(ts_BSSMAP_HandoverRequired(cause, cil));
@@ -5841,7 +5841,7 @@
 	var BssmapCause cause := enum2int(cause_val);
 
 	var template BSSMAP_FIELD_CellIdentificationList cil;
-	cil := { cIl_LAI := { ts_BSSMAP_CI_LAI('262'H, '42'H, 23) } };
+	cil := { cIl_CGI := { ts_BSSMAP_CI_CGI('262'H, '42'H, 23, 42) } };
 
 	/* old BSS sends Handover Required */
 	BSSAP.send(ts_BSSMAP_HandoverRequired(cause, cil));