From dfdc61de68f9b2942994b4cfe6af4ebb52ffc96e Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Fri, 2 Mar 2018 00:40:58 +0100
Subject: msc_vlr_tests: revert IMSI parameter and test nr output

Three recently merged commits take the msc_vlr_tests in a wrong direction.

The IMSI is usually encoded in the hex streams. The rationale behind hex
streams is that it is a) easily copied from a wireshark trace and b) exactly
the bytes as sent by an actual phone. It is hard to parameterize the IMSI
because we would have to employ our encoding functions, which I intentionally
want to keep out of the loop here.

The test number should not appear in the normal test output, so that adding a
test or changing their order does not affect expected output for following
tests. The nr is simply for manual invocation, only seen when invoked with -v.

Revert
- "VLR tests: always print test parameters"
  b0a4314911140b1599cccfc8171fcdab4cd9bfab.
- "Expand VLR tests"
  d5feadeee8dd24f991df2892d6bcf0be8b0cf707.
- "Move IMSI into test parameters"
  093300d141c300651954473d73138b72de04d931.

Change-Id: Ie1b49237746751021da88f6f07bbb9f780d077c9
---
 tests/msc_vlr/msc_vlr_test_authen_reuse.c         | 36 ++++++------
 tests/msc_vlr/msc_vlr_test_authen_reuse.err       | 24 ++++----
 tests/msc_vlr/msc_vlr_test_authen_reuse.ok        |  1 -
 tests/msc_vlr/msc_vlr_test_call.c                 | 12 ++--
 tests/msc_vlr/msc_vlr_test_call.err               |  8 +--
 tests/msc_vlr/msc_vlr_test_call.ok                |  1 -
 tests/msc_vlr/msc_vlr_test_gsm_authen.c           | 34 ++++++-----
 tests/msc_vlr/msc_vlr_test_gsm_authen.err         | 20 +++----
 tests/msc_vlr/msc_vlr_test_gsm_authen.ok          |  1 -
 tests/msc_vlr/msc_vlr_test_gsm_ciph.c             | 41 ++++++++------
 tests/msc_vlr/msc_vlr_test_gsm_ciph.err           | 20 +++----
 tests/msc_vlr/msc_vlr_test_gsm_ciph.ok            |  1 -
 tests/msc_vlr/msc_vlr_test_hlr_reject.c           | 51 +++++++++--------
 tests/msc_vlr/msc_vlr_test_hlr_reject.err         | 32 +++++------
 tests/msc_vlr/msc_vlr_test_hlr_reject.ok          |  1 -
 tests/msc_vlr/msc_vlr_test_hlr_timeout.c          | 12 ++--
 tests/msc_vlr/msc_vlr_test_hlr_timeout.err        |  8 +--
 tests/msc_vlr/msc_vlr_test_hlr_timeout.ok         |  1 -
 tests/msc_vlr/msc_vlr_test_ms_timeout.c           | 19 ++++---
 tests/msc_vlr/msc_vlr_test_ms_timeout.err         | 12 ++--
 tests/msc_vlr/msc_vlr_test_ms_timeout.ok          |  1 -
 tests/msc_vlr/msc_vlr_test_no_authen.c            | 56 ++++++++++--------
 tests/msc_vlr/msc_vlr_test_no_authen.err          | 32 +++++------
 tests/msc_vlr/msc_vlr_test_no_authen.ok           |  1 -
 tests/msc_vlr/msc_vlr_test_reject_concurrency.c   | 69 ++++++++++++-----------
 tests/msc_vlr/msc_vlr_test_reject_concurrency.err | 40 ++++++-------
 tests/msc_vlr/msc_vlr_test_reject_concurrency.ok  |  1 -
 tests/msc_vlr/msc_vlr_test_rest.c                 | 24 ++++----
 tests/msc_vlr/msc_vlr_test_rest.err               | 16 +++---
 tests/msc_vlr/msc_vlr_test_rest.ok                |  1 -
 tests/msc_vlr/msc_vlr_test_umts_authen.c          | 24 ++++----
 tests/msc_vlr/msc_vlr_test_umts_authen.err        | 16 +++---
 tests/msc_vlr/msc_vlr_test_umts_authen.ok         |  1 -
 tests/msc_vlr/msc_vlr_tests.c                     | 23 ++++----
 tests/msc_vlr/msc_vlr_tests.h                     |  6 +-
 35 files changed, 330 insertions(+), 316 deletions(-)

diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
index 039c3998f..103c90489 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
@@ -284,46 +284,46 @@ void _test_auth_reuse(enum ran_type via_ran,
 	clear_vlr();
 }
 
-void test_auth_use_twice_geran(uint8_t nr, const char *imsi)
+void test_auth_use_twice_geran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_auth_reuse(RAN_GERAN_A, 1, 1, true);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_auth_use_twice_utran(uint8_t nr, const char *imsi)
+void test_auth_use_twice_utran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_auth_reuse(RAN_UTRAN_IU, 1, 1, true);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_auth_use_infinitely_geran(uint8_t nr, const char *imsi)
+void test_auth_use_infinitely_geran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_auth_reuse(RAN_GERAN_A, -1, 3, false);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_auth_use_infinitely_utran(uint8_t nr, const char *imsi)
+void test_auth_use_infinitely_utran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_auth_reuse(RAN_UTRAN_IU, -1, 3, false);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_auth_reuse_geran(uint8_t nr, const char *imsi)
+void test_no_auth_reuse_geran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_auth_reuse(RAN_GERAN_A, 0, 0, true);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_auth_reuse_utran(uint8_t nr, const char *imsi)
+void test_no_auth_reuse_utran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_auth_reuse(RAN_UTRAN_IU, 0, 0, true);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
index c676f51cf..2899daa0b 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
@@ -1,4 +1,4 @@
-===== [1] test_auth_use_twice_geran(901700000004620)...
+===== test_auth_use_twice_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -421,12 +421,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [1] test_auth_use_twice_geran(901700000004620): SUCCESS
+===== test_auth_use_twice_geran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_auth_use_twice_utran(901700000004620)...
+===== test_auth_use_twice_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -875,12 +875,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   iu_release_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [2] test_auth_use_twice_utran(901700000004620): SUCCESS
+===== test_auth_use_twice_utran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_auth_use_infinitely_geran(901700000004620)...
+===== test_auth_use_infinitely_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1396,12 +1396,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [3] test_auth_use_infinitely_geran(901700000004620): SUCCESS
+===== test_auth_use_infinitely_geran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [4] test_auth_use_infinitely_utran(901700000004620)...
+===== test_auth_use_infinitely_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1951,12 +1951,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   iu_release_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [4] test_auth_use_infinitely_utran(901700000004620): SUCCESS
+===== test_auth_use_infinitely_utran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [5] test_no_auth_reuse_geran(901700000004620)...
+===== test_no_auth_reuse_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -2272,12 +2272,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [5] test_no_auth_reuse_geran(901700000004620): SUCCESS
+===== test_no_auth_reuse_geran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [6] test_no_auth_reuse_utran(901700000004620)...
+===== test_no_auth_reuse_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -2611,7 +2611,7 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   iu_release_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [6] test_no_auth_reuse_utran(901700000004620): SUCCESS
+===== test_no_auth_reuse_utran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.ok b/tests/msc_vlr/msc_vlr_test_authen_reuse.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.ok
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c
index dea1d9641..cc120c8c4 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -151,13 +151,13 @@ static void standard_lu()
 	vlr_subscr_put(vsub);
 }
 
-void test_call_mo(uint8_t nr, const char *imsi)
+void test_call_mo()
 {
 	struct gsm_mncc mncc = {
 		.imsi = IMSI,
 	};
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	fake_time_start();
 
@@ -248,17 +248,17 @@ void test_call_mo(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_call_mt(uint8_t nr, const char *imsi)
+void test_call_mt()
 {
 	struct gsm_mncc mncc = {
 		.imsi = IMSI,
 		.callref = 0x423,
 	};
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	fake_time_start();
 
@@ -331,7 +331,7 @@ void test_call_mt(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err
index 7e3896bbb..5cfa794f9 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -1,4 +1,4 @@
-===== [1] test_call_mo(901700000004620)...
+===== test_call_mo
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
@@ -342,12 +342,12 @@ DRLL subscr MSISDN:42342: Freeing subscriber connection
 DREF VLR subscr MSISDN:42342 usage decreases to: 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:42342
-===== [1] test_call_mo(901700000004620): SUCCESS
+===== test_call_mo: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_call_mt(901700000004620)...
+===== test_call_mt
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
@@ -696,7 +696,7 @@ DRLL subscr MSISDN:42342: Freeing subscriber connection
 DREF VLR subscr MSISDN:42342 usage decreases to: 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:42342
-===== [2] test_call_mt(901700000004620): SUCCESS
+===== test_call_mt: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_call.ok b/tests/msc_vlr/msc_vlr_test_call.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_call.ok
+++ b/tests/msc_vlr/msc_vlr_test_call.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index e9eacf0b4..70b7614d0 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -23,11 +23,12 @@
 
 #include "msc_vlr_tests.h"
 
-void test_gsm_authen(uint8_t nr, const char *imsi)
+void test_gsm_authen()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 
@@ -209,14 +210,15 @@ void test_gsm_authen(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_gsm_authen_tmsi(uint8_t nr, const char *imsi)
+void test_gsm_authen_tmsi()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 	net->vlr->cfg.assign_tmsi = true;
@@ -485,14 +487,15 @@ void test_gsm_authen_tmsi(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_gsm_authen_imei(uint8_t nr, const char *imsi)
+void test_gsm_authen_imei()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 	net->vlr->cfg.check_imei_rqd = true;
@@ -580,14 +583,15 @@ void test_gsm_authen_imei(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_gsm_authen_tmsi_imei(uint8_t nr, const char *imsi)
+void test_gsm_authen_tmsi_imei()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 	net->vlr->cfg.assign_tmsi = true;
@@ -695,15 +699,15 @@ void test_gsm_authen_tmsi_imei(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_gsm_milenage_authen(uint8_t nr, const char *ignored)
+void test_gsm_milenage_authen()
 {
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000010650";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 	rx_from_ran = RAN_GERAN_A;
@@ -907,7 +911,7 @@ void test_gsm_milenage_authen(uint8_t nr, const char *ignored)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index 5c1759321..a46a8380b 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -1,4 +1,4 @@
-===== [1] test_gsm_authen(901700000004620)...
+===== test_gsm_authen
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -441,12 +441,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [1] test_gsm_authen(901700000004620): SUCCESS
+===== test_gsm_authen: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_gsm_authen_tmsi(901700000004620)...
+===== test_gsm_authen_tmsi
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1093,12 +1093,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [2] test_gsm_authen_tmsi(901700000004620): SUCCESS
+===== test_gsm_authen_tmsi: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_gsm_authen_imei(901700000004620)...
+===== test_gsm_authen_imei
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1313,12 +1313,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [3] test_gsm_authen_imei(901700000004620): SUCCESS
+===== test_gsm_authen_imei: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [4] test_gsm_authen_tmsi_imei(901700000004620)...
+===== test_gsm_authen_tmsi_imei
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1564,12 +1564,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [4] test_gsm_authen_tmsi_imei(901700000004620): SUCCESS
+===== test_gsm_authen_tmsi_imei: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [5] test_gsm_milenage_authen(901700000010650)...
+===== test_gsm_milenage_authen
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1993,7 +1993,7 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [5] test_gsm_milenage_authen(901700000010650): SUCCESS
+===== test_gsm_milenage_authen: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.ok b/tests/msc_vlr/msc_vlr_test_gsm_authen.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.ok
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index 541bac1a3..42e620a7b 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -23,11 +23,12 @@
 
 #include "msc_vlr_tests.h"
 
-void test_ciph(uint8_t nr, const char *imsi)
+void test_ciph()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	/* implicit: net->authentication_required = true; */
 	net->a5_encryption_mask = (1 << 1);
@@ -231,14 +232,15 @@ void test_ciph(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_ciph_tmsi(uint8_t nr, const char *imsi)
+void test_ciph_tmsi()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	/* implicit: net->authentication_required = true; */
 	net->a5_encryption_mask = (1 << 1);
@@ -469,14 +471,15 @@ void test_ciph_tmsi(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_ciph_imei(uint8_t nr, const char *imsi)
+void test_ciph_imei()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	/* implicit: net->authentication_required = true; */
 	net->a5_encryption_mask = (1 << 1);
@@ -570,14 +573,15 @@ void test_ciph_imei(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_ciph_imeisv(uint8_t nr, const char *imsi)
+void test_ciph_imeisv()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	/* implicit: net->authentication_required = true; */
 	net->a5_encryption_mask = (1 << 1);
@@ -667,14 +671,15 @@ void test_ciph_imeisv(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_ciph_tmsi_imei(uint8_t nr, const char *imsi)
+void test_ciph_tmsi_imei()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	/* implicit: net->authentication_required = true; */
 	net->a5_encryption_mask = (1 << 1);
@@ -786,12 +791,12 @@ void test_ciph_tmsi_imei(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_lu_unknown_tmsi(uint8_t nr, const char *imsi)
+void test_lu_unknown_tmsi()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("Location Update request with unknown TMSI sends ID Request for IMSI");
 	lu_result_sent = RES_NONE;
@@ -827,7 +832,7 @@ void test_lu_unknown_tmsi(uint8_t nr, const char *imsi)
 	VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d");
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 62848668a..821f77985 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -1,4 +1,4 @@
-===== [1] test_ciph(901700000004620)...
+===== test_ciph
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -478,12 +478,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [1] test_ciph(901700000004620): SUCCESS
+===== test_ciph: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_ciph_tmsi(901700000004620)...
+===== test_ciph_tmsi
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1000,12 +1000,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [2] test_ciph_tmsi(901700000004620): SUCCESS
+===== test_ciph_tmsi: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_ciph_imei(901700000004620)...
+===== test_ciph_imei
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1221,12 +1221,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [3] test_ciph_imei(901700000004620): SUCCESS
+===== test_ciph_imei: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [4] test_ciph_imeisv(901700000004620)...
+===== test_ciph_imeisv
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1431,12 +1431,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [4] test_ciph_imeisv(901700000004620): SUCCESS
+===== test_ciph_imeisv: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [5] test_ciph_tmsi_imei(901700000004620)...
+===== test_ciph_tmsi_imei
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1683,7 +1683,7 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [5] test_ciph_tmsi_imei(901700000004620): SUCCESS
+===== test_ciph_tmsi_imei: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.ok b/tests/msc_vlr/msc_vlr_test_gsm_ciph.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.ok
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
index 2d9b863a6..6cf4afc42 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
@@ -23,9 +23,9 @@
 
 #include "msc_vlr_tests.h"
 
-void test_hlr_rej_auth_info_unknown_imsi(uint8_t nr, const char *imsi)
+void test_hlr_rej_auth_info_unknown_imsi()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 
@@ -46,12 +46,12 @@ void test_hlr_rej_auth_info_unknown_imsi(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_hlr_rej_auth_info_net_fail(uint8_t nr, const char *imsi)
+void test_hlr_rej_auth_info_net_fail()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 
@@ -72,14 +72,15 @@ void test_hlr_rej_auth_info_net_fail(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(uint8_t nr, const char *imsi)
+void test_hlr_rej_auth_info_net_fail_no_reuse_tuples()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = false;
@@ -158,14 +159,15 @@ void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(uint8_t nr, const char *ims
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(uint8_t nr, const char *imsi)
+void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = true;
@@ -245,12 +247,12 @@ void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(uint8_t nr, const char *
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_hlr_acc_but_no_auth_tuples(uint8_t nr, const char *imsi)
+void test_hlr_acc_but_no_auth_tuples()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = true;
@@ -277,14 +279,15 @@ void test_hlr_acc_but_no_auth_tuples(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_hlr_rej_auth_info_net_fail_reuse_tuples(uint8_t nr, const char *imsi)
+void test_hlr_rej_auth_info_net_fail_reuse_tuples()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = true;
@@ -379,12 +382,12 @@ void test_hlr_rej_auth_info_net_fail_reuse_tuples(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_hlr_rej_lu(uint8_t nr, const char *imsi)
+void test_hlr_rej_lu()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
@@ -402,12 +405,12 @@ void test_hlr_rej_lu(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_hlr_no_insert_data(uint8_t nr, const char *imsi)
+void test_hlr_no_insert_data()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
@@ -428,7 +431,7 @@ void test_hlr_no_insert_data(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
index a89e52d77..b9b118e85 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
@@ -1,4 +1,4 @@
-===== [1] test_hlr_rej_auth_info_unknown_imsi(901700000004620)...
+===== test_hlr_rej_auth_info_unknown_imsi
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -69,12 +69,12 @@ DREF freeing VLR subscr IMSI:901700000004620
   lu_result_sent == 2
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [1] test_hlr_rej_auth_info_unknown_imsi(901700000004620): SUCCESS
+===== test_hlr_rej_auth_info_unknown_imsi: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_hlr_rej_auth_info_net_fail(901700000004620)...
+===== test_hlr_rej_auth_info_net_fail
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -145,12 +145,12 @@ DREF freeing VLR subscr IMSI:901700000004620
   lu_result_sent == 2
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [2] test_hlr_rej_auth_info_net_fail(901700000004620): SUCCESS
+===== test_hlr_rej_auth_info_net_fail: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_hlr_rej_auth_info_net_fail_reuse_tuples(901700000004620)...
+===== test_hlr_rej_auth_info_net_fail_reuse_tuples
 ---
 - Submit a used auth tuple in the VLR
 - Location Update request causes a GSUP Send Auth Info request to HLR
@@ -448,12 +448,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   lu_result_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [3] test_hlr_rej_auth_info_net_fail_reuse_tuples(901700000004620): SUCCESS
+===== test_hlr_rej_auth_info_net_fail_reuse_tuples: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [4] test_hlr_rej_auth_info_net_fail_no_reuse_tuples(901700000004620)...
+===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples
 ---
 - Submit a used auth tuple in the VLR
 - Location Update request causes a GSUP Send Auth Info request to HLR
@@ -676,12 +676,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [4] test_hlr_rej_auth_info_net_fail_no_reuse_tuples(901700000004620): SUCCESS
+===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [5] test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(901700000004620)...
+===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples
 ---
 - Submit a used auth tuple in the VLR
 - Location Update request causes a GSUP Send Auth Info request to HLR
@@ -905,12 +905,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [5] test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(901700000004620): SUCCESS
+===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [6] test_hlr_acc_but_no_auth_tuples(901700000004620)...
+===== test_hlr_acc_but_no_auth_tuples
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -980,12 +980,12 @@ DREF freeing VLR subscr IMSI:901700000004620
   lu_result_sent == 2
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [6] test_hlr_acc_but_no_auth_tuples(901700000004620): SUCCESS
+===== test_hlr_acc_but_no_auth_tuples: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [7] test_hlr_rej_lu(901700000004620)...
+===== test_hlr_rej_lu
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1058,12 +1058,12 @@ DREF freeing VLR subscr IMSI:901700000004620
   lu_result_sent == 2
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [7] test_hlr_rej_lu(901700000004620): SUCCESS
+===== test_hlr_rej_lu: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [8] test_hlr_no_insert_data(901700000004620)...
+===== test_hlr_no_insert_data
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1159,7 +1159,7 @@ DREF VLR subscr IMSI:901700000004620 usage decreases to: 1
   lu_result_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr IMSI:901700000004620
-===== [8] test_hlr_no_insert_data(901700000004620): SUCCESS
+===== test_hlr_no_insert_data: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.ok b/tests/msc_vlr/msc_vlr_test_hlr_reject.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.ok
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
index 4dc453b59..c2f17c85f 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c
@@ -25,9 +25,9 @@
 
 #include <osmocom/core/logging.h>
 
-void test_hlr_timeout_lu_auth_info(uint8_t nr, const char *imsi)
+void test_hlr_timeout_lu_auth_info()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	fake_time_start();
 
@@ -61,12 +61,12 @@ void test_hlr_timeout_lu_auth_info(uint8_t nr, const char *imsi)
 	VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d");
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_hlr_timeout_lu_upd_loc_result(uint8_t nr, const char *imsi)
+void test_hlr_timeout_lu_upd_loc_result()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	fake_time_start();
 
@@ -108,7 +108,7 @@ void test_hlr_timeout_lu_upd_loc_result(uint8_t nr, const char *imsi)
 	VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d");
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
index 94cf2e63d..193dcf6d4 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
@@ -1,4 +1,4 @@
-===== [1] test_hlr_timeout_lu_auth_info(901700000004620)...
+===== test_hlr_timeout_lu_auth_info
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
@@ -77,12 +77,12 @@ DREF freeing VLR subscr IMSI:901700000004620
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
   lu_result_sent == 2
-===== [1] test_hlr_timeout_lu_auth_info(901700000004620): SUCCESS
+===== test_hlr_timeout_lu_auth_info: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_hlr_timeout_lu_upd_loc_result(901700000004620)...
+===== test_hlr_timeout_lu_upd_loc_result
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
@@ -180,7 +180,7 @@ DREF freeing VLR subscr MSISDN:46071
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
   lu_result_sent == 2
-===== [2] test_hlr_timeout_lu_upd_loc_result(901700000004620): SUCCESS
+===== test_hlr_timeout_lu_upd_loc_result: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.ok b/tests/msc_vlr/msc_vlr_test_hlr_timeout.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.ok
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
index 569bbf547..4cfd03513 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
@@ -23,9 +23,9 @@
 
 #include "msc_vlr_tests.h"
 
-void test_ms_timeout_lu_auth_resp(uint8_t nr, const char *imsi)
+void test_ms_timeout_lu_auth_resp()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 
@@ -80,12 +80,12 @@ void test_ms_timeout_lu_auth_resp(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 	VERBOSE_ASSERT(lu_result_sent, == RES_REJECT, "%d");
 
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_ms_timeout_cm_auth_resp(uint8_t nr, const char *imsi)
+void test_ms_timeout_cm_auth_resp()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->authentication_required = true;
 
@@ -179,16 +179,17 @@ void test_ms_timeout_cm_auth_resp(uint8_t nr, const char *imsi)
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_REJECT, "%d");
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_ms_timeout_paging(uint8_t nr, const char *imsi)
+void test_ms_timeout_paging()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	fake_time_start();
 
@@ -283,7 +284,7 @@ void test_ms_timeout_paging(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
index 5a54c726a..a0f66c034 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
@@ -1,4 +1,4 @@
-===== [1] test_ms_timeout_lu_auth_resp(901700000004620)...
+===== test_ms_timeout_lu_auth_resp
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
@@ -97,12 +97,12 @@ DREF freeing VLR subscr IMSI:901700000004620
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
   lu_result_sent == 2
-===== [1] test_ms_timeout_lu_auth_resp(901700000004620): SUCCESS
+===== test_ms_timeout_lu_auth_resp: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_ms_timeout_cm_auth_resp(901700000004620)...
+===== test_ms_timeout_cm_auth_resp
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
@@ -333,12 +333,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   llist_count(&net->subscr_conns) == 0
   cm_service_result_sent == 2
 DREF freeing VLR subscr MSISDN:46071
-===== [2] test_ms_timeout_cm_auth_resp(901700000004620): SUCCESS
+===== test_ms_timeout_cm_auth_resp: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_ms_timeout_paging(901700000004620)...
+===== test_ms_timeout_paging
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
@@ -516,7 +516,7 @@ DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   paging_stopped == 1
   llist_count(&net->subscr_conns) == 0
-===== [3] test_ms_timeout_paging(901700000004620): SUCCESS
+===== test_ms_timeout_paging: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.ok b/tests/msc_vlr/msc_vlr_test_ms_timeout.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.ok
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c
index b7448276f..32e0b40e2 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c
@@ -23,14 +23,15 @@
 
 #include "msc_vlr_tests.h"
 
-void test_no_authen(uint8_t nr, const char *imsi)
+void test_no_authen()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 	
 	/* No auth only works on GERAN */
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
@@ -158,16 +159,17 @@ void test_no_authen(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_authen_tmsi(uint8_t nr, const char *imsi)
+void test_no_authen_tmsi()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->vlr->cfg.assign_tmsi = true;
 
@@ -377,16 +379,17 @@ void test_no_authen_tmsi(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_authen_imei(uint8_t nr, const char *imsi)
+void test_no_authen_imei()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->vlr->cfg.check_imei_rqd = true;
 
@@ -444,16 +447,17 @@ void test_no_authen_imei(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_authen_tmsi_imei(uint8_t nr, const char *imsi)
+void test_no_authen_tmsi_imei()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->vlr->cfg.assign_tmsi = true;
 	net->vlr->cfg.check_imei_rqd = true;
@@ -520,17 +524,18 @@ void test_no_authen_tmsi_imei(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_authen_imeisv(uint8_t nr, const char *imsi)
+void test_no_authen_imeisv()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 	
 	/* No auth only works on GERAN */
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->vlr->cfg.retrieve_imeisv_early = true;
 
@@ -580,16 +585,17 @@ void test_no_authen_imeisv(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_authen_imeisv_imei(uint8_t nr, const char *imsi)
+void test_no_authen_imeisv_imei()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->vlr->cfg.retrieve_imeisv_early = true;
 	net->vlr->cfg.check_imei_rqd = true;
@@ -657,16 +663,17 @@ void test_no_authen_imeisv_imei(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_authen_imeisv_tmsi(uint8_t nr, const char *imsi)
+void test_no_authen_imeisv_tmsi()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->vlr->cfg.retrieve_imeisv_early = true;
 	net->vlr->cfg.assign_tmsi = true;
@@ -794,16 +801,17 @@ void test_no_authen_imeisv_tmsi(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_no_authen_imeisv_tmsi_imei(uint8_t nr, const char *imsi)
+void test_no_authen_imeisv_tmsi_imei()
 {
 	struct vlr_subscr *vsub;
+	const char *imsi = "901700000004620";
 
 	rx_from_ran = RAN_GERAN_A;
 
-	comment_start(nr, imsi);
+	comment_start();
 
 	net->vlr->cfg.retrieve_imeisv_early = true;
 	net->vlr->cfg.assign_tmsi = true;
@@ -883,7 +891,7 @@ void test_no_authen_imeisv_tmsi_imei(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err
index d68fc240d..4162ce0ff 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err
@@ -1,4 +1,4 @@
-===== [1] test_no_authen(901700000004620)...
+===== test_no_authen
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -317,12 +317,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [1] test_no_authen(901700000004620): SUCCESS
+===== test_no_authen: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_no_authen_tmsi(901700000004620)...
+===== test_no_authen_tmsi
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -828,12 +828,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [2] test_no_authen_tmsi(901700000004620): SUCCESS
+===== test_no_authen_tmsi: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_no_authen_imei(901700000004620)...
+===== test_no_authen_imei
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1001,12 +1001,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [3] test_no_authen_imei(901700000004620): SUCCESS
+===== test_no_authen_imei: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [4] test_no_authen_tmsi_imei(901700000004620)...
+===== test_no_authen_tmsi_imei
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1199,12 +1199,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [4] test_no_authen_tmsi_imei(901700000004620): SUCCESS
+===== test_no_authen_tmsi_imei: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [5] test_no_authen_imeisv(901700000004620)...
+===== test_no_authen_imeisv
 - Location Update request causes an IMEISV ID request back to the MS
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1357,12 +1357,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [5] test_no_authen_imeisv(901700000004620): SUCCESS
+===== test_no_authen_imeisv: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [6] test_no_authen_imeisv_imei(901700000004620)...
+===== test_no_authen_imeisv_imei
 - Location Update request causes an IMEISV ID request back to the MS
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1547,12 +1547,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [6] test_no_authen_imeisv_imei(901700000004620): SUCCESS
+===== test_no_authen_imeisv_imei: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [7] test_no_authen_imeisv_tmsi(901700000004620)...
+===== test_no_authen_imeisv_tmsi
 - Location Update request causes an IMEISV ID request back to the MS
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1903,12 +1903,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [7] test_no_authen_imeisv_tmsi(901700000004620): SUCCESS
+===== test_no_authen_imeisv_tmsi: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [8] test_no_authen_imeisv_tmsi_imei(901700000004620)...
+===== test_no_authen_imeisv_tmsi_imei
 - Location Update request causes an IMEISV ID request back to the MS
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -2119,7 +2119,7 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [8] test_no_authen_imeisv_tmsi_imei(901700000004620): SUCCESS
+===== test_no_authen_imeisv_tmsi_imei: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.ok b/tests/msc_vlr/msc_vlr_test_no_authen.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.ok
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
index c7af200ed..2377c19b3 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
@@ -23,10 +23,10 @@
 
 #include "msc_vlr_tests.h"
 
-void test_reject_2nd_conn(uint8_t nr, const char *imsi)
+void test_reject_2nd_conn()
 {
 	struct gsm_subscriber_connection *conn1;
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("Location Update Request on one connection");
 	lu_result_sent = RES_NONE;
@@ -64,7 +64,7 @@ void test_reject_2nd_conn(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 void _normal_lu_part1()
@@ -115,8 +115,9 @@ void _normal_cm_service_req()
 	EXPECT_ACCEPTED(true);
 }
 
-void _page(const char *imsi)
+void _page()
 {
+	const char *imsi = "901700000004620";
 	struct vlr_subscr *vsub;
 
 	BTW("an SMS is sent, MS is paged");
@@ -188,9 +189,9 @@ void _paging_resp_part2(int expect_conn_count, bool expect_clear)
 	EXPECT_CONN_COUNT(expect_conn_count);
 }
 
-void test_reject_lu_during_lu(uint8_t nr, const char *imsi)
+void test_reject_lu_during_lu()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu_part1();
 
@@ -203,12 +204,12 @@ void test_reject_lu_during_lu(uint8_t nr, const char *imsi)
 	_normal_lu_part2();
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_reject_cm_during_lu(uint8_t nr, const char *imsi)
+void test_reject_cm_during_lu()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu_part1();
 
@@ -224,12 +225,12 @@ void test_reject_cm_during_lu(uint8_t nr, const char *imsi)
 	_normal_lu_part2();
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_reject_paging_resp_during_lu(uint8_t nr, const char *imsi)
+void test_reject_paging_resp_during_lu()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu_part1();
 
@@ -242,12 +243,12 @@ void test_reject_paging_resp_during_lu(uint8_t nr, const char *imsi)
 	_normal_lu_part2();
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_reject_lu_during_cm(uint8_t nr, const char *imsi)
+void test_reject_lu_during_cm()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu();
 	_normal_cm_service_req();
@@ -266,12 +267,12 @@ void test_reject_lu_during_cm(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_reject_cm_during_cm(uint8_t nr, const char *imsi)
+void test_reject_cm_during_cm()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu();
 	_normal_cm_service_req();
@@ -289,12 +290,12 @@ void test_reject_cm_during_cm(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_reject_paging_resp_during_cm(uint8_t nr, const char *imsi)
+void test_reject_paging_resp_during_cm()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu();
 	_normal_cm_service_req();
@@ -314,15 +315,15 @@ void test_reject_paging_resp_during_cm(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_reject_paging_resp_during_paging_resp(uint8_t nr, const char *imsi)
+void test_reject_paging_resp_during_paging_resp()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu();
-	_page(imsi);
+	_page();
 	_paging_resp_part1();
 
 	BTW("MS sends another erratic Paging Response which is dropped silently");
@@ -331,15 +332,15 @@ void test_reject_paging_resp_during_paging_resp(uint8_t nr, const char *imsi)
 	_paging_resp_part2(0, true);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_reject_lu_during_paging_resp(uint8_t nr, const char *imsi)
+void test_reject_lu_during_paging_resp()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu();
-	_page(imsi);
+	_page();
 	_paging_resp_part1();
 
 	BTW("MS sends erratic LU Request, which is dropped silently");
@@ -351,15 +352,15 @@ void test_reject_lu_during_paging_resp(uint8_t nr, const char *imsi)
 	_paging_resp_part2(0, true);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_accept_cm_during_paging_resp(uint8_t nr, const char *imsi)
+void test_accept_cm_during_paging_resp()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	_normal_lu();
-	_page(imsi);
+	_page();
 	_paging_resp_part1();
 
 	BTW("CM Service Request during open connection is accepted");
@@ -378,7 +379,7 @@ void test_accept_cm_during_paging_resp(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
index 6a7a83cca..66f40ce1e 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
@@ -1,4 +1,4 @@
-===== [1] test_reject_2nd_conn(901700000004620)...
+===== test_reject_2nd_conn
 - Location Update Request on one connection
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -149,12 +149,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   lu_result_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [1] test_reject_2nd_conn(901700000004620): SUCCESS
+===== test_reject_2nd_conn: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_reject_lu_during_lu(901700000004620)...
+===== test_reject_lu_during_lu
 - Location Update Request
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -274,12 +274,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   lu_result_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [2] test_reject_lu_during_lu(901700000004620): SUCCESS
+===== test_reject_lu_during_lu: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_reject_cm_during_lu(901700000004620)...
+===== test_reject_cm_during_lu
 - Location Update Request
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -405,12 +405,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   lu_result_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [3] test_reject_cm_during_lu(901700000004620): SUCCESS
+===== test_reject_cm_during_lu: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [4] test_reject_paging_resp_during_lu(901700000004620)...
+===== test_reject_paging_resp_during_lu
 - Location Update Request
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -531,12 +531,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   lu_result_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [4] test_reject_paging_resp_during_lu(901700000004620): SUCCESS
+===== test_reject_paging_resp_during_lu: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [5] test_reject_lu_during_cm(901700000004620)...
+===== test_reject_lu_during_cm
 ---
 - Subscriber does a normal LU
 - Location Update Request
@@ -724,12 +724,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 0
 DREF freeing VLR subscr MSISDN:46071
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [5] test_reject_lu_during_cm(901700000004620): SUCCESS
+===== test_reject_lu_during_cm: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [6] test_reject_cm_during_cm(901700000004620)...
+===== test_reject_cm_during_cm
 ---
 - Subscriber does a normal LU
 - Location Update Request
@@ -919,12 +919,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 0
 DREF freeing VLR subscr MSISDN:46071
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [6] test_reject_cm_during_cm(901700000004620): SUCCESS
+===== test_reject_cm_during_cm: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [7] test_reject_paging_resp_during_cm(901700000004620)...
+===== test_reject_paging_resp_during_cm
 ---
 - Subscriber does a normal LU
 - Location Update Request
@@ -1120,12 +1120,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
 - all requests serviced, conn has been released
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [7] test_reject_paging_resp_during_cm(901700000004620): SUCCESS
+===== test_reject_paging_resp_during_cm: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [8] test_reject_lu_during_paging_resp(901700000004620)...
+===== test_reject_lu_during_paging_resp
 ---
 - Subscriber does a normal LU
 - Location Update Request
@@ -1347,12 +1347,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
 - SMS is done
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [8] test_reject_lu_during_paging_resp(901700000004620): SUCCESS
+===== test_reject_lu_during_paging_resp: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [9] test_accept_cm_during_paging_resp(901700000004620)...
+===== test_accept_cm_during_paging_resp
 ---
 - Subscriber does a normal LU
 - Location Update Request
@@ -1591,12 +1591,12 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 0
 DREF freeing VLR subscr MSISDN:46071
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [9] test_accept_cm_during_paging_resp(901700000004620): SUCCESS
+===== test_accept_cm_during_paging_resp: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [10] test_reject_paging_resp_during_paging_resp(901700000004620)...
+===== test_reject_paging_resp_during_paging_resp
 ---
 - Subscriber does a normal LU
 - Location Update Request
@@ -1817,7 +1817,7 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
 - SMS is done
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [10] test_reject_paging_resp_during_paging_resp(901700000004620): SUCCESS
+===== test_reject_paging_resp_during_paging_resp: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.ok b/tests/msc_vlr/msc_vlr_test_reject_concurrency.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.ok
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c
index cb5e24f42..c19c4c61a 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.c
+++ b/tests/msc_vlr/msc_vlr_test_rest.c
@@ -23,9 +23,9 @@
 
 #include "msc_vlr_tests.h"
 
-void test_early_stage(uint8_t nr, const char *imsi)
+void test_early_stage()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("NULL conn");
 	EXPECT_ACCEPTED(false);
@@ -59,12 +59,12 @@ void test_early_stage(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_cm_service_without_lu(uint8_t nr, const char *imsi)
+void test_cm_service_without_lu()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("CM Service Request without a prior Location Updating");
 	expect_bssap_clear();
@@ -75,12 +75,12 @@ void test_cm_service_without_lu(uint8_t nr, const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_two_lu(uint8_t nr, const char *imsi)
+void test_two_lu()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
@@ -147,12 +147,12 @@ void test_two_lu(uint8_t nr, const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_lu_unknown_tmsi(uint8_t nr, const char *imsi)
+void test_lu_unknown_tmsi()
 {
-	comment_start(nr, imsi);
+	comment_start();
 
 	btw("Location Update request with unknown TMSI sends ID Request for IMSI");
 	lu_result_sent = RES_NONE;
@@ -188,7 +188,7 @@ void test_lu_unknown_tmsi(uint8_t nr, const char *imsi)
 	VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d");
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err
index fbfb3d7ef..1b7d2fdfd 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.err
+++ b/tests/msc_vlr/msc_vlr_test_rest.err
@@ -1,4 +1,4 @@
-===== [1] test_early_stage(901700000004620)...
+===== test_early_stage
 - NULL conn
 msc_subscr_conn_is_accepted() == false
 - freshly allocated conn
@@ -37,12 +37,12 @@ DMM Subscr_Conn(test){SUBSCR_CONN_S_RELEASED}: Freeing instance
 DMM Subscr_Conn(test){SUBSCR_CONN_S_RELEASED}: Deallocated
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [1] test_early_stage(901700000004620): SUCCESS
+===== test_early_stage: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_cm_service_without_lu(901700000004620)...
+===== test_cm_service_without_lu
 - CM Service Request without a prior Location Updating
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
@@ -80,12 +80,12 @@ DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
 - conn was released
   llist_count(&net->subscr_conns) == 0
-===== [2] test_cm_service_without_lu(901700000004620): SUCCESS
+===== test_cm_service_without_lu: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_two_lu(901700000004620)...
+===== test_two_lu
 - Location Update request causes a GSUP LU request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -337,12 +337,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [3] test_two_lu(901700000004620): SUCCESS
+===== test_two_lu: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [4] test_lu_unknown_tmsi(901700000004620)...
+===== test_lu_unknown_tmsi
 - Location Update request with unknown TMSI sends ID Request for IMSI
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -486,7 +486,7 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   lu_result_sent == 1
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:46071
-===== [4] test_lu_unknown_tmsi(901700000004620): SUCCESS
+===== test_lu_unknown_tmsi: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_rest.ok b/tests/msc_vlr/msc_vlr_test_rest.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.ok
+++ b/tests/msc_vlr/msc_vlr_test_rest.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c
index 9c026829b..1175bf875 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c
@@ -322,18 +322,18 @@ void _test_umts_authen(enum ran_type via_ran)
 	clear_vlr();
 }
 
-void test_umts_authen_geran(uint8_t nr, const char *imsi)
+void test_umts_authen_geran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_umts_authen(RAN_GERAN_A);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_umts_authen_utran(uint8_t nr, const char *imsi)
+void test_umts_authen_utran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_umts_authen(RAN_UTRAN_IU);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 #define RECALC_AUTS 0
@@ -558,18 +558,18 @@ void _test_umts_authen_resync(enum ran_type via_ran)
 	clear_vlr();
 }
 
-void test_umts_authen_resync_geran(uint8_t nr, const char *imsi)
+void test_umts_authen_resync_geran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_umts_authen_resync(RAN_GERAN_A);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
-void test_umts_authen_resync_utran(uint8_t nr, const char *imsi)
+void test_umts_authen_resync_utran()
 {
-	comment_start(nr, imsi);
+	comment_start();
 	_test_umts_authen_resync(RAN_UTRAN_IU);
-	comment_end(nr, imsi);
+	comment_end();
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err
index 78d4925b6..f4ee4b401 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err
@@ -1,4 +1,4 @@
-===== [1] test_umts_authen_geran(901700000004620)...
+===== test_umts_authen_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -455,12 +455,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   bssap_clear_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [1] test_umts_authen_geran(901700000004620): SUCCESS
+===== test_umts_authen_geran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [2] test_umts_authen_utran(901700000004620)...
+===== test_umts_authen_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -943,12 +943,12 @@ DREF unknown: MSC conn use - compl_l3 == 0 (0x0)
 DRLL Freeing subscriber connection with NULL subscriber
   iu_release_sent == 1
   llist_count(&net->subscr_conns) == 0
-===== [2] test_umts_authen_utran(901700000004620): SUCCESS
+===== test_umts_authen_utran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [3] test_umts_authen_resync_geran(901700000004620)...
+===== test_umts_authen_resync_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1156,12 +1156,12 @@ DREF VLR subscr MSISDN:42342 usage decreases to: 1
 - LU was successful, and the conn has already been closed
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:42342
-===== [3] test_umts_authen_resync_geran(901700000004620): SUCCESS
+===== test_umts_authen_resync_geran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
 
-===== [4] test_umts_authen_resync_utran(901700000004620)...
+===== test_umts_authen_resync_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
   MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
@@ -1379,7 +1379,7 @@ DREF VLR subscr MSISDN:42342 usage decreases to: 1
 - LU was successful, and the conn has already been closed
   llist_count(&net->subscr_conns) == 0
 DREF freeing VLR subscr MSISDN:42342
-===== [4] test_umts_authen_resync_utran(901700000004620): SUCCESS
+===== test_umts_authen_resync_utran: SUCCESS
 
 full talloc report on 'msgb' (total      0 bytes in   1 blocks)
 talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.ok b/tests/msc_vlr/msc_vlr_test_umts_authen.ok
index 1861dfc45..a965a70ed 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.ok
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.ok
@@ -1,2 +1 @@
-Testing for IMSI 901700000004620
 Done
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index 362f32d80..4bb31d9ec 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -826,18 +826,21 @@ static void handle_options(int argc, char **argv)
 
 void *msgb_ctx = NULL;
 
-static void run_tests(int nr, const char *imsi)
+static void run_tests(int nr)
 {
-	uint8_t test_nr;
-
-	printf("Testing for IMSI %s\n", imsi);
-
+	int test_nr;
 	nr--; /* arg's first test is 1, in here it's 0 */
 	for (test_nr = 0; msc_vlr_tests[test_nr]; test_nr++) {
 		if (nr >= 0 && test_nr != nr)
 			continue;
 
-		msc_vlr_tests[test_nr](test_nr + 1, imsi);
+		if (cmdline_opts.verbose)
+			fprintf(stderr, "(test nr %d)\n", test_nr + 1);
+
+		msc_vlr_tests[test_nr]();
+
+		if (cmdline_opts.verbose)
+			fprintf(stderr, "(test nr %d)\n", test_nr + 1);
 
 		check_talloc(msgb_ctx, tall_bsc_ctx, 7);
 	}
@@ -893,9 +896,9 @@ int main(int argc, char **argv)
 
 	clear_vlr();
 
-	if (optind >= argc) {
-		run_tests(-1, "901700000004620");
-	} else {
+	if (optind >= argc)
+		run_tests(-1);
+	else {
 		int arg;
 		long int nr;
 		for (arg = optind; arg < argc; arg++) {
@@ -907,7 +910,7 @@ int main(int argc, char **argv)
 				exit(1);
 			}
 
-			run_tests(nr, "901700000004620");
+			run_tests(nr);
 		}
 	}
 
diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h
index d00eb9ffa..03aa3aeef 100644
--- a/tests/msc_vlr/msc_vlr_tests.h
+++ b/tests/msc_vlr/msc_vlr_tests.h
@@ -46,8 +46,8 @@ extern bool _log_lines;
 #define btw(fmt, args...) _log("- " fmt, ## args )
 #define log(fmt, args...) _log("  " fmt, ## args )
 
-#define comment_start(nr, imsi) fprintf(stderr, "===== [%u] %s(%s)...\n", nr, __func__, imsi);
-#define comment_end(nr, imsi) fprintf(stderr, "===== [%u] %s(%s): SUCCESS\n\n", nr, __func__, imsi);
+#define comment_start() fprintf(stderr, "===== %s\n", __func__);
+#define comment_end() fprintf(stderr, "===== %s: SUCCESS\n\n", __func__);
 
 extern struct gsm_subscriber_connection *g_conn;
 extern struct gsm_network *net;
@@ -122,7 +122,7 @@ struct msc_vlr_test_cmdline_opts {
 	int run_test_nr;
 };
 
-typedef void (* msc_vlr_test_func_t )(uint8_t, const char *);
+typedef void (* msc_vlr_test_func_t )(void);
 extern msc_vlr_test_func_t msc_vlr_tests[];
 
 struct msgb *msgb_from_hex(const char *label, uint16_t size, const char *hex);
-- 
cgit v1.2.3