diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 616ca34..44d9de4 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -584,10 +584,10 @@
 		f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id);
 
 		/* Start with a default moderate timing offset equalling TA=2, and RSSI=-60 */
-		ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256)));
-		ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(-60)));
+		ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(2*256));
+		ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_RSSI(-60));
 		/* OsmoBTS may have different AB / NB threshold (see MIN_QUAL_NORM, MIN_QUAL_RACH) */
-		ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_CI(60)));
+		ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(60));
 	}
 
 	/* Wait some extra time to make sure the BTS emits a stable carrier.
@@ -708,12 +708,12 @@
 
 private function f_trxc_fake_rssi(TRXC_RSSI rssi) runs on ConnHdlr {
 	var TrxcMessage ret;
-	ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(rssi)));
+	ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_RSSI(rssi));
 }
 
 private function f_trxc_fake_toffs256(int16_t toffs256) runs on ConnHdlr {
 	var TrxcMessage ret;
-	ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256)));
+	ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(toffs256));
 }
 
 /* first function started in ConnHdlr component */
@@ -1729,7 +1729,7 @@
 private function f_rach_toffs(int16_t toffs256, boolean expect_pass) runs on test_CT {
 	var TrxcMessage ret;
 	/* tell fake_trx to use a given timing offset for all bursts */
-	ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256)));
+	ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(toffs256));
 	f_sleep(0.5);
 
 	/* Transmit RACH request + wait for confirmation */
@@ -5391,8 +5391,7 @@
 	for (var int16_t i := -256; i <= 1280; i := i + 128) {
 		var TrxcMessage ret;
 
-		ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
-					 valueof(ts_TRXC_FAKE_CI(i)));
+		ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(i));
 
 		/* FIXME: OsmoBTS may have different threshold (see MIN_QUAL_NORM) */
 		f_TC_pcu_data_ind_lqual_cb(i, thresh := 0);