diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 779d430..3cbc732 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -1143,8 +1143,8 @@
 	f_rx_rlcmac_dl_block_exp_data(dl_block, poll_fn, data, 0, exp_dl_cs_mcs);
 
 	/* ACK the DL block */
-	f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block, '1'B);
-	f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc),
+	f_dltbf_ack_block(ms.dl_tbf, dl_block, '1'B);
+	f_ms_tx_ul_block(ms, f_dltbf_ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf, ischosen(dl_block.data_egprs)),
 			 f_dl_block_ack_fn(dl_block, poll_fn));
 
 	f_shutdown(__BFILE__, __LINE__, final := true);
@@ -1584,8 +1584,8 @@
 	f_rx_rlcmac_dl_block_exp_data(dl_block, dl_fn, data, 0, exp_dl_cs_mcs);
 
 	/* ACK the DL block */
-	f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block, '1'B);
-	f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.ul_tbf.tfi, ms.dl_tbf.acknack_desc),
+	f_dltbf_ack_block(ms.dl_tbf, dl_block, '1'B);
+	f_ms_tx_ul_block(ms, f_dltbf_ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf, ischosen(dl_block.data_egprs)),
 			 f_dl_block_ack_fn(dl_block, dl_fn));
 
 	f_shutdown(__BFILE__, __LINE__, final := true);
@@ -1668,8 +1668,8 @@
 	f_rx_rlcmac_dl_block_exp_data(dl_block, dl_fn, data, 0, exp_cs_mcs);
 
 	/* ACK the DL block, and request UL TBF at the same time */
-	f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block, '1'B);
-	f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK_CHREQ(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc),
+	f_dltbf_ack_block(ms.dl_tbf, dl_block, '1'B);
+	f_ms_tx_ul_block(ms, f_dltbf_ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf, ischosen(dl_block.data_egprs), c_ChReqDesc_default),
 			 f_dl_block_ack_fn(dl_block, dl_fn));
 
 	/* Expect UL ass */