diff -r 7a945c3b86c7 -r 3f34da7a3094 testing3/knight2_test.sh
--- a/testing3/knight2_test.sh	Thu Oct 31 09:20:43 2019 +0000
+++ b/testing3/knight2_test.sh	Thu Oct 31 09:49:33 2019 +0000
@@ -8,7 +8,7 @@
 
 echo "" > $out
 
-echo -e "Below is the feedback for your submission of CW 8, Advanced Part 2." >> $out
+echo -e "Below is the feedback for your submission of CW 8, Core Part." >> $out
 echo -e "" >> $out
 
 
@@ -21,11 +21,17 @@
 
 # functional tests
 
-
-function scala_assert {
-  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
+function scala_assert_slow {
+  (ulimit -t 120; JAVA_OPTS="-Xmx1g" scala -i "$1" "-- $2" 2> /dev/null 1> /dev/null)
 }
 
+function scala_assert_thirty {
+  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2" 2> /dev/null 1> /dev/null)
+}
+
+function scala_assert_quick {
+  (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -i "$1" -- "$2"  2> /dev/null 1> /dev/null)
+}
 
 
 # purity test
@@ -35,6 +41,12 @@
 }
 
 
+
+
+
+
+
+
 # knights2: purity test
 #
 echo -e "knight2.scala does not contain vars, returns, Arrays, ListBuffers etc?" >> $out