diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 7d4469e..ab93c30 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -326,6 +326,10 @@
 	}
 }
 
+/***********************************************************************
+ * Channel Activation / Deactivation
+ ***********************************************************************/
+
 /* Stress test: Do 500 channel activations/deactivations in rapid succession */
 function f_TC_chan_act_stress(charstring id) runs on ConnHdlr {
 	for (var integer i := 0; i < 500; i := i+1) {
@@ -437,6 +441,10 @@
 	}
 }
 
+/***********************************************************************
+ * RACH Handling
+ ***********************************************************************/
+
 function f_TC_chan_req(charstring id) runs on ConnHdlr {
 	f_l1_tune(L1CTL);
 
@@ -453,6 +461,10 @@
 	vc_conn.done;
 }
 
+/***********************************************************************
+ * Measurement Processing / Reporting
+ ***********************************************************************/
+
 template LapdmAddressField ts_LapdmAddr(LapdmSapi sapi, boolean c_r) := {
 	spare := '0'B,
 	lpd := 0,
@@ -722,6 +734,10 @@
 	vc_conn.done;
 }
 
+/***********************************************************************
+ * Paging
+ ***********************************************************************/
+
 function tmsi_is_dummy(TMSIP_TMSI_V tmsi) return boolean {
 	if (tmsi == 'FFFFFFFF'O) {
 		return true;
@@ -730,7 +746,6 @@
 	}
 }
 
-
 altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, inout integer num_paging_rcv_ids)
 runs on test_CT {
 	var L1ctlDlMessage dl;
@@ -977,6 +992,10 @@
 }
 
 
+/***********************************************************************
+ * Immediate Assignment / AGCH
+ ***********************************************************************/
+
 testcase TC_imm_ass() runs on test_CT {
 	f_init(testcasename());
 	for (var integer i := 0; i < 1000; i := i+1) {
@@ -997,6 +1016,10 @@
 	/* negative test: ensure ERROR REPORT on unsupported types */
 }
 
+/***********************************************************************
+ * Low-Level Protocol Errors / ERROR REPORT
+ ***********************************************************************/
+
 private function f_exp_err_rep(template RSL_Cause cause) runs on test_CT {
 	timer T := 5.0;
 	T.start;
@@ -1047,6 +1070,10 @@
 	f_exp_err_rep(RSL_ERR_IE_CONTENT);
 }
 
+/***********************************************************************
+ * IPA CRCX/MDCX/DLCS media stream handling
+ ***********************************************************************/
+
 /* Send IPA DLCX to inactive lchan */
 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, ?, ?),
@@ -1164,7 +1191,6 @@
 * Delete Indication on AGCH overflow
 * SMS Broadcast Req / Cmd / CBCH LOad Ind
 * RF resource ind
-* IPA/speech related commands
 * error handling
 * discriminator error
 ** type error