diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn
index 83cf07d..437ba0b 100644
--- a/cbc/CBC_Tests.ttcn
+++ b/cbc/CBC_Tests.ttcn
@@ -345,13 +345,9 @@
 }
 
 private function f_bsc_create_and_delete() runs on BSC_ConnHdlr {
-	var template (omit) BSSMAP_FIELD_CellIdentificationList cell_list_success := omit;
-	if (ispresent(g_pars.cell_list_success)) {
-		cell_list_success := g_pars.cell_list_success;
-	}
-	f_cbsp_handle_write(g_pars.exp_cbs_msg, 0, cell_list_success);
+	f_cbsp_handle_write(g_pars.exp_cbs_msg, 0, g_pars.cell_list_success);
 	f_cbsp_handle_kill(0, g_pars.exp_cbs_msg.msg_id, g_pars.exp_cbs_msg.ser_nr,
-			   exp_list:=cell_list_success, tx_list:=cell_list_success,
+			   exp_list:=g_pars.cell_list_success, tx_list:=g_pars.cell_list_success,
 			   tx_fail_list:=omit, tx_compl_list:=omit,
 			   channel_ind:=g_pars.exp_cbs_msg.channel_ind);
 }