diff --git a/src/bts.cpp b/src/bts.cpp
index 07ea77c8..40541c56 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -242,7 +242,6 @@ static int bts_talloc_destructor(struct gprs_rlcmac_bts* bts)
 {
 	struct GprsMs *ms;
 	while ((ms = llist_first_entry_or_null(&bts->ms_list, struct GprsMs, list))) {
-		ms_set_callback(ms, NULL);
 		ms_set_timeout(ms, 0);
 		bts_stat_item_dec(bts, STAT_MS_PRESENT);
 		talloc_free(ms);
diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index 6c345fbc..caa0cf50 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -61,7 +61,7 @@ static int64_t now_msec()
 	return (int64_t)(ts.tv_sec) * 1000 + ts.tv_nsec / 1000000;
 }
 
-static void ms_update_status(struct GprsMs *ms);
+static void ms_becomes_idle(struct GprsMs *ms);
 
 static int ms_use_cb(struct osmo_use_count_entry *e, int32_t old_use_count, const char *file, int line)
 {
@@ -90,36 +90,20 @@ static int ms_use_cb(struct osmo_use_count_entry *e, int32_t old_use_count, cons
 	if (e->count < 0)
 		return -ERANGE;
 
-	if (total == 0)
-		ms_update_status(ms);
+	if (total == 0) {
+		OSMO_ASSERT(ms_is_idle(ms));
+		ms_becomes_idle(ms);
+	}
 	return 0;
 }
 
-void gprs_default_cb_ms_idle(struct GprsMs *ms)
-{
-	if (ms_is_idle(ms))
-		talloc_free(ms);
-}
-
-void gprs_default_cb_ms_active(struct GprsMs *ms)
-{
-	/* do nothing */
-}
-
-static struct gpr_ms_callback gprs_default_cb = {
-	.ms_idle = gprs_default_cb_ms_idle,
-	.ms_active = gprs_default_cb_ms_active,
-};
-
 static void ms_release_timer_cb(void *data)
 {
 	struct GprsMs *ms = (struct GprsMs *) data;
 	LOGPMS(ms, DRLCMAC, LOGL_INFO, "Release timer expired\n");
 
-	if (ms->timer.data) {
-		ms->timer.data = NULL;
-		ms_unref(ms, MS_USE_RELEASE_TIMER);
-	}
+	/* Finally free the MS after being idle for a while according to config */
+	talloc_free(ms);
 }
 
 static void ms_llc_timer_cb(void *_ms)
@@ -149,14 +133,12 @@ struct GprsMs *ms_alloc(struct gprs_rlcmac_bts *bts)
 	bts_stat_item_inc(bts, STAT_MS_PRESENT);
 
 	ms->bts = bts;
-	ms->cb = gprs_default_cb;
 	ms->tlli = GSM_RESERVED_TMSI;
 	ms->new_ul_tlli = GSM_RESERVED_TMSI;
 	ms->new_dl_tlli = GSM_RESERVED_TMSI;
 	ms->ta = GSM48_TA_INVALID;
 	ms->current_cs_ul = UNKNOWN;
 	ms->current_cs_dl = UNKNOWN;
-	ms->is_idle = true;
 	INIT_LLIST_HEAD(&ms->old_tbfs);
 
 	ms->use_count = (struct osmo_use_count){
@@ -169,7 +151,7 @@ struct GprsMs *ms_alloc(struct gprs_rlcmac_bts *bts)
 	LOGP(DRLCMAC, LOGL_INFO, "Creating MS object\n");
 
 	ms->imsi[0] = '\0';
-	osmo_timer_setup(&ms->timer, ms_release_timer_cb, NULL);
+	osmo_timer_setup(&ms->timer, ms_release_timer_cb, ms);
 	llc_queue_init(&ms->llc_queue, ms);
 	memset(&ms->llc_timer, 0, sizeof(ms->llc_timer));
 	osmo_timer_setup(&ms->llc_timer, ms_llc_timer_cb, ms);
@@ -232,69 +214,42 @@ static int ms_talloc_destructor(struct GprsMs *ms)
 	return 0;
 }
 
-
-void ms_set_callback(struct GprsMs *ms, struct gpr_ms_callback *cb)
+/* MS has no attached TBFs anymore. */
+static void ms_becomes_idle(struct GprsMs *ms)
 {
-	if (cb)
-		ms->cb = *cb;
-	else
-		ms->cb = gprs_default_cb;
-}
+	ms_set_reserved_slots(ms, NULL, 0, 0);
+	ms->first_common_ts = NULL;
 
-static void ms_update_status(struct GprsMs *ms)
-{
-	if (osmo_use_count_total(&ms->use_count) > 0)
-		return;
-
-	if (ms_is_idle(ms) && !ms->is_idle) {
-		ms->is_idle = true;
-		ms->cb.ms_idle(ms);
-		/* this can be deleted by now, do not access it */
-		return;
-	}
-
-	if (!ms_is_idle(ms) && ms->is_idle) {
-		ms->is_idle = false;
-		ms->cb.ms_active(ms);
-	}
-}
-
-static void ms_release_timer_start(struct GprsMs *ms)
-{
 	/* Immediate free():
 	 * Skip delaying free() through release timer if delay is configured to be 0.
 	 * This is useful for synced freed during unit tests.
 	 */
-	if (ms->delay == 0)
+	if (ms->delay == 0) {
+		talloc_free(ms);
 		return;
+	}
 
 	/* Immediate free():
 	 * Skip delaying free() through release timer if TMSI is not
 	 * known, since those cannot really be reused.
 	 */
-	if (ms_tlli(ms) == GSM_RESERVED_TMSI)
+	if (ms_tlli(ms) == GSM_RESERVED_TMSI) {
+		talloc_free(ms);
 		return;
-
-	LOGPMS(ms, DRLCMAC, LOGL_DEBUG, "Schedule MS release in %u secs\n", ms->delay);
-
-	if (!ms->timer.data) {
-		ms_ref(ms, MS_USE_RELEASE_TIMER);
-		ms->timer.data = ms;
 	}
 
+	LOGPMS(ms, DRLCMAC, LOGL_DEBUG, "Schedule MS release in %u secs\n", ms->delay);
 	osmo_timer_schedule(&ms->timer, ms->delay, 0);
 }
 
-static void ms_release_timer_stop(struct GprsMs *ms)
+static void ms_becomes_active(struct GprsMs *ms)
 {
-	if (!ms->timer.data)
+	if (!osmo_timer_pending(&ms->timer))
 		return;
 
 	LOGPMS(ms, DRLCMAC, LOGL_DEBUG, "Cancel scheduled MS release\n");
 
 	osmo_timer_del(&ms->timer);
-	ms->timer.data = NULL;
-	ms_unref(ms, MS_USE_RELEASE_TIMER);
 }
 
 void ms_set_mode(struct GprsMs *ms, enum mcs_kind mode)
@@ -374,32 +329,24 @@ static void ms_attach_ul_tbf(struct GprsMs *ms, struct gprs_rlcmac_ul_tbf *tbf)
 {
 	LOGPMS(ms, DRLCMAC, LOGL_INFO, "Attaching UL TBF: %s\n", tbf_name((struct gprs_rlcmac_tbf *)tbf));
 
-	ms_ref(ms, __func__);
-
 	if (ms->ul_tbf)
 		llist_add_tail(tbf_ms_list(ul_tbf_as_tbf(ms->ul_tbf)), &ms->old_tbfs);
 
 	ms->ul_tbf = tbf;
 
-	ms_release_timer_stop(ms);
-
-	ms_unref(ms, __func__);
+	ms_ref(ms, MS_USE_TBF);
 }
 
 static void ms_attach_dl_tbf(struct GprsMs *ms, struct gprs_rlcmac_dl_tbf *tbf)
 {
 	LOGPMS(ms, DRLCMAC, LOGL_INFO, "Attaching DL TBF: %s\n", tbf_name((struct gprs_rlcmac_tbf *)tbf));
 
-	ms_ref(ms, __func__);
-
 	if (ms->dl_tbf)
 		llist_add_tail(tbf_ms_list(dl_tbf_as_tbf(ms->dl_tbf)), &ms->old_tbfs);
 
 	ms->dl_tbf = tbf;
 
-	ms_release_timer_stop(ms);
-
-	ms_unref(ms, __func__);
+	ms_ref(ms, MS_USE_TBF);
 }
 
 void ms_attach_tbf(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf)
@@ -412,6 +359,8 @@ void ms_attach_tbf(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf)
 		ms_attach_dl_tbf(ms, tbf_as_dl_tbf(tbf));
 	else
 		ms_attach_ul_tbf(ms, tbf_as_ul_tbf(tbf));
+
+	ms_becomes_active(ms);
 }
 
 void ms_detach_tbf(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf)
@@ -436,21 +385,35 @@ void ms_detach_tbf(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf)
 		llist_del(tbf_ms_list(tbf));
 	}
 
-	if (!ms->dl_tbf && !ms->ul_tbf) {
-		ms_set_reserved_slots(ms, NULL, 0, 0);
-		ms->first_common_ts = NULL;
-		ms_release_timer_start(ms);
-	}
-
-	ms_update_status(ms);
+	ms_unref(ms, MS_USE_TBF);
 }
 
+/* Cleans up old MS being merged into a new one. Should be called with a
+ms_ref() taken to avoid use-after-free. */
 void ms_reset(struct GprsMs *ms)
 {
 	LOGPMS(ms, DRLCMAC, LOGL_INFO, "Clearing MS object\n");
+	struct llist_item *pos;
+	struct gprs_rlcmac_tbf *tbf;
 
-	ms_release_timer_stop(ms);
+	/* free immediately when it becomes idle: */
+	ms->delay = 0;
 
+	tbf = ul_tbf_as_tbf(ms_ul_tbf(ms));
+	if (tbf && !tbf_timers_pending(tbf, T_MAX))
+		tbf_free(tbf);
+	tbf = dl_tbf_as_tbf(ms_dl_tbf(ms));
+	if (tbf && !tbf_timers_pending(tbf, T_MAX))
+		tbf_free(tbf);
+
+	llist_for_each_entry(pos, &ms->old_tbfs, list) {
+		tbf = (struct gprs_rlcmac_tbf *)pos->entry;
+		if (!tbf_timers_pending(tbf, T_MAX))
+			tbf_free(tbf);
+	}
+
+	/* Flag it with invalid data so that it cannot be looked up anymore and
+	* shows up specially if listed in VTY: */
 	ms->tlli = GSM_RESERVED_TMSI;
 	ms->new_dl_tlli = ms->tlli;
 	ms->new_ul_tlli = ms->tlli;
@@ -507,12 +470,6 @@ void ms_merge_and_clear_ms(struct GprsMs *ms, struct GprsMs *old_ms)
 	llc_queue_move_and_merge(&ms->llc_queue, &old_ms->llc_queue);
 
 	/* Clean up the old MS object */
-	/* TODO: Use timer? */
-	if (ms_ul_tbf(old_ms) && !tbf_timers_pending((struct gprs_rlcmac_tbf *)ms_ul_tbf(old_ms), T_MAX))
-			tbf_free((struct gprs_rlcmac_tbf *)ms_ul_tbf(old_ms));
-	if (ms_dl_tbf(old_ms) && !tbf_timers_pending((struct gprs_rlcmac_tbf *)ms_dl_tbf(old_ms), T_MAX))
-			tbf_free((struct gprs_rlcmac_tbf *)ms_dl_tbf(old_ms));
-
 	ms_reset(old_ms);
 
 	ms_unref(old_ms, __func__);
diff --git a/src/gprs_ms.h b/src/gprs_ms.h
index 123db0ec..cdb23bf9 100644
--- a/src/gprs_ms.h
+++ b/src/gprs_ms.h
@@ -51,14 +51,8 @@ struct gprs_rlcmac_bts;
 struct gprs_rlcmac_trx;
 struct GprsMs;
 
-struct gpr_ms_callback {
-	void (*ms_idle)(struct GprsMs *);
-	void (*ms_active)(struct GprsMs *);
-};
-
 struct GprsMs {
 	struct llist_head list; /* list of all GprsMs */
-	struct gpr_ms_callback cb;
 	bool app_info_pending;
 
 	struct gprs_rlcmac_bts *bts;
@@ -84,7 +78,6 @@ struct GprsMs {
 	struct gprs_llc_queue llc_queue;
 	struct osmo_timer_list llc_timer;
 
-	bool is_idle;
 	struct osmo_use_count use_count;
 	struct osmo_timer_list timer;
 	unsigned delay;
@@ -140,8 +133,6 @@ static inline struct gprs_rlcmac_dl_tbf *ms_dl_tbf(const struct GprsMs *ms) {ret
 const char *ms_name(const struct GprsMs *ms);
 char *ms_name_buf(const struct GprsMs *ms, char *buf, unsigned int buf_size);
 
-void ms_set_callback(struct GprsMs *ms, struct gpr_ms_callback *cb);
-
 int ms_nacc_start(struct GprsMs *ms, Packet_Cell_Change_Notification_t *notif);
 bool ms_nacc_rts(const struct GprsMs *ms);
 struct msgb *ms_nacc_create_rlcmac_msg(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf,
@@ -157,8 +148,7 @@ int ms_append_llc_dl_data(struct GprsMs *ms, uint16_t pdu_delay_csec, const uint
 static inline bool ms_is_idle(const struct GprsMs *ms)
 {
 	return !ms->ul_tbf && !ms->dl_tbf &&
-		llist_empty(&ms->old_tbfs) &&
-		osmo_use_count_total(&ms->use_count) == 0;
+		llist_empty(&ms->old_tbfs);
 }
 
 static inline struct gprs_llc_queue *ms_llc_queue(struct GprsMs *ms)
@@ -251,7 +241,7 @@ static inline struct gprs_rlcmac_trx *ms_current_trx(const struct GprsMs *ms)
 	return ms->current_trx;
 }
 
-#define MS_USE_RELEASE_TIMER "release_timer"
+#define MS_USE_TBF "tbf"
 #define ms_ref(ms, use) \
 	OSMO_ASSERT(osmo_use_count_get_put(&(ms)->use_count, use, 1) == 0)
 #define ms_unref(ms, use) \
diff --git a/tests/alloc/AllocTest.err b/tests/alloc/AllocTest.err
index e4cefffc..7ca519d0 100644
--- a/tests/alloc/AllocTest.err
+++ b/tests/alloc/AllocTest.err
@@ -419482,8 +419482,8 @@ DL_ASS_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xc0000001){NONE}: Deallocated
 MS(TLLI-0xc0000001:TA-220:MSCLS-2-0) Allocating DL TBF
 UL_ASS_TBF{NONE}: Allocated
 DL_ASS_TBF{NONE}: Allocated
-TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xc0000001) Setting Control TS PDCH(bts=0,trx=0,ts=4)
-TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xc0000001) Allocated: trx = 0, ul_slots = 10, dl_slots = 18
+TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xc0000001) Setting Control TS PDCH(bts=0,trx=0,ts=5)
+TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xc0000001) Allocated: trx = 0, ul_slots = 20, dl_slots = 30
 No TFI available (suggested TRX: 0).
 TBF(DL:TFI-0-0-2:STATE-NEW:GPRS:TLLI-0xc0000002) free
 UL_ASS_TBF(DL:TFI-0-0-2:STATE-NEW:GPRS:TLLI-0xc0000002){NONE}: Deallocated
@@ -419509,8 +419509,8 @@ DL_ASS_TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:TLLI-0xc0000004){NONE}: Deallocated
 MS(TLLI-0xc0000004:TA-220:MSCLS-5-0) Allocating DL TBF
 UL_ASS_TBF{NONE}: Allocated
 DL_ASS_TBF{NONE}: Allocated
-TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:TLLI-0xc0000004) Setting Control TS PDCH(bts=0,trx=0,ts=3)
-TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:TLLI-0xc0000004) Allocated: trx = 0, ul_slots = 08, dl_slots = 18
+TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:TLLI-0xc0000004) Setting Control TS PDCH(bts=0,trx=0,ts=6)
+TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:TLLI-0xc0000004) Allocated: trx = 0, ul_slots = 40, dl_slots = c0
 No TFI available (suggested TRX: 0).
 TBF(DL:TFI-0-0-5:STATE-NEW:GPRS:TLLI-0xc0000005) free
 UL_ASS_TBF(DL:TFI-0-0-5:STATE-NEW:GPRS:TLLI-0xc0000005){NONE}: Deallocated
@@ -419527,8 +419527,8 @@ DL_ASS_TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:TLLI-0xc0000006){NONE}: Deallocated
 MS(TLLI-0xc0000006:TA-220:MSCLS-7-0) Allocating DL TBF
 UL_ASS_TBF{NONE}: Allocated
 DL_ASS_TBF{NONE}: Allocated
-TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:TLLI-0xc0000006) Setting Control TS PDCH(bts=0,trx=0,ts=6)
-TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:TLLI-0xc0000006) Allocated: trx = 0, ul_slots = 40, dl_slots = c0
+TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:TLLI-0xc0000006) Setting Control TS PDCH(bts=0,trx=0,ts=5)
+TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:TLLI-0xc0000006) Allocated: trx = 0, ul_slots = 20, dl_slots = 60
 No TFI available (suggested TRX: 0).
 TBF(DL:TFI-0-0-7:STATE-NEW:GPRS:TLLI-0xc0000007) free
 UL_ASS_TBF(DL:TFI-0-0-7:STATE-NEW:GPRS:TLLI-0xc0000007){NONE}: Deallocated
diff --git a/tests/alloc/AllocTest.ok b/tests/alloc/AllocTest.ok
index bfef7375..bad9a488 100644
--- a/tests/alloc/AllocTest.ok
+++ b/tests/alloc/AllocTest.ok
@@ -14805,12 +14805,12 @@ Going to test assignment with many connections, algorithm B
  TBF[30] class 31 reserves ....DDCD
  TBF[31] class 32 reserves ...DDCD.
  TBF[0] class 1 reserves ...C....
- TBF[1] class 2 reserves ...DC...
+ TBF[1] class 2 reserves ....DC..
  TBF[2] class 3 reserves ......DC
  TBF[3] class 4 reserves ...DCD..
- TBF[4] class 5 reserves ...CD...
+ TBF[4] class 5 reserves ......CD
  TBF[5] class 6 reserves ...CD...
- TBF[6] class 7 reserves ......CD
+ TBF[6] class 7 reserves .....CD.
  TBF[7] class 8 reserves ....DDCD
  TBF[8] class 9 reserves ...DCD..
  TBF[9] class 10 reserves .....DCD
diff --git a/tests/app_info/AppInfoTest.err b/tests/app_info/AppInfoTest.err
index 3303ee88..a0a1d970 100644
--- a/tests/app_info/AppInfoTest.err
+++ b/tests/app_info/AppInfoTest.err
@@ -24,8 +24,7 @@ PDCH(bts=0,trx=0,ts=5) Attaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs
 PDCH(bts=0,trx=0,ts=6) Attaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TA-220:MSCLS-10-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-10-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-10-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-10-11:DL): + tbf: now used by 1 (tbf)
 ws(64)
 Creating MS object
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 12
@@ -36,8 +35,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 2 TBFs, USFs
 PDCH(bts=0,trx=0,ts=5) Attaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003.
 PDCH(bts=0,trx=0,ts=6) Attaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003.
 MS(TA-220:MSCLS-12-13) Attaching DL TBF: TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-12-13): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-12-13:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-12-13:DL): + tbf: now used by 1 (tbf)
 ws(64)
 
 --- test_sched_app_info_ok ---
@@ -65,9 +63,11 @@ PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 2 TBFs, USFs
 PDCH(bts=0,trx=0,ts=6) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003.
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TA-220:MSCLS-10-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
+MS(TA-220:MSCLS-10-11): - tbf: now used by 0 (-)
 MS(TA-220:MSCLS-10-11) Destroying MS object
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
 PDCH(bts=0,trx=0,ts=6) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
 MS(TA-220:MSCLS-12-13:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS)
+MS(TA-220:MSCLS-12-13): - tbf: now used by 0 (-)
 MS(TA-220:MSCLS-12-13) Destroying MS object
diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp
index 40e8381e..bc68c3d0 100644
--- a/tests/ms/MsTest.cpp
+++ b/tests/ms/MsTest.cpp
@@ -120,96 +120,6 @@ static void test_ms_state()
 	printf("=== end %s ===\n", __func__);
 }
 
-static enum {CB_UNKNOWN, CB_IS_IDLE, CB_IS_ACTIVE} last_cb = CB_UNKNOWN;
-static void ms_idle_cb(struct GprsMs *ms)
-{
-	OSMO_ASSERT(ms_is_idle(ms));
-	printf("  ms_idle() was called\n");
-	last_cb = CB_IS_IDLE;
-}
-static void ms_active_cb(struct GprsMs *ms)
-{
-	OSMO_ASSERT(!ms_is_idle(ms));
-	printf("  ms_active() was called\n");
-	last_cb = CB_IS_ACTIVE;
-}
-static struct gpr_ms_callback ms_cb = {
-	.ms_idle = ms_idle_cb,
-	.ms_active = ms_active_cb
-};
-static void test_ms_callback()
-{
-	uint32_t tlli = 0xffeeddbb;
-	gprs_rlcmac_dl_tbf *dl_tbf;
-	gprs_rlcmac_ul_tbf *ul_tbf;
-	struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0);
-	GprsMs *ms;
-	last_cb = CB_UNKNOWN;
-
-	printf("=== start %s ===\n", __func__);
-
-	ms = ms_alloc(bts);
-	ms_set_tlli(ms, tlli);
-	ms_set_callback(ms, &ms_cb);
-
-	OSMO_ASSERT(ms_is_idle(ms));
-
-	dl_tbf = alloc_dl_tbf(bts, ms);
-	ul_tbf = alloc_ul_tbf(bts, ms);
-
-	OSMO_ASSERT(last_cb == CB_UNKNOWN);
-
-	ms_attach_tbf(ms, ul_tbf);
-	OSMO_ASSERT(!ms_is_idle(ms));
-	OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf);
-	OSMO_ASSERT(ms_dl_tbf(ms) == NULL);
-	OSMO_ASSERT(last_cb == CB_IS_ACTIVE);
-
-	last_cb = CB_UNKNOWN;
-
-	ms_attach_tbf(ms, dl_tbf);
-	OSMO_ASSERT(!ms_is_idle(ms));
-	OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf);
-	OSMO_ASSERT(ms_dl_tbf(ms) == dl_tbf);
-	OSMO_ASSERT(last_cb == CB_UNKNOWN);
-
-	ms_detach_tbf(ms, ul_tbf);
-	OSMO_ASSERT(!ms_is_idle(ms));
-	OSMO_ASSERT(ms_ul_tbf(ms) == NULL);
-	OSMO_ASSERT(ms_dl_tbf(ms) == dl_tbf);
-	OSMO_ASSERT(last_cb == CB_UNKNOWN);
-
-	ms_detach_tbf(ms, dl_tbf);
-	OSMO_ASSERT(ms_is_idle(ms));
-	OSMO_ASSERT(ms_ul_tbf(ms) == NULL);
-	OSMO_ASSERT(ms_dl_tbf(ms) == NULL);
-	OSMO_ASSERT(last_cb == CB_IS_IDLE);
-
-	last_cb = CB_UNKNOWN;
-	talloc_free(ms);
-
-	talloc_free(dl_tbf);
-	talloc_free(ul_tbf);
-	talloc_free(bts);
-	printf("=== end %s ===\n", __func__);
-}
-
-static bool was_idle;
-static void ms_replace_tbf_idle_cb(struct GprsMs *ms)
-{
-	OSMO_ASSERT(ms_is_idle(ms));
-	printf("  ms_idle() was called\n");
-	was_idle = true;
-}
-static void ms_replace_tbf_active_cb(struct GprsMs *ms)
-{
-	OSMO_ASSERT(!ms_is_idle(ms));
-	printf("  ms_active() was called\n");
-}
-static struct gpr_ms_callback ms_replace_tbf_cb = {
-	.ms_idle = ms_replace_tbf_idle_cb,
-	.ms_active = ms_replace_tbf_active_cb
-};
 static void test_ms_replace_tbf()
 {
 	uint32_t tlli = 0xffeeddbb;
@@ -222,10 +132,8 @@ static void test_ms_replace_tbf()
 
 	ms = ms_alloc(bts);
 	ms_confirm_tlli(ms, tlli);
-	ms_set_callback(ms, &ms_replace_tbf_cb);
 
 	OSMO_ASSERT(ms_is_idle(ms));
-	was_idle = false;
 
 	dl_tbf[0] = alloc_dl_tbf(bts, ms);
 	dl_tbf[1] = alloc_dl_tbf(bts, ms);
@@ -236,44 +144,34 @@ static void test_ms_replace_tbf()
 	OSMO_ASSERT(ms_ul_tbf(ms) == NULL);
 	OSMO_ASSERT(ms_dl_tbf(ms) == dl_tbf[0]);
 	OSMO_ASSERT(llist_empty(&ms->old_tbfs));
-	OSMO_ASSERT(!was_idle);
 
 	ms_attach_tbf(ms, dl_tbf[1]);
 	OSMO_ASSERT(!ms_is_idle(ms));
 	OSMO_ASSERT(ms_ul_tbf(ms) == NULL);
 	OSMO_ASSERT(ms_dl_tbf(ms) == dl_tbf[1]);
 	OSMO_ASSERT(!llist_empty(&ms->old_tbfs));
-	OSMO_ASSERT(!was_idle);
 
 	ms_attach_tbf(ms, ul_tbf);
 	OSMO_ASSERT(!ms_is_idle(ms));
 	OSMO_ASSERT(ms_ul_tbf(ms) == ul_tbf);
 	OSMO_ASSERT(ms_dl_tbf(ms) == dl_tbf[1]);
 	OSMO_ASSERT(!llist_empty(&ms->old_tbfs));
-	OSMO_ASSERT(!was_idle);
 
 	ms_detach_tbf(ms, ul_tbf);
 	OSMO_ASSERT(!ms_is_idle(ms));
 	OSMO_ASSERT(ms_ul_tbf(ms) == NULL);
 	OSMO_ASSERT(ms_dl_tbf(ms) == dl_tbf[1]);
 	OSMO_ASSERT(!llist_empty(&ms->old_tbfs));
-	OSMO_ASSERT(!was_idle);
 
 	ms_detach_tbf(ms, dl_tbf[0]);
 	OSMO_ASSERT(!ms_is_idle(ms));
 	OSMO_ASSERT(ms_ul_tbf(ms) == NULL);
 	OSMO_ASSERT(ms_dl_tbf(ms) == dl_tbf[1]);
 	OSMO_ASSERT(llist_empty(&ms->old_tbfs));
-	OSMO_ASSERT(!was_idle);
 
 	ms_detach_tbf(ms, dl_tbf[1]);
-	OSMO_ASSERT(ms_is_idle(ms));
-	OSMO_ASSERT(ms_ul_tbf(ms) == NULL);
-	OSMO_ASSERT(ms_dl_tbf(ms) == NULL);
-	OSMO_ASSERT(llist_empty(&ms->old_tbfs));
-	OSMO_ASSERT(was_idle);
-
-	talloc_free(ms);
+	/* MS is gone now: */
+	OSMO_ASSERT(bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI) == NULL);
 
 	talloc_free(dl_tbf[0]);
 	talloc_free(dl_tbf[1]);
@@ -470,13 +368,11 @@ static void test_ms_timeout()
 	gprs_rlcmac_ul_tbf *ul_tbf;
 	struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0);
 	GprsMs *ms;
-	last_cb = CB_UNKNOWN;
 
 	printf("=== start %s ===\n", __func__);
 
 	ms = ms_alloc(bts);
 	ms_set_tlli(ms, tlli);
-	ms_set_callback(ms, &ms_cb);
 	ms_set_timeout(ms, 1);
 
 	OSMO_ASSERT(ms_is_idle(ms));
@@ -484,34 +380,27 @@ static void test_ms_timeout()
 	dl_tbf = alloc_dl_tbf(bts, ms);
 	ul_tbf = alloc_ul_tbf(bts, ms);
 
-	OSMO_ASSERT(last_cb == CB_UNKNOWN);
-
 	ms_attach_tbf(ms, ul_tbf);
 	OSMO_ASSERT(!ms_is_idle(ms));
-	OSMO_ASSERT(last_cb == CB_IS_ACTIVE);
-
-	last_cb = CB_UNKNOWN;
 
 	ms_attach_tbf(ms, dl_tbf);
 	OSMO_ASSERT(!ms_is_idle(ms));
-	OSMO_ASSERT(last_cb == CB_UNKNOWN);
 
 	ms_detach_tbf(ms, ul_tbf);
 	OSMO_ASSERT(!ms_is_idle(ms));
-	OSMO_ASSERT(last_cb == CB_UNKNOWN);
 
 	ms_detach_tbf(ms, dl_tbf);
-	OSMO_ASSERT(!ms_is_idle(ms));
-	OSMO_ASSERT(last_cb == CB_UNKNOWN);
+	/* test MS still exists and it's idle: */
+	OSMO_ASSERT(bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI) != NULL);
+	OSMO_ASSERT(ms_is_idle(ms));
+	OSMO_ASSERT(osmo_timer_pending(&ms->timer));
 
 	usleep(1100000);
 	osmo_timers_update();
 
-	OSMO_ASSERT(ms_is_idle(ms));
-	OSMO_ASSERT(last_cb == CB_IS_IDLE);
+	/* MS is gone now: */
+	OSMO_ASSERT(bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI) == NULL);
 
-	last_cb = CB_UNKNOWN;
-	talloc_free(ms);
 	talloc_free(dl_tbf);
 	talloc_free(ul_tbf);
 	talloc_free(bts);
@@ -651,7 +540,6 @@ int main(int argc, char **argv)
 	osmo_tdef_set(the_pcu->T_defs, -2030, 0, OSMO_TDEF_S);
 
 	test_ms_state();
-	test_ms_callback();
 	test_ms_replace_tbf();
 	test_ms_change_tlli();
 	test_ms_storage();
diff --git a/tests/ms/MsTest.err b/tests/ms/MsTest.err
index 247e8bbd..0cc351b0 100644
--- a/tests/ms/MsTest.err
+++ b/tests/ms/MsTest.err
@@ -1,39 +1,22 @@
 Creating MS object
 Modifying MS object, UL TLLI: 0xffffffff -> 0xffeeddbb, not yet confirmed
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
-Creating MS object
-Modifying MS object, UL TLLI: 0xffffffff -> 0xffeeddbb, not yet confirmed
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
 Creating MS object
 The MS object cannot fully confirm an unexpected TLLI: 0xffeeddbb, partly confirmed
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): + tbf: now used by 1 (tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL): - ms_attach_ul_tbf: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
 Creating MS object
 Modifying MS object, UL TLLI: 0xffffffff -> 0xff001111, not yet confirmed
@@ -59,43 +42,39 @@ Creating MS object
 Modifying MS object, UL TLLI: 0xffffffff -> 0xffeeddbc, not yet confirmed
 Modifying MS object, TLLI = 0xffeeddbc, IMSI '' -> '001001987654322'
 MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654321:TLLI-0xffeeddbb)
-MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654321:TLLI-0xffeeddbb)
+MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
 MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654322:TLLI-0xffeeddbc)
-MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0:UL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654322:TLLI-0xffeeddbc)
+MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0) Destroying MS object
 Creating MS object
 Modifying MS object, UL TLLI: 0xffffffff -> 0xffeeddbb, not yet confirmed
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + release_timer: now used by 1 (release_timer)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Release timer expired
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): - release_timer: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
 Creating MS object
 The MS object cannot fully confirm an unexpected TLLI: 0xffeeddbb, partly confirmed
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): + tbf: now used by 1 (tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Destroying MS object
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
 Creating MS object
 The MS object cannot fully confirm an unexpected TLLI: 0xdeadbeef, partly confirmed
 Creating MS object
 The MS object cannot fully confirm an unexpected TLLI: 0xdeadbef0, partly confirmed
 MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xdeadbef0)
-MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0:DL): + tbf: now used by 1 (tbf)
 MS(TLLI-0xdeadbeef:TA-220:MSCLS-0-0) Destroying MS object
 MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0:DL) Destroying MS object
 MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xdeadbef0)
+MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
diff --git a/tests/ms/MsTest.ok b/tests/ms/MsTest.ok
index 98e345c6..331bef0d 100644
--- a/tests/ms/MsTest.ok
+++ b/tests/ms/MsTest.ok
@@ -1,20 +1,12 @@
 === start test_ms_state ===
 === end test_ms_state ===
-=== start test_ms_callback ===
-  ms_active() was called
-  ms_idle() was called
-=== end test_ms_callback ===
 === start test_ms_replace_tbf ===
-  ms_active() was called
-  ms_idle() was called
 === end test_ms_replace_tbf ===
 === start test_ms_change_tlli ===
 === end test_ms_change_tlli ===
 === start test_ms_storage ===
 === end test_ms_storage ===
 === start test_ms_timeout ===
-  ms_active() was called
-  ms_idle() was called
 === end test_ms_timeout ===
 === start test_ms_cs_selection ===
 === end test_ms_cs_selection ===
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index 689b9fcc..79c89b10 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -22,8 +22,7 @@ PDCH(bts=0,trx=0,ts=2) Attaching TBF(DL:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=2)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 04, dl_slots = 04
 MS(TA-220:MSCLS-0-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:DL): + tbf: now used by 1 (tbf)
 The MS object cannot fully confirm an unexpected TLLI: 0x00002342, partly confirmed
 Modifying MS object, TLLI = 0x00002342, TA 220 -> 4
 MS(TLLI-0x00002342:TA-4:MSCLS-0-0:DL) ********** UL-TBF starts here **********
@@ -45,8 +44,7 @@ PDCH(bts=0,trx=0,ts=2) Attaching TBF(UL:STATE-NEW:GPRS:TLLI-0x00002342), 1 TBFs,
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00002342) Setting Control TS PDCH(bts=0,trx=0,ts=2)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00002342) Allocated: trx = 0, ul_slots = 04, dl_slots = 00
 MS(TLLI-0x00002342:TA-4:MSCLS-0-0:DL) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00002342)
-MS(TLLI-0x00002342:TA-4:MSCLS-0-0:DL): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TLLI-0x00002342:TA-4:MSCLS-0-0:UL:DL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TLLI-0x00002342:TA-4:MSCLS-0-0:UL:DL): + tbf: now used by 2 (2*tbf)
 Modifying MS object, TLLI: 0xffffffff -> 0x00002342, already confirmed partly
 The MS object cannot fully confirm an unexpected TLLI: 0x00004232, partly confirmed
 Modifying MS object, TLLI: 0x00002342 -> 0x00004232, already confirmed partly
@@ -54,7 +52,9 @@ Modifying MS object, TLLI = 0x00004232, TA 4 -> 6
 === end test_tbf_tlli_update ===
 MS(TLLI-0x00004232:TA-6:MSCLS-0-0:UL:DL) Destroying MS object
 MS(TLLI-0x00004232:TA-6:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00004232)
+MS(TLLI-0x00004232:TA-6:MSCLS-0-0:DL): - tbf: now used by 1 (tbf)
 MS(TLLI-0x00004232:TA-6:MSCLS-0-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00004232)
+MS(TLLI-0x00004232:TA-6:MSCLS-0-0): - tbf: now used by 0 (-)
 === start test_tbf_final_ack ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
 Creating MS object
@@ -78,8 +78,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: Received Event SCHED_ASS
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: state_chg to SEND_ASS
@@ -147,8 +146,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddcc), 2 TBFs,
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Attaching DL TBF: TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc)
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) Send downlink assignment on PACCH, because TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc) exists
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){WAIT_ACK}: Received Event SCHED_ASS
@@ -157,10 +155,11 @@ DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NEW}: Received Event ASSIGN_
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) set ass. type PACCH [prev CCCH:0, PACCH:0]
 DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NEW}: state_chg to ASSIGN
 TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + test_tbf_final_ack: now used by 1 (test_tbf_final_ack)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + test_tbf_final_ack: now used by 3 (2*tbf,test_tbf_final_ack)
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc), 2 TBFs, USFs = 00, TFIs = 00000003.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): - tbf: now used by 2 (tbf,test_tbf_final_ack)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){WAIT_RELEASE}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: Deallocated
@@ -168,6 +167,7 @@ DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){WAIT_ACK}: Deallocated
 TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000002.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0): - tbf: now used by 1 (test_tbf_final_ack)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Deallocated
@@ -198,8 +198,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: Received Event SCHED_ASS
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: state_chg to SEND_ASS
@@ -267,8 +266,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddcc), 2 TBFs,
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Attaching DL TBF: TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc)
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) Send downlink assignment on PACCH, because TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc) exists
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){WAIT_ACK}: Received Event SCHED_ASS
@@ -277,10 +275,11 @@ DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NEW}: Received Event ASSIGN_
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc) set ass. type PACCH [prev CCCH:0, PACCH:0]
 DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NEW}: state_chg to ASSIGN
 TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + test_tbf_final_ack: now used by 1 (test_tbf_final_ack)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + test_tbf_final_ack: now used by 3 (2*tbf,test_tbf_final_ack)
 TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc), 2 TBFs, USFs = 00, TFIs = 00000003.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0): - tbf: now used by 2 (tbf,test_tbf_final_ack)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Deallocated
@@ -288,6 +287,7 @@ DL_ASS_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Deallocated
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0): - tbf: now used by 1 (test_tbf_final_ack)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){WAIT_RELEASE}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: Deallocated
@@ -318,8 +318,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: Received Event SCHED_ASS
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: state_chg to SEND_ASS
@@ -562,6 +561,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc) starting timer T3193 w
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){WAIT_RELEASE}: Deallocated
@@ -591,8 +591,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: Received Event SCHED_ASS
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: state_chg to SEND_ASS
@@ -625,8 +624,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS), 2 TBFs, USFs = 00, TFIs
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-1:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
 DL_ASS_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS){NONE}: Received Event SCHED_ASS
 DL_ASS_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS){NONE}: state_chg to SEND_ASS
@@ -642,25 +640,27 @@ The MS object cannot fully confirm an unexpected TLLI: 0xf1000001, partly confir
 The MS object cannot fully confirm an unexpected TLLI: 0xf1000002, partly confirmed
 Modifying MS object, TLLI = 0xf1000001, IMSI '' -> '001001000000001'
 Modifying MS object, TLLI = 0xf1000001, IMSI '001001000000001' -> '001001000000002'
-MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL): + test_tbf_imsi: now used by 1 (test_tbf_imsi)
+MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL): + test_tbf_imsi: now used by 2 (tbf,test_tbf_imsi)
 Modifying MS object, TLLI = 0xf1000002, IMSI '' -> '001001000000002'
 MS(TLLI-0xf1000002:TA-0:MSCLS-45-0:DL) IMSI '001001000000002' was already assigned to another MS object: TLLI = 0xf1000001, that IMSI will be removed
-MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL): + ms_merge_and_clear_ms: now used by 2 (test_tbf_imsi,ms_merge_and_clear_ms)
+MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL): + ms_merge_and_clear_ms: now used by 3 (tbf,test_tbf_imsi,ms_merge_and_clear_ms)
 MS(TLLI-0xf1000002:TA-0:MSCLS-45-0:DL) Merge MS: MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL)
+MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL) Clearing MS object
 TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001), 2 TBFs, USFs = 00, TFIs = 00000003.
 MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001)
+MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0): - tbf: now used by 2 (test_tbf_imsi,ms_merge_and_clear_ms)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001){FLOW}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001){NONE}: Deallocated
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001){SEND_ASS}: Deallocated
-MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0) Clearing MS object
 MS(TA-0:MSCLS-45-0): - ms_merge_and_clear_ms: now used by 1 (test_tbf_imsi)
 MS(TA-0:MSCLS-45-0): - test_tbf_imsi: now used by 0 (-)
 MS(TA-0:MSCLS-45-0) Destroying MS object
 TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002), 1 TBFs, USFs = 00, TFIs = 00000002.
 MS(IMSI-001001000000002:TLLI-0xf1000002:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002)
+MS(IMSI-001001000000002:TLLI-0xf1000002:TA-0:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000002:TLLI-0xf1000002:TA-0:MSCLS-45-0) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002){FLOW}: Deallocated
@@ -692,8 +692,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000000:TLLI
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000000:TLLI-0xc0000000) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000000:TLLI-0xc0000000) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000000:TLLI-0xc0000000)
-MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000000:TLLI-0xc0000000) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000000:TLLI-0xc0000000) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000000)
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000000:TLLI-0xc0000000){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -724,8 +723,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000001:TLLI
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xc0000001) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xc0000001) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xc0000001)
-MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xc0000001) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xc0000001) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000001)
 DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xc0000001){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -756,8 +754,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000002:TLLI
 TBF(DL:TFI-0-0-2:STATE-NEW:GPRS:IMSI-001001000000002:TLLI-0xc0000002) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-2:STATE-NEW:GPRS:IMSI-001001000000002:TLLI-0xc0000002) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-2:STATE-NEW:GPRS:IMSI-001001000000002:TLLI-0xc0000002)
-MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-2:STATE-NEW:GPRS:IMSI-001001000000002:TLLI-0xc0000002) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-2:STATE-NEW:GPRS:IMSI-001001000000002:TLLI-0xc0000002) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000002)
 DL_TBF(DL:TFI-0-0-2:STATE-NEW:GPRS:IMSI-001001000000002:TLLI-0xc0000002){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -788,8 +785,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000003:TLLI
 TBF(DL:TFI-0-0-3:STATE-NEW:GPRS:IMSI-001001000000003:TLLI-0xc0000003) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-3:STATE-NEW:GPRS:IMSI-001001000000003:TLLI-0xc0000003) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-3:STATE-NEW:GPRS:IMSI-001001000000003:TLLI-0xc0000003)
-MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-3:STATE-NEW:GPRS:IMSI-001001000000003:TLLI-0xc0000003) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-3:STATE-NEW:GPRS:IMSI-001001000000003:TLLI-0xc0000003) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000003)
 DL_TBF(DL:TFI-0-0-3:STATE-NEW:GPRS:IMSI-001001000000003:TLLI-0xc0000003){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -820,8 +816,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000004:TLLI
 TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:IMSI-001001000000004:TLLI-0xc0000004) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:IMSI-001001000000004:TLLI-0xc0000004) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:IMSI-001001000000004:TLLI-0xc0000004)
-MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:IMSI-001001000000004:TLLI-0xc0000004) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:IMSI-001001000000004:TLLI-0xc0000004) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000004)
 DL_TBF(DL:TFI-0-0-4:STATE-NEW:GPRS:IMSI-001001000000004:TLLI-0xc0000004){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -852,8 +847,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000005:TLLI
 TBF(DL:TFI-0-0-5:STATE-NEW:GPRS:IMSI-001001000000005:TLLI-0xc0000005) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-5:STATE-NEW:GPRS:IMSI-001001000000005:TLLI-0xc0000005) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-5:STATE-NEW:GPRS:IMSI-001001000000005:TLLI-0xc0000005)
-MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-5:STATE-NEW:GPRS:IMSI-001001000000005:TLLI-0xc0000005) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-5:STATE-NEW:GPRS:IMSI-001001000000005:TLLI-0xc0000005) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000005)
 DL_TBF(DL:TFI-0-0-5:STATE-NEW:GPRS:IMSI-001001000000005:TLLI-0xc0000005){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -884,8 +878,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000006:TLLI
 TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:IMSI-001001000000006:TLLI-0xc0000006) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:IMSI-001001000000006:TLLI-0xc0000006) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:IMSI-001001000000006:TLLI-0xc0000006)
-MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:IMSI-001001000000006:TLLI-0xc0000006) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:IMSI-001001000000006:TLLI-0xc0000006) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000006)
 DL_TBF(DL:TFI-0-0-6:STATE-NEW:GPRS:IMSI-001001000000006:TLLI-0xc0000006){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -916,8 +909,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000007:TLLI
 TBF(DL:TFI-0-0-7:STATE-NEW:GPRS:IMSI-001001000000007:TLLI-0xc0000007) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-7:STATE-NEW:GPRS:IMSI-001001000000007:TLLI-0xc0000007) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-7:STATE-NEW:GPRS:IMSI-001001000000007:TLLI-0xc0000007)
-MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-7:STATE-NEW:GPRS:IMSI-001001000000007:TLLI-0xc0000007) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-7:STATE-NEW:GPRS:IMSI-001001000000007:TLLI-0xc0000007) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000007)
 DL_TBF(DL:TFI-0-0-7:STATE-NEW:GPRS:IMSI-001001000000007:TLLI-0xc0000007){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -948,8 +940,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000008:TLLI
 TBF(DL:TFI-0-0-8:STATE-NEW:GPRS:IMSI-001001000000008:TLLI-0xc0000008) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-8:STATE-NEW:GPRS:IMSI-001001000000008:TLLI-0xc0000008) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-8:STATE-NEW:GPRS:IMSI-001001000000008:TLLI-0xc0000008)
-MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-8:STATE-NEW:GPRS:IMSI-001001000000008:TLLI-0xc0000008) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-8:STATE-NEW:GPRS:IMSI-001001000000008:TLLI-0xc0000008) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000008)
 DL_TBF(DL:TFI-0-0-8:STATE-NEW:GPRS:IMSI-001001000000008:TLLI-0xc0000008){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -980,8 +971,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000009:TLLI
 TBF(DL:TFI-0-0-9:STATE-NEW:GPRS:IMSI-001001000000009:TLLI-0xc0000009) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-9:STATE-NEW:GPRS:IMSI-001001000000009:TLLI-0xc0000009) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-9:STATE-NEW:GPRS:IMSI-001001000000009:TLLI-0xc0000009)
-MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-9:STATE-NEW:GPRS:IMSI-001001000000009:TLLI-0xc0000009) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-9:STATE-NEW:GPRS:IMSI-001001000000009:TLLI-0xc0000009) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000009)
 DL_TBF(DL:TFI-0-0-9:STATE-NEW:GPRS:IMSI-001001000000009:TLLI-0xc0000009){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1012,8 +1002,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000010:TLLI
 TBF(DL:TFI-0-0-10:STATE-NEW:GPRS:IMSI-001001000000010:TLLI-0xc000000a) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-10:STATE-NEW:GPRS:IMSI-001001000000010:TLLI-0xc000000a) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-10:STATE-NEW:GPRS:IMSI-001001000000010:TLLI-0xc000000a)
-MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-10:STATE-NEW:GPRS:IMSI-001001000000010:TLLI-0xc000000a) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-10:STATE-NEW:GPRS:IMSI-001001000000010:TLLI-0xc000000a) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000010)
 DL_TBF(DL:TFI-0-0-10:STATE-NEW:GPRS:IMSI-001001000000010:TLLI-0xc000000a){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1044,8 +1033,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000011:TLLI
 TBF(DL:TFI-0-0-11:STATE-NEW:GPRS:IMSI-001001000000011:TLLI-0xc000000b) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-11:STATE-NEW:GPRS:IMSI-001001000000011:TLLI-0xc000000b) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-11:STATE-NEW:GPRS:IMSI-001001000000011:TLLI-0xc000000b)
-MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-11:STATE-NEW:GPRS:IMSI-001001000000011:TLLI-0xc000000b) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-11:STATE-NEW:GPRS:IMSI-001001000000011:TLLI-0xc000000b) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000011)
 DL_TBF(DL:TFI-0-0-11:STATE-NEW:GPRS:IMSI-001001000000011:TLLI-0xc000000b){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1076,8 +1064,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000012:TLLI
 TBF(DL:TFI-0-0-12:STATE-NEW:GPRS:IMSI-001001000000012:TLLI-0xc000000c) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-12:STATE-NEW:GPRS:IMSI-001001000000012:TLLI-0xc000000c) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-12:STATE-NEW:GPRS:IMSI-001001000000012:TLLI-0xc000000c)
-MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-12:STATE-NEW:GPRS:IMSI-001001000000012:TLLI-0xc000000c) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-12:STATE-NEW:GPRS:IMSI-001001000000012:TLLI-0xc000000c) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000012)
 DL_TBF(DL:TFI-0-0-12:STATE-NEW:GPRS:IMSI-001001000000012:TLLI-0xc000000c){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1108,8 +1095,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000013:TLLI
 TBF(DL:TFI-0-0-13:STATE-NEW:GPRS:IMSI-001001000000013:TLLI-0xc000000d) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-13:STATE-NEW:GPRS:IMSI-001001000000013:TLLI-0xc000000d) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-13:STATE-NEW:GPRS:IMSI-001001000000013:TLLI-0xc000000d)
-MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-13:STATE-NEW:GPRS:IMSI-001001000000013:TLLI-0xc000000d) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-13:STATE-NEW:GPRS:IMSI-001001000000013:TLLI-0xc000000d) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000013)
 DL_TBF(DL:TFI-0-0-13:STATE-NEW:GPRS:IMSI-001001000000013:TLLI-0xc000000d){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1140,8 +1126,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000014:TLLI
 TBF(DL:TFI-0-0-14:STATE-NEW:GPRS:IMSI-001001000000014:TLLI-0xc000000e) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-14:STATE-NEW:GPRS:IMSI-001001000000014:TLLI-0xc000000e) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-14:STATE-NEW:GPRS:IMSI-001001000000014:TLLI-0xc000000e)
-MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-14:STATE-NEW:GPRS:IMSI-001001000000014:TLLI-0xc000000e) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-14:STATE-NEW:GPRS:IMSI-001001000000014:TLLI-0xc000000e) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000014)
 DL_TBF(DL:TFI-0-0-14:STATE-NEW:GPRS:IMSI-001001000000014:TLLI-0xc000000e){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1172,8 +1157,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000015:TLLI
 TBF(DL:TFI-0-0-15:STATE-NEW:GPRS:IMSI-001001000000015:TLLI-0xc000000f) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-15:STATE-NEW:GPRS:IMSI-001001000000015:TLLI-0xc000000f) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-15:STATE-NEW:GPRS:IMSI-001001000000015:TLLI-0xc000000f)
-MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-15:STATE-NEW:GPRS:IMSI-001001000000015:TLLI-0xc000000f) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-15:STATE-NEW:GPRS:IMSI-001001000000015:TLLI-0xc000000f) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000015)
 DL_TBF(DL:TFI-0-0-15:STATE-NEW:GPRS:IMSI-001001000000015:TLLI-0xc000000f){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1204,8 +1188,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000016:TLLI
 TBF(DL:TFI-0-0-16:STATE-NEW:GPRS:IMSI-001001000000016:TLLI-0xc0000010) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-16:STATE-NEW:GPRS:IMSI-001001000000016:TLLI-0xc0000010) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-16:STATE-NEW:GPRS:IMSI-001001000000016:TLLI-0xc0000010)
-MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-16:STATE-NEW:GPRS:IMSI-001001000000016:TLLI-0xc0000010) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-16:STATE-NEW:GPRS:IMSI-001001000000016:TLLI-0xc0000010) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000016)
 DL_TBF(DL:TFI-0-0-16:STATE-NEW:GPRS:IMSI-001001000000016:TLLI-0xc0000010){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1236,8 +1219,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000017:TLLI
 TBF(DL:TFI-0-0-17:STATE-NEW:GPRS:IMSI-001001000000017:TLLI-0xc0000011) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-17:STATE-NEW:GPRS:IMSI-001001000000017:TLLI-0xc0000011) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-17:STATE-NEW:GPRS:IMSI-001001000000017:TLLI-0xc0000011)
-MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-17:STATE-NEW:GPRS:IMSI-001001000000017:TLLI-0xc0000011) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-17:STATE-NEW:GPRS:IMSI-001001000000017:TLLI-0xc0000011) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000017)
 DL_TBF(DL:TFI-0-0-17:STATE-NEW:GPRS:IMSI-001001000000017:TLLI-0xc0000011){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1268,8 +1250,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000018:TLLI
 TBF(DL:TFI-0-0-18:STATE-NEW:GPRS:IMSI-001001000000018:TLLI-0xc0000012) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-18:STATE-NEW:GPRS:IMSI-001001000000018:TLLI-0xc0000012) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-18:STATE-NEW:GPRS:IMSI-001001000000018:TLLI-0xc0000012)
-MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-18:STATE-NEW:GPRS:IMSI-001001000000018:TLLI-0xc0000012) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-18:STATE-NEW:GPRS:IMSI-001001000000018:TLLI-0xc0000012) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000018)
 DL_TBF(DL:TFI-0-0-18:STATE-NEW:GPRS:IMSI-001001000000018:TLLI-0xc0000012){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1300,8 +1281,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000019:TLLI
 TBF(DL:TFI-0-0-19:STATE-NEW:GPRS:IMSI-001001000000019:TLLI-0xc0000013) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-19:STATE-NEW:GPRS:IMSI-001001000000019:TLLI-0xc0000013) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-19:STATE-NEW:GPRS:IMSI-001001000000019:TLLI-0xc0000013)
-MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-19:STATE-NEW:GPRS:IMSI-001001000000019:TLLI-0xc0000013) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-19:STATE-NEW:GPRS:IMSI-001001000000019:TLLI-0xc0000013) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000019)
 DL_TBF(DL:TFI-0-0-19:STATE-NEW:GPRS:IMSI-001001000000019:TLLI-0xc0000013){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1332,8 +1312,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000020:TLLI
 TBF(DL:TFI-0-0-20:STATE-NEW:GPRS:IMSI-001001000000020:TLLI-0xc0000014) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-20:STATE-NEW:GPRS:IMSI-001001000000020:TLLI-0xc0000014) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-20:STATE-NEW:GPRS:IMSI-001001000000020:TLLI-0xc0000014)
-MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-20:STATE-NEW:GPRS:IMSI-001001000000020:TLLI-0xc0000014) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-20:STATE-NEW:GPRS:IMSI-001001000000020:TLLI-0xc0000014) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000020)
 DL_TBF(DL:TFI-0-0-20:STATE-NEW:GPRS:IMSI-001001000000020:TLLI-0xc0000014){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1364,8 +1343,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000021:TLLI
 TBF(DL:TFI-0-0-21:STATE-NEW:GPRS:IMSI-001001000000021:TLLI-0xc0000015) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-21:STATE-NEW:GPRS:IMSI-001001000000021:TLLI-0xc0000015) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-21:STATE-NEW:GPRS:IMSI-001001000000021:TLLI-0xc0000015)
-MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-21:STATE-NEW:GPRS:IMSI-001001000000021:TLLI-0xc0000015) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-21:STATE-NEW:GPRS:IMSI-001001000000021:TLLI-0xc0000015) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000021)
 DL_TBF(DL:TFI-0-0-21:STATE-NEW:GPRS:IMSI-001001000000021:TLLI-0xc0000015){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1396,8 +1374,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000022:TLLI
 TBF(DL:TFI-0-0-22:STATE-NEW:GPRS:IMSI-001001000000022:TLLI-0xc0000016) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-22:STATE-NEW:GPRS:IMSI-001001000000022:TLLI-0xc0000016) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-22:STATE-NEW:GPRS:IMSI-001001000000022:TLLI-0xc0000016)
-MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-22:STATE-NEW:GPRS:IMSI-001001000000022:TLLI-0xc0000016) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-22:STATE-NEW:GPRS:IMSI-001001000000022:TLLI-0xc0000016) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000022)
 DL_TBF(DL:TFI-0-0-22:STATE-NEW:GPRS:IMSI-001001000000022:TLLI-0xc0000016){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1428,8 +1405,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000023:TLLI
 TBF(DL:TFI-0-0-23:STATE-NEW:GPRS:IMSI-001001000000023:TLLI-0xc0000017) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-23:STATE-NEW:GPRS:IMSI-001001000000023:TLLI-0xc0000017) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-23:STATE-NEW:GPRS:IMSI-001001000000023:TLLI-0xc0000017)
-MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-23:STATE-NEW:GPRS:IMSI-001001000000023:TLLI-0xc0000017) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-23:STATE-NEW:GPRS:IMSI-001001000000023:TLLI-0xc0000017) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000023)
 DL_TBF(DL:TFI-0-0-23:STATE-NEW:GPRS:IMSI-001001000000023:TLLI-0xc0000017){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1460,8 +1436,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000024:TLLI
 TBF(DL:TFI-0-0-24:STATE-NEW:GPRS:IMSI-001001000000024:TLLI-0xc0000018) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-24:STATE-NEW:GPRS:IMSI-001001000000024:TLLI-0xc0000018) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-24:STATE-NEW:GPRS:IMSI-001001000000024:TLLI-0xc0000018)
-MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-24:STATE-NEW:GPRS:IMSI-001001000000024:TLLI-0xc0000018) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-24:STATE-NEW:GPRS:IMSI-001001000000024:TLLI-0xc0000018) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000024)
 DL_TBF(DL:TFI-0-0-24:STATE-NEW:GPRS:IMSI-001001000000024:TLLI-0xc0000018){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1492,8 +1467,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000025:TLLI
 TBF(DL:TFI-0-0-25:STATE-NEW:GPRS:IMSI-001001000000025:TLLI-0xc0000019) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-25:STATE-NEW:GPRS:IMSI-001001000000025:TLLI-0xc0000019) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-25:STATE-NEW:GPRS:IMSI-001001000000025:TLLI-0xc0000019)
-MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-25:STATE-NEW:GPRS:IMSI-001001000000025:TLLI-0xc0000019) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-25:STATE-NEW:GPRS:IMSI-001001000000025:TLLI-0xc0000019) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000025)
 DL_TBF(DL:TFI-0-0-25:STATE-NEW:GPRS:IMSI-001001000000025:TLLI-0xc0000019){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1524,8 +1498,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000026:TLLI
 TBF(DL:TFI-0-0-26:STATE-NEW:GPRS:IMSI-001001000000026:TLLI-0xc000001a) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-26:STATE-NEW:GPRS:IMSI-001001000000026:TLLI-0xc000001a) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-26:STATE-NEW:GPRS:IMSI-001001000000026:TLLI-0xc000001a)
-MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-26:STATE-NEW:GPRS:IMSI-001001000000026:TLLI-0xc000001a) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-26:STATE-NEW:GPRS:IMSI-001001000000026:TLLI-0xc000001a) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000026)
 DL_TBF(DL:TFI-0-0-26:STATE-NEW:GPRS:IMSI-001001000000026:TLLI-0xc000001a){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1556,8 +1529,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000027:TLLI
 TBF(DL:TFI-0-0-27:STATE-NEW:GPRS:IMSI-001001000000027:TLLI-0xc000001b) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-27:STATE-NEW:GPRS:IMSI-001001000000027:TLLI-0xc000001b) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-27:STATE-NEW:GPRS:IMSI-001001000000027:TLLI-0xc000001b)
-MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-27:STATE-NEW:GPRS:IMSI-001001000000027:TLLI-0xc000001b) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-27:STATE-NEW:GPRS:IMSI-001001000000027:TLLI-0xc000001b) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000027)
 DL_TBF(DL:TFI-0-0-27:STATE-NEW:GPRS:IMSI-001001000000027:TLLI-0xc000001b){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1588,8 +1560,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000028:TLLI
 TBF(DL:TFI-0-0-28:STATE-NEW:GPRS:IMSI-001001000000028:TLLI-0xc000001c) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-28:STATE-NEW:GPRS:IMSI-001001000000028:TLLI-0xc000001c) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-28:STATE-NEW:GPRS:IMSI-001001000000028:TLLI-0xc000001c)
-MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-28:STATE-NEW:GPRS:IMSI-001001000000028:TLLI-0xc000001c) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-28:STATE-NEW:GPRS:IMSI-001001000000028:TLLI-0xc000001c) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000028)
 DL_TBF(DL:TFI-0-0-28:STATE-NEW:GPRS:IMSI-001001000000028:TLLI-0xc000001c){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1620,8 +1591,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000029:TLLI
 TBF(DL:TFI-0-0-29:STATE-NEW:GPRS:IMSI-001001000000029:TLLI-0xc000001d) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-29:STATE-NEW:GPRS:IMSI-001001000000029:TLLI-0xc000001d) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-29:STATE-NEW:GPRS:IMSI-001001000000029:TLLI-0xc000001d)
-MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-29:STATE-NEW:GPRS:IMSI-001001000000029:TLLI-0xc000001d) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-29:STATE-NEW:GPRS:IMSI-001001000000029:TLLI-0xc000001d) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000029)
 DL_TBF(DL:TFI-0-0-29:STATE-NEW:GPRS:IMSI-001001000000029:TLLI-0xc000001d){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1652,8 +1622,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000030:TLLI
 TBF(DL:TFI-0-0-30:STATE-NEW:GPRS:IMSI-001001000000030:TLLI-0xc000001e) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-30:STATE-NEW:GPRS:IMSI-001001000000030:TLLI-0xc000001e) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-30:STATE-NEW:GPRS:IMSI-001001000000030:TLLI-0xc000001e)
-MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-30:STATE-NEW:GPRS:IMSI-001001000000030:TLLI-0xc000001e) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-30:STATE-NEW:GPRS:IMSI-001001000000030:TLLI-0xc000001e) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000030)
 DL_TBF(DL:TFI-0-0-30:STATE-NEW:GPRS:IMSI-001001000000030:TLLI-0xc000001e){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1684,8 +1653,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000000031:TLLI
 TBF(DL:TFI-0-0-31:STATE-NEW:GPRS:IMSI-001001000000031:TLLI-0xc000001f) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-31:STATE-NEW:GPRS:IMSI-001001000000031:TLLI-0xc000001f) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-31:STATE-NEW:GPRS:IMSI-001001000000031:TLLI-0xc000001f)
-MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-31:STATE-NEW:GPRS:IMSI-001001000000031:TLLI-0xc000001f) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-31:STATE-NEW:GPRS:IMSI-001001000000031:TLLI-0xc000001f) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000031)
 DL_TBF(DL:TFI-0-0-31:STATE-NEW:GPRS:IMSI-001001000000031:TLLI-0xc000001f){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1714,68 +1682,100 @@ MS(IMSI-001001000000032:TLLI-0xc0000020:TA-220:MSCLS-45-0) No PDCH resource
 MS(IMSI-001001000000032:TLLI-0xc0000020:TA-220:MSCLS-45-0) Destroying MS object
 MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-31:STATE-ASSIGN:GPRS:IMSI-001001000000031:TLLI-0xc000001f)
+MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-30:STATE-ASSIGN:GPRS:IMSI-001001000000030:TLLI-0xc000001e)
+MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-29:STATE-ASSIGN:GPRS:IMSI-001001000000029:TLLI-0xc000001d)
+MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-28:STATE-ASSIGN:GPRS:IMSI-001001000000028:TLLI-0xc000001c)
+MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-27:STATE-ASSIGN:GPRS:IMSI-001001000000027:TLLI-0xc000001b)
+MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-26:STATE-ASSIGN:GPRS:IMSI-001001000000026:TLLI-0xc000001a)
+MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-25:STATE-ASSIGN:GPRS:IMSI-001001000000025:TLLI-0xc0000019)
+MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-24:STATE-ASSIGN:GPRS:IMSI-001001000000024:TLLI-0xc0000018)
+MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-23:STATE-ASSIGN:GPRS:IMSI-001001000000023:TLLI-0xc0000017)
+MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-22:STATE-ASSIGN:GPRS:IMSI-001001000000022:TLLI-0xc0000016)
+MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-21:STATE-ASSIGN:GPRS:IMSI-001001000000021:TLLI-0xc0000015)
+MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-20:STATE-ASSIGN:GPRS:IMSI-001001000000020:TLLI-0xc0000014)
+MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-19:STATE-ASSIGN:GPRS:IMSI-001001000000019:TLLI-0xc0000013)
+MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-18:STATE-ASSIGN:GPRS:IMSI-001001000000018:TLLI-0xc0000012)
+MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-17:STATE-ASSIGN:GPRS:IMSI-001001000000017:TLLI-0xc0000011)
+MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-16:STATE-ASSIGN:GPRS:IMSI-001001000000016:TLLI-0xc0000010)
+MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-15:STATE-ASSIGN:GPRS:IMSI-001001000000015:TLLI-0xc000000f)
+MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-14:STATE-ASSIGN:GPRS:IMSI-001001000000014:TLLI-0xc000000e)
+MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-13:STATE-ASSIGN:GPRS:IMSI-001001000000013:TLLI-0xc000000d)
+MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-12:STATE-ASSIGN:GPRS:IMSI-001001000000012:TLLI-0xc000000c)
+MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-11:STATE-ASSIGN:GPRS:IMSI-001001000000011:TLLI-0xc000000b)
+MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-10:STATE-ASSIGN:GPRS:IMSI-001001000000010:TLLI-0xc000000a)
+MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-9:STATE-ASSIGN:GPRS:IMSI-001001000000009:TLLI-0xc0000009)
+MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-8:STATE-ASSIGN:GPRS:IMSI-001001000000008:TLLI-0xc0000008)
+MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-7:STATE-ASSIGN:GPRS:IMSI-001001000000007:TLLI-0xc0000007)
+MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-6:STATE-ASSIGN:GPRS:IMSI-001001000000006:TLLI-0xc0000006)
+MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-5:STATE-ASSIGN:GPRS:IMSI-001001000000005:TLLI-0xc0000005)
+MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-4:STATE-ASSIGN:GPRS:IMSI-001001000000004:TLLI-0xc0000004)
+MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-3:STATE-ASSIGN:GPRS:IMSI-001001000000003:TLLI-0xc0000003)
+MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-2:STATE-ASSIGN:GPRS:IMSI-001001000000002:TLLI-0xc0000002)
+MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xc0000001)
+MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000000000:TLLI-0xc0000000)
+MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 === start test_tbf_dl_llc_loss ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
 Creating MS object
@@ -1801,8 +1801,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000123456:TLLI
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456)
-MS(IMSI-001001000123456:TLLI-0xc0123456:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000123456:TLLI-0xc0123456:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000123456:TLLI-0xc0123456:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456) Send downlink assignment on PCH, no TBF exist (IMSI=001001000123456)
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1815,8 +1814,8 @@ MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) appending 19 bytes t
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000123456:TLLI-0xc0123456) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000123456:TLLI-0xc0123456), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000123456:TLLI-0xc0123456)
+MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0): - tbf: now used by 0 (-)
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0) Schedule MS release in 10 secs
-MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0): + release_timer: now used by 1 (release_timer)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456){NONE}: Deallocated
@@ -1840,10 +1839,8 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001000123456:TLLI
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456)
-MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0): + ms_attach_dl_tbf: now used by 2 (release_timer,ms_attach_dl_tbf)
+MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) Cancel scheduled MS release
-MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL): - release_timer: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456) Send downlink assignment on PCH, no TBF exist (IMSI=001001000123456)
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000123456:TLLI-0xc0123456){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -1897,6 +1894,7 @@ MSG = 1f 01 04 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03
 === end test_tbf_dl_llc_loss ===
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-001001000123456:TLLI-0xc0123456)
+MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0): - tbf: now used by 0 (-)
 === start test_tbf_single_phase ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
 Found first unallocated TRX=0 TFI=0
@@ -1922,8 +1920,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 1 TBFs, USFs = 01, TFIs
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -1961,6 +1958,7 @@ MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) appending 4 bytes to DL LL
 === end test_tbf_single_phase ===
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 === start test_tbf_single_phase2 ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
 Found first unallocated TRX=0 TFI=0
@@ -1986,8 +1984,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 1 TBFs, USFs = 01, TFIs
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -2037,11 +2034,12 @@ TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) FN=2654184
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: Received Event RX_CTRL_ACK
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK}: state_chg to NONE
 UL_TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344){FINISHED}: Received Event FINAL_UL_ACK_CONFIRMED
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL): + st_finished: now used by 1 (st_finished)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL): + st_finished: now used by 2 (tbf,st_finished)
 TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) [UPLINK] END
 TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 01, TFIs = 00000001.
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0): - tbf: now used by 1 (st_finished)
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 UL_TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344){FINISHED}: Deallocated
@@ -2065,8 +2063,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0): + ms_attach_dl_tbf: now used by 2 (st_finished,ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 1 (st_finished)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL): + tbf: now used by 2 (st_finished,tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Send downlink assignment on PCH, no TBF exist (IMSI=0011223344)
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -2074,10 +2071,11 @@ TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) set ass. type C
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=7 TA=7
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL): - st_finished: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL): - st_finished: now used by 1 (tbf)
 === end test_tbf_single_phase2 ===
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 === start test_tbf_two_phase ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
 MS requests Uplink resource on CCCH/RACH: ra=0x73 (8 bit) Fn=2654167 qta=31
@@ -2114,8 +2112,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS:TLLI-0xf1223344), 1 TBFs,
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
@@ -2123,7 +2120,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Starting timer X2001 [assign
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -2175,8 +2172,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Send downlink assignment on PACCH, because TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) exists
 DL_ASS_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
@@ -2187,7 +2183,9 @@ DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state_
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0): - tbf: now used by 0 (-)
 === end test_tbf_two_phase ===
 === start test_tbf_ra_update_rach ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -2225,8 +2223,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS:TLLI-0xf1223344), 1 TBFs,
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
@@ -2234,7 +2231,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Starting timer X2001 [assign
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -2285,8 +2282,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Send downlink assignment on PACCH, because TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) exists
 DL_ASS_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
@@ -2404,8 +2400,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS:TLLI-0xf5667788), 2 TBFs,
 TBF(UL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xf5667788) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xf5667788) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf5667788:TA-7:MSCLS-1-0) Attaching UL TBF: TBF(UL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xf5667788)
-MS(TLLI-0xf5667788:TA-7:MSCLS-1-0): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf5667788:TA-7:MSCLS-1-0:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf5667788:TA-7:MSCLS-1-0:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 UL_TBF(UL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xf5667788){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xf5667788) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xf5667788){NEW}: state_chg to ASSIGN
@@ -2413,7 +2408,7 @@ TBF(UL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xf5667788) Starting timer X2001 [assign
 TBF(UL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xf5667788) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xf5667788){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xf5667788){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf5667788:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf5667788:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=2654348 but previous FN=2654301 is still reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654301): TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) N3101 2 => 3 (< MAX 10)
@@ -2458,18 +2453,19 @@ TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS:TLLI-0xf5667788) Frame 1 starts at offset 0, le
 TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS:TLLI-0xf5667788) No gaps in received block, last block: BSN=0 CV=15
 Old MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 0
 There is a new MS object for the same MS: (0xf1223344, '0011223344') -> (0xf5667788, '')
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + ms_merge_and_clear_ms: now used by 1 (ms_merge_and_clear_ms)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + ms_merge_and_clear_ms: now used by 3 (2*tbf,ms_merge_and_clear_ms)
 MS(TLLI-0xf5667788:TA-7:MSCLS-1-0:UL) Merge MS: MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Clearing MS object
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344), 2 TBFs, USFs = 03, TFIs = 00000003.
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): - tbf: now used by 2 (tbf,ms_merge_and_clear_ms)
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 UL_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){FLOW}: Deallocated
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 DL_ASS_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Clearing MS object
-MS(TA-7:MSCLS-1-0:DL): - ms_merge_and_clear_ms: now used by 0 (-)
+MS(TA-7:MSCLS-1-0:DL): - ms_merge_and_clear_ms: now used by 1 (tbf)
 Modifying MS object, TLLI: 0xf5667788 confirmed
 MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL) appending 4 bytes to DL LLC queue
 MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL) ********** DL-TBF starts here **********
@@ -2490,8 +2486,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf5
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf5667788) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf5667788) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL) Attaching DL TBF: TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf5667788)
-MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf5667788) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf5667788) Send downlink assignment on PACCH, because TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf5667788) exists
 DL_ASS_TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf5667788){NONE}: Received Event SCHED_ASS
@@ -2503,9 +2498,12 @@ TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf5667788) Starting tim
 New MS: TLLI = 0xf5667788, TA = 7, IMSI = 0011223344, LLC = 1
 MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf5667788)
+MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf5667788)
+MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-1-0:DL) Destroying MS object
 MS(TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FINISHED:GPRS)
+MS(TA-7:MSCLS-1-0): - tbf: now used by 0 (-)
 === end test_tbf_ra_update_rach ===
 === start test_tbf_dl_flow_and_rach_two_phase ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -2544,8 +2542,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS:TLLI-0xf1223344), 1 TBFs,
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
@@ -2553,7 +2550,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Starting timer X2001 [assign
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -2605,8 +2602,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Send downlink assignment on PACCH, because TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) exists
 DL_ASS_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
@@ -2620,6 +2616,7 @@ Old MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 01, TFIs = 00000001.
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): - tbf: now used by 1 (tbf)
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 UL_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){FLOW}: Deallocated
@@ -2634,12 +2631,13 @@ Found first unallocated TRX=0 TFI=0
 Detected FN jump! 2654275 -> 2654327 (expected 2654279, delta 52)
 PDCH(bts=0,trx=0,ts=7) FN=2654327 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++
 PDCH(bts=0,trx=0,ts=7) FN=2654327 ------------------------- RX : Uplink Control Block -------------------------
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): + rcv_resource_request: now used by 1 (rcv_resource_request)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): + rcv_resource_request: now used by 2 (tbf,rcv_resource_request)
 PDCH(bts=0,trx=0,ts=7) FN=2654327 PKT RESOURCE REQ: MS requests UL TBF throguh SBA
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) Got PACKET RESOURCE REQ while DL-TBF pending, killing it
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0): - tbf: now used by 1 (rcv_resource_request)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
@@ -2663,8 +2661,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
@@ -2672,7 +2669,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) Starting tim
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654327 + 13 = 2654340
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -2709,8 +2706,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Send downlink assignment on PACCH, because TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) exists
 DL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
@@ -2732,7 +2728,9 @@ TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) No gaps in rec
 New MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0): - tbf: now used by 0 (-)
 === end test_tbf_dl_flow_and_rach_two_phase ===
 === start test_tbf_dl_flow_and_rach_single_phase ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -2771,8 +2769,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS:TLLI-0xf1223344), 1 TBFs,
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
@@ -2780,7 +2777,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Starting timer X2001 [assign
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -2832,8 +2829,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Send downlink assignment on PACCH, because TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) exists
 DL_ASS_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
@@ -2847,6 +2843,7 @@ Old MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 01, TFIs = 00000001.
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): - tbf: now used by 1 (tbf)
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 UL_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){FLOW}: Deallocated
@@ -2875,8 +2872,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 1 TBFs, USFs = 01, TFIs
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -2892,17 +2888,18 @@ TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS) BSN 0 storing in window (0..63)
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS) data_length=20, data=f1 22 33 44 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS) Decoded premier TLLI=0xf1223344 of UL DATA TFI=0.
 Modifying MS object, UL TLLI: 0xffffffff -> 0xf1223344, not yet confirmed
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): + ms_merge_and_clear_ms: now used by 1 (ms_merge_and_clear_ms)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): + ms_merge_and_clear_ms: now used by 2 (tbf,ms_merge_and_clear_ms)
 MS(TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) Merge MS: MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL)
 Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Clearing MS object
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 01, TFIs = 00000001.
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0): - tbf: now used by 1 (ms_merge_and_clear_ms)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0) Clearing MS object
 MS(TA-7:MSCLS-1-0): - ms_merge_and_clear_ms: now used by 0 (-)
 MS(TA-7:MSCLS-1-0) Destroying MS object
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){FLOW}: Received Event FIRST_UL_DATA_RECVD
@@ -2922,6 +2919,7 @@ UL_ACK_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: state_chg to SCHED_UL_ACK
 New MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0): - tbf: now used by 0 (-)
 === end test_tbf_dl_flow_and_rach_single_phase ===
 === start test_tbf_dl_reuse ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -2960,8 +2958,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS:TLLI-0xf1223344), 1 TBFs,
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
@@ -2969,7 +2966,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Starting timer X2001 [assign
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:GPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -3021,8 +3018,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Send downlink assignment on PACCH, because TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) exists
 DL_ASS_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
@@ -3779,8 +3775,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Attaching DL TBF: TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): + tbf: now used by 3 (3*tbf)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344) Send downlink assignment on PACCH, because TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:IMSI-0011223344:TLLI-0xf1223344) exists
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
@@ -3822,6 +3817,7 @@ DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){WAIT_ACK
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:IMSI-0011223344:TLLI-0xf1223344), 2 TBFs, USFs = 01, TFIs = 00000003.
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL): - tbf: now used by 2 (2*tbf)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){WAIT_RELEASE}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
@@ -4023,7 +4019,9 @@ TBF(DL:TFI-0-0-1:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) Scheduled
 TBF(DL:TFI-0-0-1:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) msg block (BSN 10, CS-1): 0f 03 14 4d 43 20 50 41 43 4b 45 54 20 30 39 20 28 54 42 46 20 32 29 
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-RELEASING:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0): - tbf: now used by 0 (-)
 === end test_tbf_dl_reuse ===
 === start test_tbf_gprs_egprs ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -4050,8 +4048,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:GPRS:IMSI-001001123456789:TLLI
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001123456789:TLLI-0xc0006789) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001123456789:TLLI-0xc0006789) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001123456789:TLLI-0xc0006789)
-MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001123456789:TLLI-0xc0006789) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001123456789:TLLI-0xc0006789) Send downlink assignment on PCH, no TBF exist (IMSI=001001123456789)
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001123456789:TLLI-0xc0006789){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -4062,6 +4059,7 @@ TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001123456789:TLLI-0xc0006789) TX: STA
 === end test_tbf_gprs_egprs ===
 MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0:DL) Destroying MS object
 MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001123456789:TLLI-0xc0006789)
+MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0): - tbf: now used by 0 (-)
 === start test_tbf_ws ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
 PDCH(bts=0,trx=0,ts=2) PDCH state: disabled => enabled
@@ -4097,8 +4095,7 @@ PDCH(bts=0,trx=0,ts=5) Attaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS), 1 TBFs, USFs
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 3c
 MS(TA-220:MSCLS-12-0) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-12-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-12-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-12-0:DL): + tbf: now used by 1 (tbf)
 DL TBF slots: 0x3c, N: 4, WS: 64
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS) free
 PDCH(bts=0,trx=0,ts=2) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
@@ -4106,6 +4103,7 @@ PDCH(bts=0,trx=0,ts=3) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS), 1 TBFs, USFs
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TA-220:MSCLS-12-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
+MS(TA-220:MSCLS-12-0): - tbf: now used by 0 (-)
 MS(TA-220:MSCLS-12-0) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: Deallocated
@@ -4143,8 +4141,7 @@ PDCH(bts=0,trx=0,ts=5) Attaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 3c
 MS(TA-220:MSCLS-12-12) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-12-12): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-12-12:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-12-12:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 384, base(128) slots(4) ws_pdch(64)
 ws(384)
 DL TBF slots: 0x3c, N: 4, WS: 384
@@ -4154,6 +4151,7 @@ PDCH(bts=0,trx=0,ts=3) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TA-220:MSCLS-12-12:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
+MS(TA-220:MSCLS-12-12): - tbf: now used by 0 (-)
 MS(TA-220:MSCLS-12-12) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){NEW}: Deallocated
@@ -4199,8 +4197,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xf1223344), 1 TBFs
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-1) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -4210,7 +4207,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -4263,8 +4260,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
@@ -4277,7 +4273,9 @@ DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1): - tbf: now used by 0 (-)
 === end test_tbf_egprs_two_phase ===
 === start test_tbf_egprs_two_phase_spb ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -4318,8 +4316,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xf1223344), 1 TBFs
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-1) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -4329,7 +4326,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -4505,8 +4502,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
@@ -4519,7 +4515,9 @@ DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1): - tbf: now used by 0 (-)
 === end test_tbf_egprs_two_phase_spb ===
 === start test_tbf_egprs_dl ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -4547,8 +4545,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -4831,6 +4828,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -4860,8 +4858,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -5093,6 +5090,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5122,8 +5120,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -5315,6 +5312,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5344,8 +5342,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -5521,6 +5518,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5550,8 +5548,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -5711,6 +5708,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5740,8 +5738,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -5877,6 +5874,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5906,8 +5904,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6052,6 +6049,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6081,8 +6079,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6218,6 +6215,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6247,8 +6245,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6373,6 +6370,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6405,8 +6403,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6449,6 +6446,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6478,8 +6476,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6521,6 +6518,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6550,8 +6548,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6593,6 +6590,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6622,8 +6620,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6690,6 +6687,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6719,8 +6717,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6786,6 +6783,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6815,8 +6813,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6882,6 +6879,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6911,8 +6909,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -6978,6 +6975,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7010,8 +7008,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -7060,6 +7057,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7089,8 +7087,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -7139,6 +7136,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7168,8 +7166,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -7218,6 +7215,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7247,8 +7245,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -7304,6 +7301,7 @@ TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7349,8 +7347,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xf1223344), 1 TBFs
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-1) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -7360,7 +7357,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -7436,8 +7433,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
@@ -7450,7 +7446,9 @@ DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1): - tbf: now used by 0 (-)
 === end test_tbf_puan_urbb_len ===
 === start test_tbf_update_ws ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -7483,8 +7481,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 192, base(128) slots(1) ws_pdch(64)
 ws(192)
 DL TBF slots: 0x10, N: 1, WS: 192
@@ -7518,6 +7515,7 @@ PDCH(bts=0,trx=0,ts=3) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS), 1 TBFs, U
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TA-220:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS)
+MS(TA-220:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TA-220:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){ASSIGN}: Deallocated
@@ -7563,8 +7561,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xf1223344), 1 TBFs
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-1) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -7574,7 +7571,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -7639,8 +7636,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
@@ -7653,7 +7649,9 @@ DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1): - tbf: now used by 0 (-)
 === end test_tbf_li_decoding ===
 === start test_tbf_epdan_out_of_rx_window ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -7680,8 +7678,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -7704,6 +7701,7 @@ TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc) V(B): (V(A)=1186)"NNNNNNNNNNN
 TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){FLOW}: Deallocated
@@ -7734,8 +7732,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 1 TBFs, USFs = 01, TFIs
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -7764,8 +7761,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 2 TBFs, USFs = 03, TFIs
 TBF(UL:TFI-0-0-1:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-1:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-1:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-1:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-1:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-1:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -7794,8 +7790,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 3 TBFs, USFs = 07, TFIs
 TBF(UL:TFI-0-0-2:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-2:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-2:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-2:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-2:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-2:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -7824,8 +7819,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 4 TBFs, USFs = 0f, TFIs
 TBF(UL:TFI-0-0-3:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-3:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-3:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-3:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-3:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-3:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -7854,8 +7848,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 5 TBFs, USFs = 1f, TFIs
 TBF(UL:TFI-0-0-4:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-4:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-4:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-4:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-4:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-4:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -7884,8 +7877,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 6 TBFs, USFs = 3f, TFIs
 TBF(UL:TFI-0-0-5:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-5:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-5:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-5:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-5:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-5:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -7914,8 +7906,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:GPRS), 7 TBFs, USFs = 7f, TFIs
 TBF(UL:TFI-0-0-6:STATE-NEW:GPRS) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-6:STATE-NEW:GPRS) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-6:STATE-NEW:GPRS)
-MS(TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0-6:STATE-NEW:GPRS){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-6:STATE-NEW:GPRS) set ass. type CCCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0-6:STATE-NEW:GPRS){NEW}: state_chg to FLOW
@@ -7951,18 +7942,25 @@ Tx Immediate Assignment Reject on AGCH
 MS(TA-220:MSCLS-0-0) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-6:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-5:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-4:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-3:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-2:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 === end test_immediate_assign_rej_multi_block ===
 === start test_immediate_assign_rej_single_block ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -8012,8 +8010,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xf1223344), 1 TBFs
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xf1223344:TA-7:MSCLS-1-1) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344) setting EGPRS UL window size to 192, base(128) slots(1) ws_pdch(64)
 ws(192)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -8023,7 +8020,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xf1223344){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654270 + 13 = 2654283
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xf1223344) start Packet Uplink Assignment (PACCH)
@@ -8573,8 +8570,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(DL:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Allocated: trx = 0, ul_slots = 80, dl_slots = 80
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) setting EGPRS DL window size to 192, base(128) slots(1) ws_pdch(64)
 ws(192)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344) [DOWNLINK] START (PACCH)
@@ -9249,7 +9245,9 @@ Got MS: TLLI = 0xf1223344, TA = 7
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) appending 256 bytes to DL LLC queue
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1): - tbf: now used by 0 (-)
 === end test_tbf_egprs_two_phase_puan ===
 === start test_packet_access_rej_epdan ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -9276,8 +9274,7 @@ PDCH(bts=0,trx=0,ts=4) Attaching TBF(DL:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFI
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Setting Control TS PDCH(bts=0,trx=0,ts=4)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 10
 MS(TA-220:MSCLS-11-11) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
-MS(TA-220:MSCLS-11-11): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TA-220:MSCLS-11-11:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TA-220:MSCLS-11-11:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS) setting EGPRS DL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
@@ -9300,6 +9297,7 @@ UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){SEND_ASS_REJ}: state_chg to NONE
 packet reject: 40 84 7f f7 6e e6 7e ab 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Destroying MS object
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11): - tbf: now used by 0 (-)
 === end test_packet_access_rej_epdan ===
 === start test_packet_access_rej_prr ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -9374,8 +9372,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xffeeddcc), 1 TBFs
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc)
-MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -9385,7 +9382,7 @@ TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 1 (tbf)
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654218 + 13 = 2654231
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc) start Packet Uplink Assignment (PACCH)
@@ -9425,8 +9422,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xffeeddcd), 2 TBFs
 TBF(UL:TFI-0-0-1:STATE-NEW:EGPRS:TLLI-0xffeeddcd) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-1:STATE-NEW:EGPRS:TLLI-0xffeeddcd) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11) Attaching UL TBF: TBF(UL:TFI-0-0-1:STATE-NEW:EGPRS:TLLI-0xffeeddcd)
-MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-1:STATE-NEW:EGPRS:TLLI-0xffeeddcd) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-1:STATE-NEW:EGPRS:TLLI-0xffeeddcd){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -9436,7 +9432,7 @@ TBF(UL:TFI-0-0-1:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcd) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-1:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcd) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-1:STATE-NEW:EGPRS:TLLI-0xffeeddcd){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-1:STATE-NEW:EGPRS:TLLI-0xffeeddcd){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=56 but previous FN=2654231 is still reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc)
 TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc) poll timeout for FN=2654231, TS=7 (curr FN 56)
@@ -9483,8 +9479,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xffeeddce), 3 TBFs
 TBF(UL:TFI-0-0-2:STATE-NEW:EGPRS:TLLI-0xffeeddce) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-2:STATE-NEW:EGPRS:TLLI-0xffeeddce) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11) Attaching UL TBF: TBF(UL:TFI-0-0-2:STATE-NEW:EGPRS:TLLI-0xffeeddce)
-MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-2:STATE-NEW:EGPRS:TLLI-0xffeeddce) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-2:STATE-NEW:EGPRS:TLLI-0xffeeddce){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -9494,7 +9489,7 @@ TBF(UL:TFI-0-0-2:STATE-ASSIGN:EGPRS:TLLI-0xffeeddce) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-2:STATE-ASSIGN:EGPRS:TLLI-0xffeeddce) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-2:STATE-NEW:EGPRS:TLLI-0xffeeddce){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-2:STATE-NEW:EGPRS:TLLI-0xffeeddce){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=60 but previous FN=2654231 is still reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-1:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcd)
 TBF(UL:TFI-0-0-1:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcd) poll timeout for FN=2654231, TS=7 (curr FN 60)
@@ -9541,8 +9536,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xffeeddcf), 4 TBFs
 TBF(UL:TFI-0-0-3:STATE-NEW:EGPRS:TLLI-0xffeeddcf) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-3:STATE-NEW:EGPRS:TLLI-0xffeeddcf) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11) Attaching UL TBF: TBF(UL:TFI-0-0-3:STATE-NEW:EGPRS:TLLI-0xffeeddcf)
-MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-3:STATE-NEW:EGPRS:TLLI-0xffeeddcf) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-3:STATE-NEW:EGPRS:TLLI-0xffeeddcf){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -9552,7 +9546,7 @@ TBF(UL:TFI-0-0-3:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcf) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-3:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcf) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-3:STATE-NEW:EGPRS:TLLI-0xffeeddcf){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-3:STATE-NEW:EGPRS:TLLI-0xffeeddcf){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=65 but previous FN=2654231 is still reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-2:STATE-ASSIGN:EGPRS:TLLI-0xffeeddce)
 TBF(UL:TFI-0-0-2:STATE-ASSIGN:EGPRS:TLLI-0xffeeddce) poll timeout for FN=2654231, TS=7 (curr FN 65)
@@ -9599,8 +9593,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xffeeddd0), 5 TBFs
 TBF(UL:TFI-0-0-4:STATE-NEW:EGPRS:TLLI-0xffeeddd0) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-4:STATE-NEW:EGPRS:TLLI-0xffeeddd0) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11) Attaching UL TBF: TBF(UL:TFI-0-0-4:STATE-NEW:EGPRS:TLLI-0xffeeddd0)
-MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-4:STATE-NEW:EGPRS:TLLI-0xffeeddd0) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-4:STATE-NEW:EGPRS:TLLI-0xffeeddd0){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -9610,7 +9603,7 @@ TBF(UL:TFI-0-0-4:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd0) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-4:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd0) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-4:STATE-NEW:EGPRS:TLLI-0xffeeddd0){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-4:STATE-NEW:EGPRS:TLLI-0xffeeddd0){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=69 but previous FN=2654231 is still reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-3:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcf)
 TBF(UL:TFI-0-0-3:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcf) poll timeout for FN=2654231, TS=7 (curr FN 69)
@@ -9657,8 +9650,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xffeeddd1), 6 TBFs
 TBF(UL:TFI-0-0-5:STATE-NEW:EGPRS:TLLI-0xffeeddd1) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-5:STATE-NEW:EGPRS:TLLI-0xffeeddd1) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11) Attaching UL TBF: TBF(UL:TFI-0-0-5:STATE-NEW:EGPRS:TLLI-0xffeeddd1)
-MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-5:STATE-NEW:EGPRS:TLLI-0xffeeddd1) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-5:STATE-NEW:EGPRS:TLLI-0xffeeddd1){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -9668,7 +9660,7 @@ TBF(UL:TFI-0-0-5:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd1) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-5:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd1) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-5:STATE-NEW:EGPRS:TLLI-0xffeeddd1){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-5:STATE-NEW:EGPRS:TLLI-0xffeeddd1){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=73 but previous FN=2654231 is still reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-4:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd0)
 TBF(UL:TFI-0-0-4:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd0) poll timeout for FN=2654231, TS=7 (curr FN 73)
@@ -9715,8 +9707,7 @@ PDCH(bts=0,trx=0,ts=7) Attaching TBF(UL:STATE-NEW:EGPRS:TLLI-0xffeeddd2), 7 TBFs
 TBF(UL:TFI-0-0-6:STATE-NEW:EGPRS:TLLI-0xffeeddd2) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 TBF(UL:TFI-0-0-6:STATE-NEW:EGPRS:TLLI-0xffeeddd2) Allocated: trx = 0, ul_slots = 80, dl_slots = 00
 MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11) Attaching UL TBF: TBF(UL:TFI-0-0-6:STATE-NEW:EGPRS:TLLI-0xffeeddd2)
-MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 TBF(UL:TFI-0-0-6:STATE-NEW:EGPRS:TLLI-0xffeeddd2) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)
 ws(64)
 UL_TBF(UL:TFI-0-0-6:STATE-NEW:EGPRS:TLLI-0xffeeddd2){NEW}: Received Event ASSIGN_ADD_PACCH
@@ -9726,7 +9717,7 @@ TBF(UL:TFI-0-0-6:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd2) Starting timer X2001 [assig
 TBF(UL:TFI-0-0-6:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd2) Change control TS PDCH(bts=0,trx=0,ts=7) -> PDCH(bts=0,trx=0,ts=7) until assignment is complete.
 UL_ASS_TBF(UL:TFI-0-0-6:STATE-NEW:EGPRS:TLLI-0xffeeddd2){NONE}: Received Event SCHED_ASS
 UL_ASS_TBF(UL:TFI-0-0-6:STATE-NEW:EGPRS:TLLI-0xffeeddd2){NONE}: state_chg to SEND_ASS
-MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=78 but previous FN=2654231 is still reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-5:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd1)
 TBF(UL:TFI-0-0-5:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd1) poll timeout for FN=2654231, TS=7 (curr FN 78)
@@ -9782,15 +9773,14 @@ UL_TBF{NEW}: Allocated
 UL_ACK_TBF{NONE}: Allocated
 TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddd3) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11) Attaching UL TBF: TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddd3)
-MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11): + ms_attach_ul_tbf: now used by 2 (rcv_resource_request,ms_attach_ul_tbf)
-MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11:UL): - ms_attach_ul_tbf: now used by 1 (rcv_resource_request)
+MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11:UL): + tbf: now used by 2 (rcv_resource_request,tbf)
 UL_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddd3){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddd3) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddd3){NEW}: state_chg to ASSIGN
 TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddd3) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 UL_ASS_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddd3){NONE}: Received Event SCHED_ASS_REJ
 UL_ASS_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddd3){NONE}: state_chg to SEND_ASS_REJ
-MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 0 (-)
+MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11:UL): - rcv_resource_request: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=82 but previous FN=2654231 is still reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(UL:TFI-0-0-6:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd2)
 TBF(UL:TFI-0-0-6:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd2) poll timeout for FN=2654231, TS=7 (curr FN 82)
@@ -9809,20 +9799,28 @@ UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc){SEND_ASS}: state_chg to
 PDCH(bts=0,trx=0,ts=7) FN=2654218 Scheduling control message at RTS for TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11:UL) Destroying MS object
 MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddd3)
+MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11:UL) Destroying MS object
 MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-6:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd2)
+MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11:UL) Destroying MS object
 MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-5:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd1)
+MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11:UL) Destroying MS object
 MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-4:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd0)
+MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11:UL) Destroying MS object
 MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-3:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcf)
+MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11:UL) Destroying MS object
 MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-2:STATE-ASSIGN:EGPRS:TLLI-0xffeeddce)
+MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11:UL) Destroying MS object
 MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcd)
+MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11:UL) Destroying MS object
 MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11): - tbf: now used by 0 (-)
 === end test_packet_access_rej_prr ===
 === start test_packet_access_rej_prr_no_other_tbfs ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -9834,8 +9832,7 @@ UL_TBF{NEW}: Allocated
 UL_ACK_TBF{NONE}: Allocated
 TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc) Setting Control TS PDCH(bts=0,trx=0,ts=7)
 MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc)
-MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 UL_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NEW}: Received Event ASSIGN_ADD_PACCH
 TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc) set ass. type PACCH [prev CCCH:0, PACCH:0]
 UL_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NEW}: state_chg to ASSIGN
@@ -9849,6 +9846,7 @@ PDCH(bts=0,trx=0,ts=7) FN=2654218 Scheduling control message at RTS for TBF(UL:T
 UL_ASS_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Timeout of X2000
 TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc) free
 MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0) Destroying MS object
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Deallocated
@@ -9891,8 +9889,7 @@ PDCH(bts=0,trx=1,ts=5) Attaching TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-0010010000
 TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953) Setting Control TS PDCH(bts=0,trx=1,ts=5)
 TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953) Allocated: trx = 1, ul_slots = 20, dl_slots = 20
 MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0) Attaching DL TBF: TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953)
-MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0:DL): + tbf: now used by 1 (tbf)
 TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953) [DOWNLINK] START (PCH)
 TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953) Send downlink assignment on PCH, no TBF exist (IMSI=001001000000001)
 DL_TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953){NEW}: Received Event ASSIGN_ADD_CCCH
@@ -9929,20 +9926,20 @@ PDCH(bts=0,trx=0,ts=2) Attaching TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xecc1f953
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xecc1f953) Setting Control TS PDCH(bts=0,trx=0,ts=2)
 TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xecc1f953) Allocated: trx = 0, ul_slots = 04, dl_slots = 00
 MS(TLLI-0xecc1f953:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0xecc1f953)
-MS(TLLI-0xecc1f953:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
-MS(TLLI-0xecc1f953:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
+MS(TLLI-0xecc1f953:TA-220:MSCLS-0-0:UL): + tbf: now used by 1 (tbf)
 There is a new MS object for the same MS: (0xa3c2f953, '001001000000001') -> (0xecc1f953, '')
-MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0:DL): + ms_merge_and_clear_ms: now used by 1 (ms_merge_and_clear_ms)
+MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0:DL): + ms_merge_and_clear_ms: now used by 2 (tbf,ms_merge_and_clear_ms)
 MS(TLLI-0xecc1f953:TA-220:MSCLS-0-0:UL) Merge MS: MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0:DL)
 Modifying MS object, TLLI = 0xecc1f953, MS class 0 -> 11
+MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0:DL) Clearing MS object
 TBF(DL:TFI-0-1-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953) free
 PDCH(bts=0,trx=1,ts=5) Detaching TBF(DL:TFI-0-1-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953), 1 TBFs, USFs = 00, TFIs = 00000001.
 MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0:DL) Detaching TBF: TBF(DL:TFI-0-1-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953)
+MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0): - tbf: now used by 1 (ms_merge_and_clear_ms)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953){NONE}: Deallocated
 DL_ASS_TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953){NONE}: Deallocated
-MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0) Clearing MS object
 MS(TA-220:MSCLS-11-0): - ms_merge_and_clear_ms: now used by 0 (-)
 MS(TA-220:MSCLS-11-0) Destroying MS object
 Modifying MS object, TLLI: 0xecc1f953 confirmed
@@ -9965,8 +9962,7 @@ PDCH(bts=0,trx=0,ts=3) Attaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0010010000
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953) Setting Control TS PDCH(bts=0,trx=0,ts=2)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953) Allocated: trx = 0, ul_slots = 04, dl_slots = 0e
 MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:UL) Attaching DL TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953)
-MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:UL:DL): + tbf: now used by 2 (2*tbf)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953) [DOWNLINK] START (PACCH)
 TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953) Send downlink assignment on PACCH, because TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953) exists
 DL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953){NONE}: Received Event SCHED_ASS
@@ -9989,4 +9985,6 @@ PDCH(bts=0,trx=0,ts=2) FN=0 Scheduling control message at RTS for TBF(UL:TFI-0-0
 === end test_ms_merge_dl_tbf_different_trx ===
 MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:UL:DL) Destroying MS object
 MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953)
+MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:DL): - tbf: now used by 1 (tbf)
 MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xecc1f953)
+MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0): - tbf: now used by 0 (-)
diff --git a/tests/ulc/PdchUlcTest.err b/tests/ulc/PdchUlcTest.err
index 2995b693..bcc57790 100644
--- a/tests/ulc/PdchUlcTest.err
+++ b/tests/ulc/PdchUlcTest.err
@@ -18,8 +18,7 @@ PDCH(bts=0,trx=0,ts=0) PDCH state: disabled => enabled
 Creating MS object
 The MS object cannot fully confirm an unexpected TLLI: 0x12345678, partly confirmed
 MS(TLLI-0x12345678:TA-220:MSCLS-0-0) Attaching DL TBF: TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678)
-MS(TLLI-0x12345678:TA-220:MSCLS-0-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
-MS(TLLI-0x12345678:TA-220:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
+MS(TLLI-0x12345678:TA-220:MSCLS-0-0:DL): + tbf: now used by 1 (tbf)
 PDCH(bts=0,trx=0,ts=0) Reserving FN 2715608 for type POLL
 PDCH(bts=0,trx=0,ts=0) Reserving FN 2715613 for type POLL
 PDCH(bts=0,trx=0,ts=0) Reserving FN 2715617 for type POLL
@@ -76,6 +75,7 @@ PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=39 is still reserved!
 PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=39, reason=UL_ASS): TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678)
 MS(TLLI-0x12345678:TA-220:MSCLS-0-0:DL) Destroying MS object
 MS(TLLI-0x12345678:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678)
+MS(TLLI-0x12345678:TA-220:MSCLS-0-0): - tbf: now used by 0 (-)
 PDCH(bts=0,trx=0,ts=0) PDCH state: disabled => enabled
 PDCH(bts=0,trx=0,ts=0) Reserving FN 104 for type SBA
 PDCH(bts=0,trx=0,ts=0) Reserving FN 117 for type SBA