diff --git a/mmgen/tw.py b/mmgen/tw.py
index ca5113f9..3146a842 100755
--- a/mmgen/tw.py
+++ b/mmgen/tw.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tw: Tracking wallet dependency classes for the MMGen suite
+tw: Tracking wallet dependency classes and helper functions
 """
 
 import time
diff --git a/test/unit_tests.py b/test/unit_tests.py
index db123631..bdae82b4 100755
--- a/test/unit_tests.py
+++ b/test/unit_tests.py
@@ -69,7 +69,8 @@ for e in exclude:
 start_time = int(time.time())
 
 if opt.list:
-	Die(0,' '.join(all_tests))
+	Msg(' '.join(all_tests))
+	sys.exit(0)
 
 class UnitTestHelpers(object):