Index: benchmark/rmit.py
===================================================================
--- benchmark/rmit.py	(revision 93456846dc38174d2483127ddf47816e77c7e2a0)
+++ benchmark/rmit.py	(revision 37c6f77ebfefad5a39e5cf500acf63edf0a162ea)
@@ -138,5 +138,9 @@
 	# ================================================================================
 	# Identify the commands to run
-	commands = ["./" + options.command[0] + "-" + c for c in options.candidates]
+	command = './' + options.command[0]
+	if options.candidates:
+		commands = [command + "-" + c for c in options.candidates]
+	else:
+		commands = [command]
 	for c in commands:
 		if not os.path.isfile(c):
Index: doc/theses/andrew_beach_MMath/code/test.sh
===================================================================
--- doc/theses/andrew_beach_MMath/code/test.sh	(revision 93456846dc38174d2483127ddf47816e77c7e2a0)
+++ doc/theses/andrew_beach_MMath/code/test.sh	(revision 37c6f77ebfefad5a39e5cf500acf63edf0a162ea)
@@ -38,4 +38,10 @@
 	done
 	exit 0
+elif [ 2 -eq "$#" ]; then
+    TEST_LANG="$1"
+    TEST_CASE="$2"
+else
+    echo "Unknown call pattern." >&2
+    exit 2
 fi
 
@@ -46,5 +52,5 @@
 }
 
-case "$2" in
+case "$TEST_CASE" in
 cond-match-all)
 	CFAT="./cond-catch $ITERATIONS 1"
@@ -96,13 +102,16 @@
 	;;
 *)
-	echo "No such test." >&2
+	echo "No such test: $TEST_CASE" >&2
 	exit 2
 	;;
 esac
 
-case "$1" in
+case "$TEST_LANG" in
 cfa-t) echo $CFAT; $CFAT;;
 cfa-r) echo $CFAR; $CFAR;;
 cpp) echo $CPP; $CPP;;
 java) echo $JAVA; $JAVA;;
+*)
+	echo "No such language: $TEST_LANG" >&2
+	exit 2
 esac