diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index f7bd5703a..f24cce196 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -18,6 +18,10 @@ module RLCMAC_Templates {
 	import from RLCMAC_CSN1_Templates all;
 	import from RLCMAC_Types all;
 
+	template CodingScheme cs_gprs_any := (CS_1, CS_2, CS_3, CS_4);
+	template CodingScheme mcs_egprs_any := (MCS_1, MCS_2, MCS_3, MCS_4, MCS_5,
+						MCS_6, MCS_7, MCS_8, MCS_9);
+
 	/* TS 44.060 10.4.5 */
 	function f_rrbp_fn_delay(MacRrbp rrbp) return uint32_t {
 		select (rrbp) {
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index d11487511..427eb35f6 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -1185,7 +1185,7 @@ private function f_TC_mo_ping_pong_1phase_access(template (present) CodingScheme
  * answered, so TBFs for uplink and later for downlink are created.
  */
 testcase TC_mo_ping_pong() runs on RAW_PCU_Test_CT {
-	var CodingScheme exp_cs_mcs := CS_1;
+	var template CodingScheme exp_cs_mcs := cs_gprs_any;
 	f_TC_mo_ping_pong_1phase_access(exp_cs_mcs);
 }
 
@@ -1262,8 +1262,8 @@ testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT {
 		gprsextendeddynalloccap := '0'B
 	};
 	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
-	var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false);
-	var CodingScheme exp_dl_cs_mcs := CS_2;
+	var template CodingScheme exp_ul_cs_mcs := cs_gprs_any;
+	var template CodingScheme exp_dl_cs_mcs := cs_gprs_any;
 
 	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);
 }
@@ -1278,8 +1278,8 @@ testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT {
 		egprsextendeddynalloccap := '0'B
 	};
 	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
-	var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, true);
-	var CodingScheme exp_dl_cs_mcs := MCS_1;
+	var template CodingScheme exp_ul_cs_mcs := mcs_egprs_any;
+	var template CodingScheme exp_dl_cs_mcs := mcs_egprs_any;
 
 	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);
 }
@@ -1294,7 +1294,7 @@ testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT {
 	};
 	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false);
-	var CodingScheme exp_dl_cs_mcs := CS_2;
+	var template CodingScheme exp_dl_cs_mcs := cs_gprs_any;
 
 	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);
 }
@@ -1354,7 +1354,7 @@ runs on RAW_PCU_Test_CT {
 }
 
 testcase TC_mt_ping_pong() runs on RAW_PCU_Test_CT {
-	var CodingScheme exp_cs_mcs := CS_1;
+	var template CodingScheme exp_cs_mcs := cs_gprs_any;
 	f_TC_mt_ping_pong(omit, exp_cs_mcs);
 }
 
@@ -1366,7 +1366,7 @@ testcase TC_mt_ping_pong_with_dl_racap() runs on RAW_PCU_Test_CT {
 		gprsextendeddynalloccap := '0'B
 	} ;
 	var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, omit)) };
-	var CodingScheme exp_cs_mcs := CS_2;
+	var template CodingScheme exp_cs_mcs := cs_gprs_any;
 	f_TC_mt_ping_pong(ms_racap, exp_cs_mcs);
 }
 
@@ -1837,7 +1837,6 @@ testcase TC_ul_multislot_tbf_ms_class_from_2phase() runs on RAW_PCU_Test_CT {
  * last Pkt Ul ACK's RRBP.
  * See 3GPP TS 44.060 sec 9.3.2.4.2 "Non-extended uplink TBF mode" */
 testcase TC_ul_tbf_reestablish_with_pkt_resource_req() runs on RAW_PCU_Test_CT {
-	var CodingScheme exp_cs_mcs := CS_1;
 	var RlcmacDlBlock dl_block;
 	var octetstring data := f_rnd_octstring(10);
 	var uint32_t sched_fn;