diff --git a/test-userland b/test-userland
index 25c39d2..6d4d4bb 100755
--- a/test-userland
+++ b/test-userland
@@ -14,7 +14,6 @@ class Main(common.LkmcCliFunction):
         )
         self.add_argument(
             'tests',
-            metavar='tests',
             nargs='*',
             help='''\
 If given, run only the given tests. Otherwise, run all tests.
@@ -49,16 +48,10 @@ If given, run only the given tests. Otherwise, run all tests.
             sources = self.env['tests']
         for source in sources:
             run_args['userland'] = source
-            test_id_string = self.test_setup(run_args, source)
             run_args['background'] = True
+            test_id_string = self.test_setup(run_args, source)
             exit_status = run(**run_args)
             self.log_info(self.seconds_to_hms(run.ellapsed_seconds))
-            # TODO forward all args attempt. In particular, --dry-run.
-            #new_env = self.env.copy()
-            #new_env['userland'] = source
-            #new_env['emulator'] = emulator
-            #new_env.update(run_args)
-            #exit_status = run(**new_env)
             if exit_status != 0:
                 self.log_error('test failed, program exit status: {} test id: {}'.format(exit_status, test_id_string))
                 sys.exit(1)