diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 132e13e..1b6c9b2 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -674,7 +674,7 @@
  ***********************************************************************/
 
 /* Stress test: Do 500 channel activations/deactivations in rapid succession */
-function f_TC_chan_act_stress(charstring id) runs on ConnHdlr {
+private function f_TC_chan_act_stress(charstring id) runs on ConnHdlr {
 	for (var integer i := 0; i < 500; i := i+1) {
 		f_rsl_chan_act(g_pars.chan_mode);
 		f_rsl_chan_deact();
@@ -691,7 +691,7 @@
 }
 
 /* Test if re-activation of an already active channel fails as expected */
-function f_TC_chan_act_react(charstring id) runs on ConnHdlr {
+private function f_TC_chan_act_react(charstring id) runs on ConnHdlr {
 	f_rsl_chan_act(g_pars.chan_mode);
 	/* attempt to activate the same lchan again -> expect reject */
 	RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode));
@@ -715,7 +715,7 @@
 }
 
 /* Attempt to de-activate a channel that's not active */
-function f_TC_chan_deact_not_active(charstring id) runs on ConnHdlr {
+private function f_TC_chan_deact_not_active(charstring id) runs on ConnHdlr {
 	timer T := 3.0;
 	RSL.send(ts_RSL_RF_CHAN_REL(g_chan_nr));
 	T.start;
@@ -737,7 +737,7 @@
 }
 
 /* attempt to activate channel with wrong RSL Channel Nr IE; expect NACK */
-function f_TC_chan_act_wrong_nr(charstring id) runs on ConnHdlr {
+private function f_TC_chan_act_wrong_nr(charstring id) runs on ConnHdlr {
 	RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode));
 	alt {
 	[] RSL.receive(tr_RSL_CHAN_ACT_ACK(g_chan_nr)) {
@@ -1571,7 +1571,7 @@
 	Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
 }
 
-function f_TC_ho_rach(charstring id) runs on ConnHdlr {
+private function f_TC_ho_rach(charstring id) runs on ConnHdlr {
 	var GsmFrameNumber fn;
 	var RSL_Message rm;
 
@@ -2000,7 +2000,7 @@
 }
 
 /* establish DChan, verify existance + contents of measurement reports */
-function f_TC_meas_res_periodic(charstring id) runs on ConnHdlr {
+private function f_TC_meas_res_periodic(charstring id) runs on ConnHdlr {
 	f_l1_tune(L1CTL);
 	RSL.clear;
 
@@ -2168,7 +2168,7 @@
 }
 
 /* Verify Tx power reduction and ramping up during BTS bring up */
-function f_TC_tx_power_start_ramp_up_bcch(charstring id) runs on ConnHdlr {
+private function f_TC_tx_power_start_ramp_up_bcch(charstring id) runs on ConnHdlr {
 	f_l1_tune(L1CTL);
 	RSL.clear;
 
@@ -2188,7 +2188,7 @@
 }
 
 /* Verify Tx power reduction and ramping downd uring BTS bring shutdown due to Abis link failure */
-function f_TC_tx_power_start_ramp_down_bcch(charstring id) runs on ConnHdlr {
+private function f_TC_tx_power_start_ramp_down_bcch(charstring id) runs on ConnHdlr {
 	f_connhdlr_init_vty_bsc();
 
 	f_l1_tune(L1CTL);
@@ -2218,7 +2218,7 @@
  * + ramping down during ADM state UNLOCKED->LOCKED
  * + ramping up during ADM state LOCKED->UNLOCKED
  */
-function f_TC_tx_power_ramp_adm_state_change(charstring id) runs on ConnHdlr {
+private function f_TC_tx_power_ramp_adm_state_change(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 	var integer last_rx_lvl;
 
@@ -2290,7 +2290,7 @@
 
 /* see if the rsl meas res contains our expeced bs power level
 bs power set during assignment */
-function f_TC_rsl_bs_pwr_static_ass(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_bs_pwr_static_ass(charstring id) runs on ConnHdlr {
 	f_l1_tune(L1CTL);
 	RSL.clear;
 
@@ -2313,7 +2313,7 @@
 
 /* see if the rsl meas res contains our expeced bs power level
 bs power set after assignment */
-function f_TC_rsl_bs_pwr_static_power_control(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_bs_pwr_static_power_control(charstring id) runs on ConnHdlr {
 	f_l1_tune(L1CTL);
 	RSL.clear;
 
@@ -2364,7 +2364,7 @@
 /* target level -100, first rssi -90, ms power 7, expected increase to 7+6 within 6 seconds,
 second rssi -110, ms power 7+6, expected decrease to 7 within 6 seconds,
 These power levels are valid for all bands and require no special handling */
-function f_TC_rsl_ms_pwr_dyn_ass_updown(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_ms_pwr_dyn_ass_updown(charstring id) runs on ConnHdlr {
 	var uint5_t pwr_var := 7;
 	var L1ctlDlMessage l1_dl;
 
@@ -2432,7 +2432,7 @@
 }
 
 /* check that we do not exceed the max power */
-function f_TC_rsl_ms_pwr_dyn_max(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_ms_pwr_dyn_max(charstring id) runs on ConnHdlr {
 	var uint5_t pwr_var := 7;
 	var L1ctlDlMessage l1_dl;
 
@@ -2474,7 +2474,7 @@
 }
 
 /* see if we reach the band max power */
-function f_TC_rsl_ms_pwr_dyn_up(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_ms_pwr_dyn_up(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 	var uint5_t pwr_var := 15;
 	var uint5_t pwr_max_var := f_get_max_power_from_band();
@@ -2524,7 +2524,7 @@
 }
 
 /* see if we reach the band min power */
-function f_TC_rsl_ms_pwr_dyn_down(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_ms_pwr_dyn_down(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 
 	/* set a high value to ensure power decreases */
@@ -2575,7 +2575,7 @@
 
 /* see if we change the power level without receiving power parameters, which should not happen
 rsl chan act WITHOUT power parameters */
-function f_TC_rsl_ms_pwr_dyn_active(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_ms_pwr_dyn_active(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 
 	/* set a high value to ensure power decreases */
@@ -2616,7 +2616,7 @@
 
 /* see if we change the power level without receiving power parameters, which should not happen
 ms power control WITHOUT power parameters */
-function f_TC_rsl_ms_pwr_dyn_active2(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_ms_pwr_dyn_active2(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 
 	/* set a high value to ensure power decreases */
@@ -2902,7 +2902,7 @@
 
 /* establish DChan, and send MS POWER CONTROL messages via RSL, verify that
  * the BTS is forwarding those values to the MS via the SACCH L1 header. */
-function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr {
+private function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 	var RSL_IE_MS_Power ms_power;
 	var RSL_Message rsl;
@@ -2973,7 +2973,7 @@
 
 /* establish DChan, verify that the BTS sets the TA in the first SACCH L1 header.
 TA for the IMM ASS messages is still controlled by g_pars.l1_pars.ms_actual_ta! */
-function f_tc_rsl_chan_initial_ta(charstring id) runs on ConnHdlr {
+private function f_tc_rsl_chan_initial_ta(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 	var uint5_t ta_to_test := 16;
 
@@ -3022,7 +3022,7 @@
 }
 
 /* establish DChan, verify that the BTS sets MS power in the first SACCH L1 header. */
-function f_tc_rsl_chan_initial_ms_pwr(charstring id) runs on ConnHdlr {
+private function f_tc_rsl_chan_initial_ms_pwr(charstring id) runs on ConnHdlr {
 	var L1ctlDlMessage l1_dl;
 	var uint5_t ms_power_level := 7;
 
@@ -3900,7 +3900,7 @@
 
 /* helper function: Set given SI via RSL + validate scheduling.
  * CALLER MUST MAKE SURE TO CHANGE GLOBAL si_cfg! */
-function f_TC_si_sched() runs on test_CT {
+private function f_TC_si_sched() runs on test_CT {
 	var SystemInformationVectorPerTc si_per_tc;
 	f_init_l1ctl();
 	f_l1_tune(L1CTL);
@@ -4068,14 +4068,14 @@
 }
 
 /* Send messages with wrong message type */
-function f_TC_wrong_msg_type_dchan(charstring id) runs on ConnHdlr {
+private function f_TC_wrong_msg_type_dchan(charstring id) runs on ConnHdlr {
 	var template (value) RSL_Message rsl_tx;
 	rsl_tx := ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode);
 	rsl_tx.msg_type := RSL_MT_NOT_CMD;
 	RSL.send(rsl_tx);
 	f_rslem_unregister(0, g_chan_nr);
 }
-function f_TC_wrong_msg_type_rll(charstring id) runs on ConnHdlr {
+private function f_TC_wrong_msg_type_rll(charstring id) runs on ConnHdlr {
 	var template (value) RSL_Message rsl_tx;
 	/* we first have to activate the dedicated channel */
 	f_rsl_chan_act(g_pars.chan_mode);
@@ -4120,7 +4120,7 @@
 }
 
 /* Send messages in wrong sequence (RLL to an inactive lchan) */
-function f_TC_err_rep_wrong_sequence(charstring id) runs on ConnHdlr {
+private function f_TC_err_rep_wrong_sequence(charstring id) runs on ConnHdlr {
 	RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, ts_RslLinkID_DCCH(0), '0102'O));
 	f_rslem_unregister(0, g_chan_nr);
 }
@@ -4141,7 +4141,7 @@
  ***********************************************************************/
 
 /* Send IPA DLCX to inactive lchan */
-function f_TC_ipa_dlcx_not_active(charstring id) runs on ConnHdlr {
+private function f_TC_ipa_dlcx_not_active(charstring id) runs on ConnHdlr {
 	f_rsl_transceive(ts_RSL_IPA_DLCX(g_chan_nr, 0), tr_RSL_IPA_DLCX_ACK(g_chan_nr, ?, ?),
 			 "IPA DLCX ACK");
 }
@@ -4153,7 +4153,7 @@
 }
 
 /* Send IPA CRCX twice to inactive lchan */
-function f_TC_ipa_crcx_twice_not_active(charstring id) runs on ConnHdlr {
+private function f_TC_ipa_crcx_twice_not_active(charstring id) runs on ConnHdlr {
 	f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?),
 			 "IPA CRCX ACK");
 	f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_NACK(g_chan_nr, RSL_ERR_RES_UNAVAIL),
@@ -4167,7 +4167,7 @@
 }
 
 /* Regular sequence of CRCX/MDCX/DLCX */
-function f_TC_ipa_crcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr {
+private function f_TC_ipa_crcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr {
 	f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?),
 			 "IPA CRCX ACK");
 	var uint32_t remote_ip := f_rnd_int(c_UINT32_MAX);
@@ -4188,7 +4188,7 @@
 }
 
 /* Sequence of CRCX, 2x MDCX, DLCX */
-function f_TC_ipa_crcx_mdcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr {
+private function f_TC_ipa_crcx_mdcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr {
 	f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?),
 			 "IPA CRCX ACK");
 	var uint32_t remote_ip := f_rnd_int(c_UINT32_MAX);
@@ -4215,7 +4215,7 @@
 }
 
 /* IPA CRCX on SDCCH/4 and SDCCH/8 (doesn't make sense) */
-function f_TC_ipa_crcx_sdcch_not_active(charstring id) runs on ConnHdlr {
+private function f_TC_ipa_crcx_sdcch_not_active(charstring id) runs on ConnHdlr {
 	f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_NACK(g_chan_nr, ?),
 			 "IPA CRCX NACK");
 }
@@ -5415,7 +5415,7 @@
 }
 
 /* Activate Osmocom-style dynamic PDCH from BSC side */
-function f_TC_dyn_osmo_pdch_act_deact(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_osmo_pdch_act_deact(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer ts_nr := g_chan_nr.tn;
 	var integer trx_nr := 0;
@@ -5440,7 +5440,7 @@
 }
 
 /* send a RF CHAN REL for PDCH on an osmocom dynamci PDCH that's already inactive */
-function f_TC_dyn_osmo_pdch_unsol_deact(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_osmo_pdch_unsol_deact(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer pcu_conn_id := -1;
 
@@ -5462,7 +5462,7 @@
 }
 
 /* try to RSL CHAN ACT a PDCH on an osmocom-style PDCH that's already active */
-function f_TC_dyn_osmo_pdch_double_act(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_osmo_pdch_double_act(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer ts_nr := g_chan_nr.tn;
 	var integer trx_nr := 0;
@@ -5488,7 +5488,7 @@
 }
 
 /* try to RSL CHAN ACT a TCH/F on an osmocom-style PDCH */
-function f_TC_dyn_osmo_pdch_tchf_act(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_osmo_pdch_tchf_act(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer ts_nr := g_chan_nr.tn;
 	var integer trx_nr := 0;
@@ -5516,7 +5516,7 @@
 }
 
 /* try to RSL CHAN ACT the TCH/H on an osmocom-style PDCH */
-function f_TC_dyn_osmo_pdch_tchh_act(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_osmo_pdch_tchh_act(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer ts_nr := g_chan_nr.tn;
 	var integer trx_nr := 0;
@@ -5615,7 +5615,7 @@
 }
 
 /* Activate and de-activate an IPA-style dynamic TCH/F + PDCH */
-function f_TC_dyn_ipa_pdch_act_deact(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_ipa_pdch_act_deact(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer ts_nr := g_chan_nr.tn;
 	var integer trx_nr := 0;
@@ -5642,7 +5642,7 @@
 }
 
 /* try to RSL CHAN ACT a TCH/F on an IPA-style PDCH */
-function f_TC_dyn_ipa_pdch_tchf_act(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_ipa_pdch_tchf_act(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer ts_nr := g_chan_nr.tn;
 	var integer trx_nr := 0;
@@ -5668,7 +5668,7 @@
 }
 
 /* Activate IPA style dyn PDCH as TCH/F and then illegally try to activate it as PDCH, too */
-function f_TC_dyn_ipa_pdch_tchf_act_pdch_act_nack(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_ipa_pdch_tchf_act_pdch_act_nack(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer ts_nr := g_chan_nr.tn;
 	var integer trx_nr := 0;
@@ -5704,7 +5704,7 @@
 }
 
 /* try to RSL CHAN ACT a TCH/F on an IPA-style PDCH that's already in PDCH mode; expect NACK */
-function f_TC_dyn_ipa_pdch_act_tchf_act_nack(charstring id) runs on ConnHdlr {
+private function f_TC_dyn_ipa_pdch_act_tchf_act_nack(charstring id) runs on ConnHdlr {
 	var PCUIF_Message first_info;
 	var integer ts_nr := g_chan_nr.tn;
 	var integer trx_nr := 0;
@@ -6217,7 +6217,7 @@
 }
 
 /* Test channel activation with A5/n right from the beginning (like in assignment + hand-over) */
-function f_TC_chan_act_encr(charstring id) runs on ConnHdlr {
+private function f_TC_chan_act_encr(charstring id) runs on ConnHdlr {
 	f_l1_tune(L1CTL);
 	f_est_dchan(true);
 
@@ -6256,7 +6256,7 @@
 
 /* Test channel activation with A5/n right from the beginning and RSL MODE MODIFY
  which should break the en/decryption on purpose by supplying a new key that is unknown to the MS*/
-function f_TC_rsl_modify_encr(charstring id) runs on ConnHdlr {
+private function f_TC_rsl_modify_encr(charstring id) runs on ConnHdlr {
 	f_l1_tune(L1CTL);
 	f_est_dchan(true);
 
@@ -6321,7 +6321,7 @@
 }
 
 /* Test unencrypted channel activation followed by explicit ENCR CMD later */
-function f_TC_encr_cmd(charstring id) runs on ConnHdlr {
+private function f_TC_encr_cmd(charstring id) runs on ConnHdlr {
 	/* L3 payload doesn't matter, as it is passed transparently */
 	var BIT3 l3_alg_id := f_alg_id_to_l3(g_pars.encr.alg_id);
 	var octetstring l3 := enc_PDU_ML3_NW_MS(valueof(ts_RRM_CiphModeCmd(l3_alg_id)));
@@ -6445,7 +6445,7 @@
 		g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,7)));
 }
 
-function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr {
+private function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr {
 	var L1ctlDlMessage dl;
 	var octetstring l2_fill_frame := '0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O;
 	var octetstring l2_fill_frame_sacch := substr(l2_fill_frame, 0, lengthof(l2_fill_frame) - 2);
@@ -6583,15 +6583,15 @@
 	}
 }
 
-function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr {
+private function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr {
 	f_test_l2_fill_frames(false);
 }
 
-function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr {
+private function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr {
 	f_test_l2_fill_frames(true);
 }
 
-function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT {
+private function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT {
 	var ConnHdlr vc_conn;
 	var ConnHdlrPars pars;
 	pars.t_guard := 60.0;