diff --git a/tests/allbackends/basic048/run b/tests/allbackends/basic048/run
index 85fa36dfd..0073df211 100644
--- a/tests/allbackends/basic048/run
+++ b/tests/allbackends/basic048/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 "Module'.idr" < input
 $1 --exec main "Module'.idr"
 EDITOR=true $1 --no-banner --no-color --console-width 0 "Module'.idr" < input-ed
 
-rm -rf build
diff --git a/tests/allbackends/evaluator004/run b/tests/allbackends/evaluator004/run
index 3212ca09f..7aab6792b 100644
--- a/tests/allbackends/evaluator004/run
+++ b/tests/allbackends/evaluator004/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Issue735.idr < input
 $1 --exec main Issue735.idr
 
-rm -rf build
diff --git a/tests/allbackends/evaluator005/run b/tests/allbackends/evaluator005/run
index 39eddeec2..37e38ad0e 100644
--- a/tests/allbackends/evaluator005/run
+++ b/tests/allbackends/evaluator005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --exec main Issue1200.idr
 
-rm -rf build
diff --git a/tests/allbackends/perf006/run b/tests/allbackends/perf006/run
index f7f8f1e0a..bcf4cbfc0 100644
--- a/tests/allbackends/perf006/run
+++ b/tests/allbackends/perf006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --exec main Issue775.idr
 
-rm -rf build
diff --git a/tests/base/control_app001/run b/tests/base/control_app001/run
index 26e7c835f..0fc4154b9 100755
--- a/tests/base/control_app001/run
+++ b/tests/base/control_app001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TestException.idr < input
 
-rm -rf build
diff --git a/tests/base/data_bits001/run b/tests/base/data_bits001/run
index c275366d8..78360db1c 100755
--- a/tests/base/data_bits001/run
+++ b/tests/base/data_bits001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 BitOps.idr < input
 
-rm -rf build
diff --git a/tests/base/system_errno/run b/tests/base/system_errno/run
index 08ec242aa..58fe19b6f 100755
--- a/tests/base/system_errno/run
+++ b/tests/base/system_errno/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Test.idr < input
 
-rm -rf build
diff --git a/tests/base/system_file001/run b/tests/base/system_file001/run
index 2b9c499bb..56707d151 100755
--- a/tests/base/system_file001/run
+++ b/tests/base/system_file001/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 # @readFilePage@ uses primitive functions with definitions for both
 # C (supported by most backends) and Node.
 $1 --cg chez --no-color --console-width 0 --no-banner ReadFilePage.idr < input
@@ -12,4 +14,3 @@ $1 --cg node --no-color --console-width 0 --no-banner ReadFilePage.idr < input
 # GAMBIT hung seemingly indefinitely
 # $1 --cg gambit --no-color --console-width 0 --no-banner ReadFilePage.idr < input
 
-rm -rf build
diff --git a/tests/base/system_info001/run b/tests/base/system_info001/run
index e8587cd97..a94b5419b 100755
--- a/tests/base/system_info001/run
+++ b/tests/base/system_info001/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 rm -f expected
 
 if ! NProcs=$(nproc || sysctl -n hw.ncpu) 2>/dev/null; then
@@ -9,4 +11,3 @@ echo "$NProcs processors" > expected
 
 $1 --no-banner --no-color --console-width 0 NumProcessors.idr --exec main
 
-rm -rf build
diff --git a/tests/base/system_info_os001/run b/tests/base/system_info_os001/run
index 8e4b36d4e..957fdcb8d 100755
--- a/tests/base/system_info_os001/run
+++ b/tests/base/system_info_os001/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 case "$(uname)" in
   Linux*) EXPECTED_OS=unix ;;
   Darwin*) EXPECTED_OS=darwin ;;
@@ -9,4 +11,3 @@ export EXPECTED_OS
 
 $1 --no-banner --no-color --console-width 0 Os.idr --exec main
 
-rm -rf build
diff --git a/tests/base/system_signal001/run b/tests/base/system_signal001/run
index 7ea0a2de5..98200cbbf 100755
--- a/tests/base/system_signal001/run
+++ b/tests/base/system_signal001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IgnoreSignal.idr < input
 
-rm -rf build
diff --git a/tests/base/system_signal002/run b/tests/base/system_signal002/run
index fee5ce804..1fffa402d 100755
--- a/tests/base/system_signal002/run
+++ b/tests/base/system_signal002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner HandleSignal.idr < input
 
-rm -rf build
diff --git a/tests/base/system_signal003/run b/tests/base/system_signal003/run
index d03eb27d2..d13f91294 100755
--- a/tests/base/system_signal003/run
+++ b/tests/base/system_signal003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner DefaultSignal.idr < input 2> /dev/null
 
-rm -rf build
diff --git a/tests/base/system_signal004/run b/tests/base/system_signal004/run
index 49f04dd8e..0c713bf2d 100755
--- a/tests/base/system_signal004/run
+++ b/tests/base/system_signal004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner HandleManySignals.idr < input
 
-rm -rf build
diff --git a/tests/base/system_system/run b/tests/base/system_system/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/base/system_system/run
+++ b/tests/base/system_system/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/chez/bitops/run b/tests/chez/bitops/run
index c275366d8..78360db1c 100644
--- a/tests/chez/bitops/run
+++ b/tests/chez/bitops/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 BitOps.idr < input
 
-rm -rf build
diff --git a/tests/chez/casts/run b/tests/chez/casts/run
index 0fbe7cde8..48cd2c2f8 100644
--- a/tests/chez/casts/run
+++ b/tests/chez/casts/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Casts.idr < input
 
-rm -rf build
diff --git a/tests/chez/channels001/run b/tests/chez/channels001/run
index b79538c51..5906c0006 100644
--- a/tests/chez/channels001/run
+++ b/tests/chez/channels001/run
@@ -1,2 +1,3 @@
-$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
 rm -rf build
+
+$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
diff --git a/tests/chez/channels002/run b/tests/chez/channels002/run
index b79538c51..5906c0006 100644
--- a/tests/chez/channels002/run
+++ b/tests/chez/channels002/run
@@ -1,2 +1,3 @@
-$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
 rm -rf build
+
+$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
diff --git a/tests/chez/channels003/run b/tests/chez/channels003/run
index b79538c51..5906c0006 100644
--- a/tests/chez/channels003/run
+++ b/tests/chez/channels003/run
@@ -1,2 +1,3 @@
-$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
 rm -rf build
+
+$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
diff --git a/tests/chez/channels004/run b/tests/chez/channels004/run
index b79538c51..5906c0006 100644
--- a/tests/chez/channels004/run
+++ b/tests/chez/channels004/run
@@ -1,2 +1,3 @@
-$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
 rm -rf build
+
+$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
diff --git a/tests/chez/channels005/run b/tests/chez/channels005/run
index b79538c51..5906c0006 100644
--- a/tests/chez/channels005/run
+++ b/tests/chez/channels005/run
@@ -1,2 +1,3 @@
-$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
 rm -rf build
+
+$1 --no-banner --no-color --console-width 0 --cg chez Main.idr --exec main
diff --git a/tests/chez/chez001/run b/tests/chez/chez001/run
index 09d88e0cc..4f97a2d2d 100755
--- a/tests/chez/chez001/run
+++ b/tests/chez/chez001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Total.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez002/run b/tests/chez/chez002/run
index c9274be05..248f4c124 100755
--- a/tests/chez/chez002/run
+++ b/tests/chez/chez002/run
@@ -1,2 +1,3 @@
-$1 --no-color --console-width 0 --no-banner Pythag.idr < input
 rm -rf build
+
+$1 --no-color --console-width 0 --no-banner Pythag.idr < input
diff --git a/tests/chez/chez003/run b/tests/chez/chez003/run
index 4feb8c34d..802151e04 100755
--- a/tests/chez/chez003/run
+++ b/tests/chez/chez003/run
@@ -1,2 +1,3 @@
-$1 --no-color --console-width 0 --no-banner IORef.idr < input
 rm -rf build
+
+$1 --no-color --console-width 0 --no-banner IORef.idr < input
diff --git a/tests/chez/chez005/run b/tests/chez/chez005/run
index 7c5ed98ab..b2eb87dc0 100755
--- a/tests/chez/chez005/run
+++ b/tests/chez/chez005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Filter.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez006/run b/tests/chez/chez006/run
index a3cb5eba2..5066a82ed 100755
--- a/tests/chez/chez006/run
+++ b/tests/chez/chez006/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeCase.idr < input
 $1 --no-color --console-width 0 --no-banner TypeCase2.idr --check
 
-rm -rf build
diff --git a/tests/chez/chez007/run b/tests/chez/chez007/run
index f0f9db205..92e3bd79b 100755
--- a/tests/chez/chez007/run
+++ b/tests/chez/chez007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeCase.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez008/run b/tests/chez/chez008/run
index 72ed7b7e5..157908b31 100755
--- a/tests/chez/chez008/run
+++ b/tests/chez/chez008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Nat.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez009/run b/tests/chez/chez009/run
index a7392c1a3..4558792b3 100755
--- a/tests/chez/chez009/run
+++ b/tests/chez/chez009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner uni.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez011/run b/tests/chez/chez011/run
index b3c76a11f..c46f52a98 100644
--- a/tests/chez/chez011/run
+++ b/tests/chez/chez011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner bangs.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez012/run b/tests/chez/chez012/run
index 7d78b793b..f052de294 100755
--- a/tests/chez/chez012/run
+++ b/tests/chez/chez012/run
@@ -1,2 +1,3 @@
-$1 --no-color --console-width 0 --no-banner array.idr < input
 rm -rf build
+
+$1 --no-color --console-width 0 --no-banner array.idr < input
diff --git a/tests/chez/chez014/run b/tests/chez/chez014/run
index 2c94125ad..e954dd99e 100755
--- a/tests/chez/chez014/run
+++ b/tests/chez/chez014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner -p network Echo.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez015/run b/tests/chez/chez015/run
index 091d2ce7f..9566248a5 100755
--- a/tests/chez/chez015/run
+++ b/tests/chez/chez015/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Numbers.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez016/run b/tests/chez/chez016/run
index 075676aaf..beebdae24 100755
--- a/tests/chez/chez016/run
+++ b/tests/chez/chez016/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 cd "folder with spaces" || exit
 
 $1 --no-color --console-width 0 --no-banner Main.idr < ../input
-rm -rf build
diff --git a/tests/chez/chez020/run b/tests/chez/chez020/run
index 52de8fb61..8825141b6 100644
--- a/tests/chez/chez020/run
+++ b/tests/chez/chez020/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 POPEN_CMD="$1 --version" $1 --no-color --console-width 0 --no-banner Popen.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez021/run b/tests/chez/chez021/run
index d45b408e4..f5edd446a 100644
--- a/tests/chez/chez021/run
+++ b/tests/chez/chez021/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Bits.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez024/run b/tests/chez/chez024/run
index 89f2d6d3b..888dc04d6 100644
--- a/tests/chez/chez024/run
+++ b/tests/chez/chez024/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Envy.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez025/run b/tests/chez/chez025/run
index ef35642e6..73297b4c9 100755
--- a/tests/chez/chez025/run
+++ b/tests/chez/chez025/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner runst.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez027/run b/tests/chez/chez027/run
index 824cd020e..b381c8abc 100644
--- a/tests/chez/chez027/run
+++ b/tests/chez/chez027/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner -p contrib StringParser.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez028/run b/tests/chez/chez028/run
index f0319b71c..10a691da0 100644
--- a/tests/chez/chez028/run
+++ b/tests/chez/chez028/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 -p contrib ExpressionParser.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez029/run b/tests/chez/chez029/run
index eab882ae4..a31c07379 100644
--- a/tests/chez/chez029/run
+++ b/tests/chez/chez029/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 BitCasts.idr < input
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/chez/chez030/run b/tests/chez/chez030/run
index 6a962bad7..b6b18a1a9 100644
--- a/tests/chez/chez030/run
+++ b/tests/chez/chez030/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --directive extraRuntime=extensions.scm -o chez030 ExtraRuntime.idr
 ./build/exec/chez030
 
-rm -rf build
diff --git a/tests/chez/chez031/run b/tests/chez/chez031/run
index d9a152e86..c67ed5c43 100644
--- a/tests/chez/chez031/run
+++ b/tests/chez/chez031/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg chez Specifiers.idr --exec main
 $1 --no-banner --no-color --console-width 0 --cg chez Specifiers.idr -o build/foo
 $1 --no-banner --no-color --console-width 0 --cg chez < input
 
-rm -rf build
diff --git a/tests/chez/chez032/run b/tests/chez/chez032/run
index c275366d8..78360db1c 100644
--- a/tests/chez/chez032/run
+++ b/tests/chez/chez032/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 BitOps.idr < input
 
-rm -rf build
diff --git a/tests/chez/chez033/run b/tests/chez/chez033/run
index 7a05f6763..94b6417f1 100644
--- a/tests/chez/chez033/run
+++ b/tests/chez/chez033/run
@@ -1,2 +1,3 @@
-$1 --no-banner --no-color --console-width 0 Main.idr --inc chez < input
 rm -rf build
+
+$1 --no-banner --no-color --console-width 0 Main.idr --inc chez < input
diff --git a/tests/chez/integers/run b/tests/chez/integers/run
index 384306d4c..c6121d5bc 100644
--- a/tests/chez/integers/run
+++ b/tests/chez/integers/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 -o integers TestIntegers.idr > /dev/null
 ./build/exec/integers
 
-rm -rf build
diff --git a/tests/chez/newints/run b/tests/chez/newints/run
index 18f385897..02841aef2 100644
--- a/tests/chez/newints/run
+++ b/tests/chez/newints/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 IntOps.idr < input
 
-rm -rf build
diff --git a/tests/chez/perf001/run b/tests/chez/perf001/run
index 5691f894e..c8214006e 100755
--- a/tests/chez/perf001/run
+++ b/tests/chez/perf001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 -c Fact.idr -o fact
 ./build/exec/fact
 
-rm -rf build
diff --git a/tests/chez/reg001/run b/tests/chez/reg001/run
index 16afc937a..791bdc20b 100755
--- a/tests/chez/reg001/run
+++ b/tests/chez/reg001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 numbers.idr -x main
 
-rm -rf build
diff --git a/tests/contrib/json_001/run b/tests/contrib/json_001/run
index c87d2b189..d90a45cfa 100755
--- a/tests/contrib/json_001/run
+++ b/tests/contrib/json_001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 -p contrib CharEncoding.idr < input
 
-rm -rf build
diff --git a/tests/ideMode/ideMode001/run b/tests/ideMode/ideMode001/run
index 061aac2dc..32c5798ea 100755
--- a/tests/ideMode/ideMode001/run
+++ b/tests/ideMode/ideMode001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --ide-mode < input
 
-rm -rf build
diff --git a/tests/ideMode/ideMode002/run b/tests/ideMode/ideMode002/run
index 91e6f464c..8cc736a5b 100755
--- a/tests/ideMode/ideMode002/run
+++ b/tests/ideMode/ideMode002/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --version | awk '{print $4}' | ./gen_expected.sh
 $1 --no-color --console-width 0 --ide-mode < input
 
-rm -rf build
diff --git a/tests/ideMode/ideMode003/run b/tests/ideMode/ideMode003/run
index 061aac2dc..32c5798ea 100755
--- a/tests/ideMode/ideMode003/run
+++ b/tests/ideMode/ideMode003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --ide-mode < input
 
-rm -rf build
diff --git a/tests/ideMode/ideMode004/run b/tests/ideMode/ideMode004/run
index 061aac2dc..32c5798ea 100755
--- a/tests/ideMode/ideMode004/run
+++ b/tests/ideMode/ideMode004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --ide-mode < input
 
-rm -rf build
diff --git a/tests/ideMode/ideMode005/run b/tests/ideMode/ideMode005/run
index 0479e8781..6805a8a37 100755
--- a/tests/ideMode/ideMode005/run
+++ b/tests/ideMode/ideMode005/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 rm -f output*
 
 $1 --no-color --console-width 0 --ide-mode < input1 > output1
@@ -51,4 +53,3 @@ diff expectedG outputG >> output
 $1 --no-color --console-width 0 --ide-mode < inputH > outputH
 diff expectedH outputH >> output
 
-rm -rf build
diff --git a/tests/idris2/basic001/run b/tests/idris2/basic001/run
index fe1a0040c..fcbabe9f5 100755
--- a/tests/idris2/basic001/run
+++ b/tests/idris2/basic001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Vect.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic002/run b/tests/idris2/basic002/run
index 7d50061f7..faf9ac7d3 100755
--- a/tests/idris2/basic002/run
+++ b/tests/idris2/basic002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Do.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic003/run b/tests/idris2/basic003/run
index 172e19c46..98dc2dd2a 100755
--- a/tests/idris2/basic003/run
+++ b/tests/idris2/basic003/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 echo ':q' | $1 --no-color --console-width 0 --no-banner --no-prelude Ambig1.idr
 echo ':q' | $1 --no-color --console-width 0 --no-banner --no-prelude Ambig2.idr
 
-rm -rf build
diff --git a/tests/idris2/basic004/run b/tests/idris2/basic004/run
index 36831bf61..0fa269aa4 100755
--- a/tests/idris2/basic004/run
+++ b/tests/idris2/basic004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Wheres.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic005/run b/tests/idris2/basic005/run
index 74ec6436f..f4d42e472 100755
--- a/tests/idris2/basic005/run
+++ b/tests/idris2/basic005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 echo ':q' | $1 --no-color --console-width 0 --no-banner --no-prelude NoInfer.idr
 
-rm -rf build
diff --git a/tests/idris2/basic006/run b/tests/idris2/basic006/run
index c70911d7a..5130a1f6f 100755
--- a/tests/idris2/basic006/run
+++ b/tests/idris2/basic006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude PMLet.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic007/run b/tests/idris2/basic007/run
index 1fbe7a7d3..043ee81b0 100755
--- a/tests/idris2/basic007/run
+++ b/tests/idris2/basic007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude DoLocal.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic008/run b/tests/idris2/basic008/run
index 0d2724dc3..2a1c6aa53 100755
--- a/tests/idris2/basic008/run
+++ b/tests/idris2/basic008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude If.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic009/run b/tests/idris2/basic009/run
index 0feceee57..f88d2016a 100755
--- a/tests/idris2/basic009/run
+++ b/tests/idris2/basic009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude LetCase.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic010/run b/tests/idris2/basic010/run
index 81f428eb9..7bdf32082 100755
--- a/tests/idris2/basic010/run
+++ b/tests/idris2/basic010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Comp.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic011/run b/tests/idris2/basic011/run
index 6300bbc90..0c94e92ea 100755
--- a/tests/idris2/basic011/run
+++ b/tests/idris2/basic011/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Dots1.idr
 $1 --no-color --console-width 0 --check Dots2.idr
 $1 --no-color --console-width 0 --check Dots3.idr
 
-rm -rf build
diff --git a/tests/idris2/basic012/run b/tests/idris2/basic012/run
index dec04ee7d..faae78576 100755
--- a/tests/idris2/basic012/run
+++ b/tests/idris2/basic012/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check VIndex.idr
 
-rm -rf build
diff --git a/tests/idris2/basic013/run b/tests/idris2/basic013/run
index 5e6e6c027..329bd02eb 100755
--- a/tests/idris2/basic013/run
+++ b/tests/idris2/basic013/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Implicits.idr
 
-rm -rf build
diff --git a/tests/idris2/basic014/run b/tests/idris2/basic014/run
index 34ad73dbe..a960badec 100755
--- a/tests/idris2/basic014/run
+++ b/tests/idris2/basic014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Rewrite.idr
 
-rm -rf build
diff --git a/tests/idris2/basic015/run b/tests/idris2/basic015/run
index bb5a1fcd6..02b470d62 100755
--- a/tests/idris2/basic015/run
+++ b/tests/idris2/basic015/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check George.idr
 
-rm -rf build
diff --git a/tests/idris2/basic016/run b/tests/idris2/basic016/run
index b49182349..5fc11ffaf 100755
--- a/tests/idris2/basic016/run
+++ b/tests/idris2/basic016/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Eta.idr
 $1 --no-color --console-width 0 --check Eta2.idr
 
-rm -rf build
diff --git a/tests/idris2/basic017/run b/tests/idris2/basic017/run
index d562d2e3e..4fc774f17 100755
--- a/tests/idris2/basic017/run
+++ b/tests/idris2/basic017/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner CaseInf.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic018/run b/tests/idris2/basic018/run
index 60c45fa0a..5f47c9b4a 100755
--- a/tests/idris2/basic018/run
+++ b/tests/idris2/basic018/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Fin.idr
 
-rm -rf build
diff --git a/tests/idris2/basic019/run b/tests/idris2/basic019/run
index 0529eb1c2..76844d05c 100755
--- a/tests/idris2/basic019/run
+++ b/tests/idris2/basic019/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner CaseBlock.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic020/run b/tests/idris2/basic020/run
index 6cc3cf1ad..8fb16f92d 100755
--- a/tests/idris2/basic020/run
+++ b/tests/idris2/basic020/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Mut.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic021/run b/tests/idris2/basic021/run
index 7a3016e6e..640b8a4ec 100755
--- a/tests/idris2/basic021/run
+++ b/tests/idris2/basic021/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner CaseDep.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic022/run b/tests/idris2/basic022/run
index b9d8db6b4..700fb28c1 100755
--- a/tests/idris2/basic022/run
+++ b/tests/idris2/basic022/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Erase.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic023/run b/tests/idris2/basic023/run
index b9a4d9d48..1467918f8 100755
--- a/tests/idris2/basic023/run
+++ b/tests/idris2/basic023/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Params.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic024/run b/tests/idris2/basic024/run
index 11356d395..4f359ddab 100755
--- a/tests/idris2/basic024/run
+++ b/tests/idris2/basic024/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner PatLam.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic025/run b/tests/idris2/basic025/run
index 565fcc184..47008ffee 100755
--- a/tests/idris2/basic025/run
+++ b/tests/idris2/basic025/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner < input
 
-rm -rf build
diff --git a/tests/idris2/basic026/run b/tests/idris2/basic026/run
index 40042596e..6410a0e1a 100755
--- a/tests/idris2/basic026/run
+++ b/tests/idris2/basic026/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Erl.idr
 
-rm -rf build
diff --git a/tests/idris2/basic027/run b/tests/idris2/basic027/run
index f5073c2d8..fd57b8850 100755
--- a/tests/idris2/basic027/run
+++ b/tests/idris2/basic027/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Temp.idr
 
-rm -rf build
diff --git a/tests/idris2/basic028/run b/tests/idris2/basic028/run
index c16d015ba..aa632f8dd 100755
--- a/tests/idris2/basic028/run
+++ b/tests/idris2/basic028/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 unset IDRIS2_PATH
 
 $1 --no-color --console-width 0 --no-banner --no-prelude < input
 
-rm -rf build
diff --git a/tests/idris2/basic029/run b/tests/idris2/basic029/run
index b9a4d9d48..1467918f8 100644
--- a/tests/idris2/basic029/run
+++ b/tests/idris2/basic029/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Params.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic030/run b/tests/idris2/basic030/run
index 51d6bd380..3e8d8fc4d 100644
--- a/tests/idris2/basic030/run
+++ b/tests/idris2/basic030/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check arity.idr
 
-rm -rf build
diff --git a/tests/idris2/basic031/run b/tests/idris2/basic031/run
index bf93e2af8..465056250 100644
--- a/tests/idris2/basic031/run
+++ b/tests/idris2/basic031/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check erased.idr
 
-rm -rf build
diff --git a/tests/idris2/basic032/run b/tests/idris2/basic032/run
index d3303257a..383d9af23 100755
--- a/tests/idris2/basic032/run
+++ b/tests/idris2/basic032/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Idiom.idr < input
 $1 --no-color --console-width 0 --no-banner Idiom2.idr --check
 
-rm -rf build
diff --git a/tests/idris2/basic033/run b/tests/idris2/basic033/run
index 7cdaad074..996941b23 100644
--- a/tests/idris2/basic033/run
+++ b/tests/idris2/basic033/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check unboundimps.idr
 
-rm -rf build
diff --git a/tests/idris2/basic034/run b/tests/idris2/basic034/run
index 04154d62f..683cf5e5b 100644
--- a/tests/idris2/basic034/run
+++ b/tests/idris2/basic034/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check lets.idr
 
-rm -rf build
diff --git a/tests/idris2/basic035/run b/tests/idris2/basic035/run
index dd4bd38df..fa9b5d43d 100755
--- a/tests/idris2/basic035/run
+++ b/tests/idris2/basic035/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner using.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic036/run b/tests/idris2/basic036/run
index a6e23ee93..5a43c983a 100755
--- a/tests/idris2/basic036/run
+++ b/tests/idris2/basic036/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner defimp.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic037/run b/tests/idris2/basic037/run
index ed78ed897..cc9ea5480 100644
--- a/tests/idris2/basic037/run
+++ b/tests/idris2/basic037/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 echo ':q' | $1 --no-color --console-width 0 --no-banner --no-prelude Comments.idr
 echo ':q' | $1 --no-color --console-width 0 --no-banner Issue279.idr
 
-rm -rf build
diff --git a/tests/idris2/basic038/run b/tests/idris2/basic038/run
index f7e1134dc..d18f562f5 100644
--- a/tests/idris2/basic038/run
+++ b/tests/idris2/basic038/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Resugar.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic039/run b/tests/idris2/basic039/run
index deba354b0..600229413 100755
--- a/tests/idris2/basic039/run
+++ b/tests/idris2/basic039/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Main.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic040/run b/tests/idris2/basic040/run
index aa7823377..c4672b418 100755
--- a/tests/idris2/basic040/run
+++ b/tests/idris2/basic040/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 echo ":q" | $1 --no-color --console-width 0 --no-banner Default.idr
 
-rm -rf build
diff --git a/tests/idris2/basic041/run b/tests/idris2/basic041/run
index f60ed6c0a..c11100cd4 100755
--- a/tests/idris2/basic041/run
+++ b/tests/idris2/basic041/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check QDo.idr
 
-rm -rf build
diff --git a/tests/idris2/basic042/run b/tests/idris2/basic042/run
index 48c25c06f..d02782782 100755
--- a/tests/idris2/basic042/run
+++ b/tests/idris2/basic042/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 LiteralsString.idr < input
 $1 --no-banner --no-color --console-width 0 LiteralsInteger.idr < input2
 
-rm -rf build
diff --git a/tests/idris2/basic043/run b/tests/idris2/basic043/run
index eab882ae4..a31c07379 100644
--- a/tests/idris2/basic043/run
+++ b/tests/idris2/basic043/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 BitCasts.idr < input
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/basic044/run b/tests/idris2/basic044/run
index 57d475111..62f10f7b3 100644
--- a/tests/idris2/basic044/run
+++ b/tests/idris2/basic044/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 echo ":q" | $1 --no-banner --no-color --console-width 0 --log unify.equal:10 --log unify:5 Term.idr \
   | sed -E "s/[0-9]+}/N}/g" | sed -E "s/resolved([0-9]+)/resolvedN/g" \
   | sed -E "s/case in ([0-9]+)/case in N/g" | sed -E "s/[0-9]+:[0-9]+/L:C/g"
@@ -5,4 +7,3 @@ echo ":q" | $1 --no-banner --no-color --console-width 0 --log unify:3 --log elab
   | sed -E "s/[0-9]+}/N}/g" | sed -E "s/resolved([0-9]+)/resolvedN/g" \
   | sed -E "s/case in ([0-9]+)/case in N/g" | sed -E "s/[0-9]+:[0-9]+/L:C/g"
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/basic045/run b/tests/idris2/basic045/run
index 408152aa6..8875b538f 100644
--- a/tests/idris2/basic045/run
+++ b/tests/idris2/basic045/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Main.idr --check
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/basic046/run b/tests/idris2/basic046/run
index e84026ad6..b4aedb8d1 100644
--- a/tests/idris2/basic046/run
+++ b/tests/idris2/basic046/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 TupleSections.idr < input
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/basic047/run b/tests/idris2/basic047/run
index 218b9daee..ed93a2939 100644
--- a/tests/idris2/basic047/run
+++ b/tests/idris2/basic047/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 InterleavingLets.idr < input
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/basic049/run b/tests/idris2/basic049/run
index 075d41092..339b3ef5a 100755
--- a/tests/idris2/basic049/run
+++ b/tests/idris2/basic049/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Fld.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic050/run b/tests/idris2/basic050/run
index b2057c25c..f91f415aa 100755
--- a/tests/idris2/basic050/run
+++ b/tests/idris2/basic050/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Ilc.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic051/run b/tests/idris2/basic051/run
index b49e559db..920430324 100755
--- a/tests/idris2/basic051/run
+++ b/tests/idris2/basic051/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check Issue833.idr
 
-rm -rf build
diff --git a/tests/idris2/basic052/run b/tests/idris2/basic052/run
index 8da03abe3..531ef4fd7 100755
--- a/tests/idris2/basic052/run
+++ b/tests/idris2/basic052/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner DoubleClBrace.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic053/run b/tests/idris2/basic053/run
index ef21f7b78..30c1a0ac1 100755
--- a/tests/idris2/basic053/run
+++ b/tests/idris2/basic053/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --exec test StringLiteral.idr
 
-rm -rf build
diff --git a/tests/idris2/basic054/run b/tests/idris2/basic054/run
index 525bfcd47..1aa981c95 100755
--- a/tests/idris2/basic054/run
+++ b/tests/idris2/basic054/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Issue1023.idr --exec main
 
-rm -rf build
diff --git a/tests/idris2/basic055/run b/tests/idris2/basic055/run
index c275366d8..78360db1c 100644
--- a/tests/idris2/basic055/run
+++ b/tests/idris2/basic055/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 BitOps.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic056/run b/tests/idris2/basic056/run
index b6e98c693..01694cdd8 100644
--- a/tests/idris2/basic056/run
+++ b/tests/idris2/basic056/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 DoubleLit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic057/run b/tests/idris2/basic057/run
index 094810c60..3de7e56cb 100644
--- a/tests/idris2/basic057/run
+++ b/tests/idris2/basic057/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --check LetIn.idr
 
-rm -rf build
diff --git a/tests/idris2/basic058/run b/tests/idris2/basic058/run
index 4cfe44fcc..1effa895d 100644
--- a/tests/idris2/basic058/run
+++ b/tests/idris2/basic058/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --check DataTypeOp.idr
 $1 --no-banner --no-color --console-width 0 --check DataTypeProj.idr
 
-rm -rf build
diff --git a/tests/idris2/basic059/run b/tests/idris2/basic059/run
index c4463f820..16bf2dca3 100644
--- a/tests/idris2/basic059/run
+++ b/tests/idris2/basic059/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --check MultiClaim.idr
 
-rm -rf build
diff --git a/tests/idris2/basic060/run b/tests/idris2/basic060/run
index 70f778e62..fe73c01fa 100755
--- a/tests/idris2/basic060/run
+++ b/tests/idris2/basic060/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Snoc.idr < input
 
-rm -rf build
diff --git a/tests/idris2/basic061/run b/tests/idris2/basic061/run
index c58b59416..50eb2b0d4 100755
--- a/tests/idris2/basic061/run
+++ b/tests/idris2/basic061/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner UnderscoredIntegerLiterals.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin001/run b/tests/idris2/builtin001/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin001/run
+++ b/tests/idris2/builtin001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin002/run b/tests/idris2/builtin002/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin002/run
+++ b/tests/idris2/builtin002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin003/run b/tests/idris2/builtin003/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin003/run
+++ b/tests/idris2/builtin003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin004/run b/tests/idris2/builtin004/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin004/run
+++ b/tests/idris2/builtin004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin005/run b/tests/idris2/builtin005/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin005/run
+++ b/tests/idris2/builtin005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin006/run b/tests/idris2/builtin006/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin006/run
+++ b/tests/idris2/builtin006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin007/run b/tests/idris2/builtin007/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin007/run
+++ b/tests/idris2/builtin007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin008/run b/tests/idris2/builtin008/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin008/run
+++ b/tests/idris2/builtin008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin009/run b/tests/idris2/builtin009/run
index 6e096cdb7..d90e293aa 100755
--- a/tests/idris2/builtin009/run
+++ b/tests/idris2/builtin009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --exec main Test.idr
 
-rm -rf build
diff --git a/tests/idris2/builtin010/run b/tests/idris2/builtin010/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/idris2/builtin010/run
+++ b/tests/idris2/builtin010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/builtin011/run b/tests/idris2/builtin011/run
index 6e096cdb7..d90e293aa 100755
--- a/tests/idris2/builtin011/run
+++ b/tests/idris2/builtin011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --exec main Test.idr
 
-rm -rf build
diff --git a/tests/idris2/casetree001/run b/tests/idris2/casetree001/run
index a496a6dbf..3bf8f02ab 100755
--- a/tests/idris2/casetree001/run
+++ b/tests/idris2/casetree001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check Issue762.idr
 $1 --no-color --console-width 0 --no-banner --check IsS.idr
 
-rm -rf build/
\ No newline at end of file
diff --git a/tests/idris2/coverage001/run b/tests/idris2/coverage001/run
index 5d299587a..68a63b06f 100755
--- a/tests/idris2/coverage001/run
+++ b/tests/idris2/coverage001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Vect.idr < input
 
-rm -rf build
diff --git a/tests/idris2/coverage002/run b/tests/idris2/coverage002/run
index 5d299587a..68a63b06f 100755
--- a/tests/idris2/coverage002/run
+++ b/tests/idris2/coverage002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Vect.idr < input
 
-rm -rf build
diff --git a/tests/idris2/coverage003/run b/tests/idris2/coverage003/run
index 1c5591a0b..b91eb339a 100755
--- a/tests/idris2/coverage003/run
+++ b/tests/idris2/coverage003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Cover.idr < input
 
-rm -rf build
diff --git a/tests/idris2/coverage004/run b/tests/idris2/coverage004/run
index 1c5591a0b..b91eb339a 100755
--- a/tests/idris2/coverage004/run
+++ b/tests/idris2/coverage004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Cover.idr < input
 
-rm -rf build
diff --git a/tests/idris2/coverage005/run b/tests/idris2/coverage005/run
index 1c5591a0b..b91eb339a 100755
--- a/tests/idris2/coverage005/run
+++ b/tests/idris2/coverage005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Cover.idr < input
 
-rm -rf build
diff --git a/tests/idris2/coverage006/run b/tests/idris2/coverage006/run
index 22e4f9b40..913033700 100755
--- a/tests/idris2/coverage006/run
+++ b/tests/idris2/coverage006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner foobar.idr < input
 
-rm -rf build
diff --git a/tests/idris2/coverage007/run b/tests/idris2/coverage007/run
index 636dd6a2f..163f1d7d4 100755
--- a/tests/idris2/coverage007/run
+++ b/tests/idris2/coverage007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner eq.idr --check
 
-rm -rf build
diff --git a/tests/idris2/coverage008/run b/tests/idris2/coverage008/run
index b6f7dbf32..3b9afabd4 100755
--- a/tests/idris2/coverage008/run
+++ b/tests/idris2/coverage008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner wcov.idr < input
 
-rm -rf build
diff --git a/tests/idris2/coverage009/run b/tests/idris2/coverage009/run
index 211a4abc5..f32f00902 100755
--- a/tests/idris2/coverage009/run
+++ b/tests/idris2/coverage009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check unreachable.idr
 
-rm -rf build
diff --git a/tests/idris2/coverage010/run b/tests/idris2/coverage010/run
index 25a24e371..141b56a42 100755
--- a/tests/idris2/coverage010/run
+++ b/tests/idris2/coverage010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check casetot.idr
 
-rm -rf build
diff --git a/tests/idris2/coverage011/run b/tests/idris2/coverage011/run
index 234b097cc..cebaa1c8e 100755
--- a/tests/idris2/coverage011/run
+++ b/tests/idris2/coverage011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Sing.idr
 
-rm -rf build
diff --git a/tests/idris2/coverage012/run b/tests/idris2/coverage012/run
index af70b37e0..281d97b61 100755
--- a/tests/idris2/coverage012/run
+++ b/tests/idris2/coverage012/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Issue899.idr
 $1 --no-color --console-width 0 --check Issue484.idr
 
-rm -rf build
diff --git a/tests/idris2/coverage013/run b/tests/idris2/coverage013/run
index 223d66466..32ba22392 100755
--- a/tests/idris2/coverage013/run
+++ b/tests/idris2/coverage013/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Issue1022.idr
 $1 --no-color --console-width 0 --check Issue1022-Refl.idr
 
-rm -rf build
diff --git a/tests/idris2/coverage014/run b/tests/idris2/coverage014/run
index 59ac59f84..3d6392d1d 100755
--- a/tests/idris2/coverage014/run
+++ b/tests/idris2/coverage014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Issue794.idr
 
-rm -rf build
diff --git a/tests/idris2/coverage015/run b/tests/idris2/coverage015/run
index c1320dae1..e7aac6ccb 100755
--- a/tests/idris2/coverage015/run
+++ b/tests/idris2/coverage015/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Issue1169.idr
 $1 --no-color --console-width 0 --check Issue1366.idr
 
-rm -rf build
diff --git a/tests/idris2/coverage016/run b/tests/idris2/coverage016/run
index e26f4ff22..8f71348f6 100755
--- a/tests/idris2/coverage016/run
+++ b/tests/idris2/coverage016/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Issue633.idr
 $1 --no-color --console-width 0 --check Issue633-2.idr
 
-rm -rf build
diff --git a/tests/idris2/coverage017/run b/tests/idris2/coverage017/run
index f18de8e74..2973b7418 100755
--- a/tests/idris2/coverage017/run
+++ b/tests/idris2/coverage017/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Issue1421.idr
 
-rm -rf build
diff --git a/tests/idris2/data001/run b/tests/idris2/data001/run
index c95db2de4..254b1a67c 100755
--- a/tests/idris2/data001/run
+++ b/tests/idris2/data001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check TestImpl.idr
 
-rm -rf build
diff --git a/tests/idris2/docs001/run b/tests/idris2/docs001/run
index 565fcc184..47008ffee 100755
--- a/tests/idris2/docs001/run
+++ b/tests/idris2/docs001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner < input
 
-rm -rf build
diff --git a/tests/idris2/docs002/run b/tests/idris2/docs002/run
index 2b616b861..1d831834b 100755
--- a/tests/idris2/docs002/run
+++ b/tests/idris2/docs002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Doc.idr < input
 
-rm -rf build
diff --git a/tests/idris2/docs003/run b/tests/idris2/docs003/run
index 7826e99d2..8db60e4fa 100755
--- a/tests/idris2/docs003/run
+++ b/tests/idris2/docs003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner RecordDoc.idr < input
 
-rm -rf build
diff --git a/tests/idris2/error001/run b/tests/idris2/error001/run
index b9fbe5ebf..f267c81d6 100755
--- a/tests/idris2/error001/run
+++ b/tests/idris2/error001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Error.idr
 
-rm -rf build
diff --git a/tests/idris2/error002/run b/tests/idris2/error002/run
index b9fbe5ebf..f267c81d6 100755
--- a/tests/idris2/error002/run
+++ b/tests/idris2/error002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Error.idr
 
-rm -rf build
diff --git a/tests/idris2/error003/run b/tests/idris2/error003/run
index b9fbe5ebf..f267c81d6 100755
--- a/tests/idris2/error003/run
+++ b/tests/idris2/error003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Error.idr
 
-rm -rf build
diff --git a/tests/idris2/error004/run b/tests/idris2/error004/run
index 3d2a6dc90..60196a4e1 100755
--- a/tests/idris2/error004/run
+++ b/tests/idris2/error004/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Error1.idr
 $1 --no-color --console-width 0 --check Error2.idr
 
-rm -rf build
diff --git a/tests/idris2/error005/run b/tests/idris2/error005/run
index b50aa3f46..944f42f7a 100755
--- a/tests/idris2/error005/run
+++ b/tests/idris2/error005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check IfErr.idr
 
-rm -rf build
diff --git a/tests/idris2/error006/run b/tests/idris2/error006/run
index b50aa3f46..944f42f7a 100755
--- a/tests/idris2/error006/run
+++ b/tests/idris2/error006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check IfErr.idr
 
-rm -rf build
diff --git a/tests/idris2/error007/run b/tests/idris2/error007/run
index b41d54680..3c883a3a8 100755
--- a/tests/idris2/error007/run
+++ b/tests/idris2/error007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check CongErr.idr
 
-rm -rf build
diff --git a/tests/idris2/error008/run b/tests/idris2/error008/run
index af457f53c..9af77ed8a 100755
--- a/tests/idris2/error008/run
+++ b/tests/idris2/error008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner DoesntExist.idr < input
 
-rm -rf build
diff --git a/tests/idris2/error009/run b/tests/idris2/error009/run
index d533fe6c6..7cdd60b99 100755
--- a/tests/idris2/error009/run
+++ b/tests/idris2/error009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Exists.idr < input
 
-rm -rf build
diff --git a/tests/idris2/error010/run b/tests/idris2/error010/run
index 5158f751a..2eb120f7a 100755
--- a/tests/idris2/error010/run
+++ b/tests/idris2/error010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Loop.idr --check
 
-rm -rf build
diff --git a/tests/idris2/error011/run b/tests/idris2/error011/run
index 7e85306bf..13e9190a9 100755
--- a/tests/idris2/error011/run
+++ b/tests/idris2/error011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 ConstructorDuplicate.idr --check
 
-rm -rf build
diff --git a/tests/idris2/error013/run b/tests/idris2/error013/run
index a106a97e1..d712f9313 100755
--- a/tests/idris2/error013/run
+++ b/tests/idris2/error013/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Issue361.idr --check
 
-rm -rf build/
\ No newline at end of file
diff --git a/tests/idris2/error014/run b/tests/idris2/error014/run
index ed404ba10..69c119d28 100755
--- a/tests/idris2/error014/run
+++ b/tests/idris2/error014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Issue735.idr --check
 
-rm -rf build/
\ No newline at end of file
diff --git a/tests/idris2/error015/run b/tests/idris2/error015/run
index 8a3eed082..7265d73ec 100755
--- a/tests/idris2/error015/run
+++ b/tests/idris2/error015/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Issue110.idr --check
 
-rm -rf build/
\ No newline at end of file
diff --git a/tests/idris2/error016/run b/tests/idris2/error016/run
index 200f9da59..7b96e2924 100755
--- a/tests/idris2/error016/run
+++ b/tests/idris2/error016/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check Issue1230.idr
 $1 --no-color --console-width 0 --no-banner < input
 
-rm -rf build/
\ No newline at end of file
diff --git a/tests/idris2/error017/run b/tests/idris2/error017/run
index 16a800fbc..1cb409bd1 100755
--- a/tests/idris2/error017/run
+++ b/tests/idris2/error017/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check Issue962.idr
 $1 --no-color --console-width 0 --no-banner --check Issue962-case.idr
 
-rm -rf build/
\ No newline at end of file
diff --git a/tests/idris2/error018/run b/tests/idris2/error018/run
index a753a88c5..577934214 100755
--- a/tests/idris2/error018/run
+++ b/tests/idris2/error018/run
@@ -1,6 +1,7 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check Issue1031.idr
 $1 --no-color --console-width 0 --no-banner --check Issue1031-2.idr
 $1 --no-color --console-width 0 --no-banner --check Issue1031-3.idr
 $1 --no-color --console-width 0 --no-banner --check Issue1031-4.idr
 
-rm -rf build/
\ No newline at end of file
diff --git a/tests/idris2/error019/run b/tests/idris2/error019/run
index 33bbf8d2d..ba2affa45 100644
--- a/tests/idris2/error019/run
+++ b/tests/idris2/error019/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner -Werror --check Error.idr
 
-rm -rf build/
diff --git a/tests/idris2/eta001/run b/tests/idris2/eta001/run
index 8ca09844d..66d7a5400 100755
--- a/tests/idris2/eta001/run
+++ b/tests/idris2/eta001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check Issue1370.idr
 
-rm -rf build
diff --git a/tests/idris2/evaluator001/run b/tests/idris2/evaluator001/run
index 0ef458e8d..db7ddef62 100755
--- a/tests/idris2/evaluator001/run
+++ b/tests/idris2/evaluator001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check Issue650.idr
 
-rm -rf build/
\ No newline at end of file
diff --git a/tests/idris2/evaluator002/run b/tests/idris2/evaluator002/run
index 17c595fd9..26a44c785 100644
--- a/tests/idris2/evaluator002/run
+++ b/tests/idris2/evaluator002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --log eval.stuck:5 Main.idr < input
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/evaluator003/run b/tests/idris2/evaluator003/run
index a3ca3c856..3be99a916 100644
--- a/tests/idris2/evaluator003/run
+++ b/tests/idris2/evaluator003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Issue705.idr < input
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/golden001/run b/tests/idris2/golden001/run
index eafb90465..527402fc1 100755
--- a/tests/idris2/golden001/run
+++ b/tests/idris2/golden001/run
@@ -1,7 +1,8 @@
+rm -rf build
+
 $1 --build hello.ipkg
 $1 --build test.ipkg
 
 ./build/exec/runtests ../build/exec/hello --no-colour
 
 
-rm -rf build
diff --git a/tests/idris2/import001/run b/tests/idris2/import001/run
index 78f8fcdb3..f14a67a4e 100755
--- a/tests/idris2/import001/run
+++ b/tests/idris2/import001/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Test.idr < input
 sleep 1
 touch Mult.idr
@@ -6,4 +8,3 @@ sleep 1
 touch Mult.idr
 $1 --no-color --console-width 0 --no-banner --no-prelude -Xcheck-hashes Test.idr < input
 
-rm -rf build
diff --git a/tests/idris2/import002/run b/tests/idris2/import002/run
index ad00cb0fc..83dae207e 100755
--- a/tests/idris2/import002/run
+++ b/tests/idris2/import002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 echo ':q' | $1 --no-color --console-width 0 --no-banner --no-prelude Test.idr
 
-rm -rf build
diff --git a/tests/idris2/import003/run b/tests/idris2/import003/run
index e34f56d9c..614c7ba86 100755
--- a/tests/idris2/import003/run
+++ b/tests/idris2/import003/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner B.idr < input
 $1 --no-color --console-width 0 --no-banner C.idr < input
 
-rm -rf build
diff --git a/tests/idris2/import004/run b/tests/idris2/import004/run
index 4f5322646..88536f8c1 100755
--- a/tests/idris2/import004/run
+++ b/tests/idris2/import004/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Cycle1.idr
 $1 --no-color --console-width 0 --no-banner Loop.idr
 
-rm -rf build
diff --git a/tests/idris2/import005/run b/tests/idris2/import005/run
index 70494eb2e..e90e564cb 100644
--- a/tests/idris2/import005/run
+++ b/tests/idris2/import005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner As.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive001/run b/tests/idris2/interactive001/run
index 99a80e91d..4de3af7ea 100755
--- a/tests/idris2/interactive001/run
+++ b/tests/idris2/interactive001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner LocType.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive002/run b/tests/idris2/interactive002/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive002/run
+++ b/tests/idris2/interactive002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive003/run b/tests/idris2/interactive003/run
index 238a41435..b82686155 100755
--- a/tests/idris2/interactive003/run
+++ b/tests/idris2/interactive003/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 $1 --no-color --console-width 0 --no-banner IEdit2.idr < input2
 
-rm -rf build
diff --git a/tests/idris2/interactive004/run b/tests/idris2/interactive004/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive004/run
+++ b/tests/idris2/interactive004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive005/run b/tests/idris2/interactive005/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive005/run
+++ b/tests/idris2/interactive005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive006/run b/tests/idris2/interactive006/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive006/run
+++ b/tests/idris2/interactive006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive007/run b/tests/idris2/interactive007/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive007/run
+++ b/tests/idris2/interactive007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive008/run b/tests/idris2/interactive008/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive008/run
+++ b/tests/idris2/interactive008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive009/run b/tests/idris2/interactive009/run
index 92d73a66c..770797118 100755
--- a/tests/idris2/interactive009/run
+++ b/tests/idris2/interactive009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Door.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive010/run b/tests/idris2/interactive010/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive010/run
+++ b/tests/idris2/interactive010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive011/run b/tests/idris2/interactive011/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive011/run
+++ b/tests/idris2/interactive011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive012/run b/tests/idris2/interactive012/run
index d5b38829a..fbbe7668f 100755
--- a/tests/idris2/interactive012/run
+++ b/tests/idris2/interactive012/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner WithLift.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive013/run b/tests/idris2/interactive013/run
index 2705a16c7..ec01540ff 100755
--- a/tests/idris2/interactive013/run
+++ b/tests/idris2/interactive013/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Spacing.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive014/run b/tests/idris2/interactive014/run
index fc48ad158..2fc948b6d 100755
--- a/tests/idris2/interactive014/run
+++ b/tests/idris2/interactive014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner case.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive015/run b/tests/idris2/interactive015/run
index 1141e249b..a5983e604 100755
--- a/tests/idris2/interactive015/run
+++ b/tests/idris2/interactive015/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive016/run b/tests/idris2/interactive016/run
index 470a73022..76f198ec8 100755
--- a/tests/idris2/interactive016/run
+++ b/tests/idris2/interactive016/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Cont.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive017/run b/tests/idris2/interactive017/run
index 600bf9f5e..139e5957a 100755
--- a/tests/idris2/interactive017/run
+++ b/tests/idris2/interactive017/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner RLE.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive018/run b/tests/idris2/interactive018/run
index 194fda348..935671bb2 100755
--- a/tests/idris2/interactive018/run
+++ b/tests/idris2/interactive018/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 PlusPrf.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive019/run b/tests/idris2/interactive019/run
index c6e4974bb..cb046c64f 100755
--- a/tests/idris2/interactive019/run
+++ b/tests/idris2/interactive019/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 TypeSearch.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive020/run b/tests/idris2/interactive020/run
index b60331b61..6f696478d 100755
--- a/tests/idris2/interactive020/run
+++ b/tests/idris2/interactive020/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Issue835.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive021/run b/tests/idris2/interactive021/run
index efbbe5542..ae9de69d9 100644
--- a/tests/idris2/interactive021/run
+++ b/tests/idris2/interactive021/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeAtDoNotation.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive022/run b/tests/idris2/interactive022/run
index 5448b78ec..afb9a56f7 100644
--- a/tests/idris2/interactive022/run
+++ b/tests/idris2/interactive022/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeAtBangSyntax.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive023/run b/tests/idris2/interactive023/run
index 2af6a0740..06875e3ac 100644
--- a/tests/idris2/interactive023/run
+++ b/tests/idris2/interactive023/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeAtLambda.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive024/run b/tests/idris2/interactive024/run
index ef30bd77c..a372b3207 100644
--- a/tests/idris2/interactive024/run
+++ b/tests/idris2/interactive024/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeAtAsPatterns.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive025/run b/tests/idris2/interactive025/run
index 65525aff6..7d28d868a 100644
--- a/tests/idris2/interactive025/run
+++ b/tests/idris2/interactive025/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeAtInterfaces.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive026/run b/tests/idris2/interactive026/run
index 64bcc95df..431c96b15 100644
--- a/tests/idris2/interactive026/run
+++ b/tests/idris2/interactive026/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeAtRecords.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive027/run b/tests/idris2/interactive027/run
index f35cc6296..fb9fcda04 100644
--- a/tests/idris2/interactive027/run
+++ b/tests/idris2/interactive027/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner TypeAtLocalVars.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive028/run b/tests/idris2/interactive028/run
index 565fcc184..47008ffee 100644
--- a/tests/idris2/interactive028/run
+++ b/tests/idris2/interactive028/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner < input
 
-rm -rf build
diff --git a/tests/idris2/interactive029/run b/tests/idris2/interactive029/run
index 69d9d63e5..6d0eaccae 100644
--- a/tests/idris2/interactive029/run
+++ b/tests/idris2/interactive029/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Issue834.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive030/run b/tests/idris2/interactive030/run
index 565fcc184..47008ffee 100644
--- a/tests/idris2/interactive030/run
+++ b/tests/idris2/interactive030/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner < input
 
-rm -rf build
diff --git a/tests/idris2/interactive031/run b/tests/idris2/interactive031/run
index 85d39785c..b55b11be9 100644
--- a/tests/idris2/interactive031/run
+++ b/tests/idris2/interactive031/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Signatures.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive032/run b/tests/idris2/interactive032/run
index 7179c9447..03f1054b6 100755
--- a/tests/idris2/interactive032/run
+++ b/tests/idris2/interactive032/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Uninh.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive033/run b/tests/idris2/interactive033/run
index 2b7053f87..656899a89 100755
--- a/tests/idris2/interactive033/run
+++ b/tests/idris2/interactive033/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner UninhIndent.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive034/run b/tests/idris2/interactive034/run
index f86d318f2..f3aca2d4f 100755
--- a/tests/idris2/interactive034/run
+++ b/tests/idris2/interactive034/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner timeout.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive035/run b/tests/idris2/interactive035/run
index b184b53e6..0f03f0c10 100755
--- a/tests/idris2/interactive035/run
+++ b/tests/idris2/interactive035/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner unify.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interactive036/run b/tests/idris2/interactive036/run
index 8dbd7505c..a267b92e6 100755
--- a/tests/idris2/interactive036/run
+++ b/tests/idris2/interactive036/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner casefn.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface001/run b/tests/idris2/interface001/run
index 0e58b44b8..a806a6dde 100755
--- a/tests/idris2/interface001/run
+++ b/tests/idris2/interface001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude IFace.idr < input
 $1 --no-color --console-width 0 --no-banner --no-prelude IFace1.idr < input1
 
-rm -rf build
diff --git a/tests/idris2/interface002/run b/tests/idris2/interface002/run
index 5e9c7a25f..5563286fa 100755
--- a/tests/idris2/interface002/run
+++ b/tests/idris2/interface002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Functor.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface003/run b/tests/idris2/interface003/run
index 7a008a6c9..618c69a3f 100755
--- a/tests/idris2/interface003/run
+++ b/tests/idris2/interface003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Do.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface004/run b/tests/idris2/interface004/run
index 7a008a6c9..618c69a3f 100755
--- a/tests/idris2/interface004/run
+++ b/tests/idris2/interface004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Do.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface005/run b/tests/idris2/interface005/run
index 33d624080..409c08cdc 100755
--- a/tests/idris2/interface005/run
+++ b/tests/idris2/interface005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Deps.idr
 
-rm -rf build
diff --git a/tests/idris2/interface006/run b/tests/idris2/interface006/run
index a6794abb6..b58b8f879 100755
--- a/tests/idris2/interface006/run
+++ b/tests/idris2/interface006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Bimonad.idr
 
-rm -rf build
diff --git a/tests/idris2/interface007/run b/tests/idris2/interface007/run
index 19c2e6d90..a0e29bcd4 100755
--- a/tests/idris2/interface007/run
+++ b/tests/idris2/interface007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --debug-elab-check --check A.idr
 
-rm -rf build
diff --git a/tests/idris2/interface008/run b/tests/idris2/interface008/run
index 33d624080..409c08cdc 100755
--- a/tests/idris2/interface008/run
+++ b/tests/idris2/interface008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Deps.idr
 
-rm -rf build
diff --git a/tests/idris2/interface009/run b/tests/idris2/interface009/run
index 111e664ac..410923665 100755
--- a/tests/idris2/interface009/run
+++ b/tests/idris2/interface009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Odd.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface010/run b/tests/idris2/interface010/run
index 0c447209c..fbe1c502e 100755
--- a/tests/idris2/interface010/run
+++ b/tests/idris2/interface010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Dep.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface011/run b/tests/idris2/interface011/run
index d78378c16..bc8bdeb63 100755
--- a/tests/idris2/interface011/run
+++ b/tests/idris2/interface011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 FuncImpl.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface012/run b/tests/idris2/interface012/run
index 37a1db0d9..5a1e4f1ff 100755
--- a/tests/idris2/interface012/run
+++ b/tests/idris2/interface012/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Defmeth.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface013/run b/tests/idris2/interface013/run
index a6be74e2d..db4956b19 100755
--- a/tests/idris2/interface013/run
+++ b/tests/idris2/interface013/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 TypeInt.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface014/run b/tests/idris2/interface014/run
index 6b3250d3c..801e16c9e 100755
--- a/tests/idris2/interface014/run
+++ b/tests/idris2/interface014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 DepInt.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface015/run b/tests/idris2/interface015/run
index f69ccb3a4..e1dd75df0 100755
--- a/tests/idris2/interface015/run
+++ b/tests/idris2/interface015/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 gnu.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface016/run b/tests/idris2/interface016/run
index a105f932b..3e8ceebd6 100755
--- a/tests/idris2/interface016/run
+++ b/tests/idris2/interface016/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 TwoNum.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface017/run b/tests/idris2/interface017/run
index 1dc961f00..4ab7e153f 100755
--- a/tests/idris2/interface017/run
+++ b/tests/idris2/interface017/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Tricho.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface018/run b/tests/idris2/interface018/run
index bf127297f..ff9a43b9a 100755
--- a/tests/idris2/interface018/run
+++ b/tests/idris2/interface018/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --no-color --no-banner --console-width 0 Sized.idr < input
 $1 --no-color --console-width 0 Sized2.idr --check
 $1 --no-color --console-width 0 Sized3.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface019/run b/tests/idris2/interface019/run
index b5985c645..ef3ceaa01 100755
--- a/tests/idris2/interface019/run
+++ b/tests/idris2/interface019/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 LocalHints.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface020/run b/tests/idris2/interface020/run
index 94375ced9..a808fb39b 100755
--- a/tests/idris2/interface020/run
+++ b/tests/idris2/interface020/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 LocalInterface.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface021/run b/tests/idris2/interface021/run
index 6b984617a..daecd89cd 100755
--- a/tests/idris2/interface021/run
+++ b/tests/idris2/interface021/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 LocalHint.idr --check
 
-rm -rf build
diff --git a/tests/idris2/interface022/run b/tests/idris2/interface022/run
index bc354d72a..72292dfe3 100755
--- a/tests/idris2/interface022/run
+++ b/tests/idris2/interface022/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --no-banner --console-width 0 DotMethod.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface023/run b/tests/idris2/interface023/run
index 4c94f3194..459af4861 100644
--- a/tests/idris2/interface023/run
+++ b/tests/idris2/interface023/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 AppComp.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface024/run b/tests/idris2/interface024/run
index df18ab570..e4d3a1bd6 100644
--- a/tests/idris2/interface024/run
+++ b/tests/idris2/interface024/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --check EH.idr -p contrib
 
-rm -rf build
diff --git a/tests/idris2/interface025/run b/tests/idris2/interface025/run
index 67279ad61..77aa67d35 100644
--- a/tests/idris2/interface025/run
+++ b/tests/idris2/interface025/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 AutoSearchHide2.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface026/run b/tests/idris2/interface026/run
index eacb12134..2569bc5bf 100644
--- a/tests/idris2/interface026/run
+++ b/tests/idris2/interface026/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 UninhabitedRec.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interface027/run b/tests/idris2/interface027/run
index 36a6838c0..07f8afa55 100644
--- a/tests/idris2/interface027/run
+++ b/tests/idris2/interface027/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 params.idr < input
 
-rm -rf build
diff --git a/tests/idris2/interpreter002/run b/tests/idris2/interpreter002/run
index 98f6061a4..f34822def 100755
--- a/tests/idris2/interpreter002/run
+++ b/tests/idris2/interpreter002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude < input
 
-rm -rf build
diff --git a/tests/idris2/interpreter005/run b/tests/idris2/interpreter005/run
index c8ffb8d83..80ed52e1c 100755
--- a/tests/idris2/interpreter005/run
+++ b/tests/idris2/interpreter005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Issue37.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/lazy001/run b/tests/idris2/lazy001/run
index 701bd6410..cd63b62cb 100755
--- a/tests/idris2/lazy001/run
+++ b/tests/idris2/lazy001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Lazy.idr < input
 
-rm -rf build
diff --git a/tests/idris2/lazy002/run b/tests/idris2/lazy002/run
index 440e1b01d..7e8f8f32d 100755
--- a/tests/idris2/lazy002/run
+++ b/tests/idris2/lazy002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner -p contrib LazyFoldlM.idr < input
 
-rm -rf build
diff --git a/tests/idris2/linear001/run b/tests/idris2/linear001/run
index 597a4b1aa..27dea045c 100755
--- a/tests/idris2/linear001/run
+++ b/tests/idris2/linear001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 echo ':q' | $1 --no-color --console-width 0 --no-banner --no-prelude Door.idr
 
-rm -rf build
diff --git a/tests/idris2/linear002/run b/tests/idris2/linear002/run
index 0941bc976..7af7dc699 100755
--- a/tests/idris2/linear002/run
+++ b/tests/idris2/linear002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Door.idr < input
 
-rm -rf build
diff --git a/tests/idris2/linear003/run b/tests/idris2/linear003/run
index 26bba547a..4ce1973ac 100755
--- a/tests/idris2/linear003/run
+++ b/tests/idris2/linear003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Linear.idr < input
 
-rm -rf build
diff --git a/tests/idris2/linear004/run b/tests/idris2/linear004/run
index f8f75932d..95b260a9d 100755
--- a/tests/idris2/linear004/run
+++ b/tests/idris2/linear004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Erase.idr < input
 
-rm -rf build
diff --git a/tests/idris2/linear005/run b/tests/idris2/linear005/run
index 92d73a66c..770797118 100755
--- a/tests/idris2/linear005/run
+++ b/tests/idris2/linear005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Door.idr < input
 
-rm -rf build
diff --git a/tests/idris2/linear006/run b/tests/idris2/linear006/run
index 76bd0608b..526c8f15a 100755
--- a/tests/idris2/linear006/run
+++ b/tests/idris2/linear006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner ZFun.idr < input
 
-rm -rf build
diff --git a/tests/idris2/linear007/run b/tests/idris2/linear007/run
index 1c055f61a..411d28f24 100755
--- a/tests/idris2/linear007/run
+++ b/tests/idris2/linear007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check LCase.idr
 
-rm -rf build
diff --git a/tests/idris2/linear008/run b/tests/idris2/linear008/run
index dc528ae97..928911b9e 100644
--- a/tests/idris2/linear008/run
+++ b/tests/idris2/linear008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Door.idr
 
-rm -rf build
diff --git a/tests/idris2/linear009/run b/tests/idris2/linear009/run
index d269332f5..f961f713a 100644
--- a/tests/idris2/linear009/run
+++ b/tests/idris2/linear009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner qtt.idr < input
 
-rm -rf build
diff --git a/tests/idris2/linear010/run b/tests/idris2/linear010/run
index 6cb5e489c..4e413bf8b 100644
--- a/tests/idris2/linear010/run
+++ b/tests/idris2/linear010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Door.idr -p contrib
 
-rm -rf build
diff --git a/tests/idris2/linear011/run b/tests/idris2/linear011/run
index bee02fb8e..5ed41f82b 100644
--- a/tests/idris2/linear011/run
+++ b/tests/idris2/linear011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Network.idr -p contrib -p network < input
 
-rm -rf build
diff --git a/tests/idris2/linear012/run b/tests/idris2/linear012/run
index e23c29b3f..5cb88637c 100644
--- a/tests/idris2/linear012/run
+++ b/tests/idris2/linear012/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner linholes.idr < input
 
-rm -rf build
diff --git a/tests/idris2/linear013/run b/tests/idris2/linear013/run
index 287d9b43f..49f1857c2 100644
--- a/tests/idris2/linear013/run
+++ b/tests/idris2/linear013/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Issue758.idr < input
 
-rm -rf build
diff --git a/tests/idris2/literate001/run b/tests/idris2/literate001/run
index 9af2ee2de..1157580b9 100755
--- a/tests/idris2/literate001/run
+++ b/tests/idris2/literate001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate002/run b/tests/idris2/literate002/run
index f40a6d5b3..f4553c00a 100755
--- a/tests/idris2/literate002/run
+++ b/tests/idris2/literate002/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.lidr < input
 $1 --no-color --console-width 0 --no-banner IEdit2.lidr < input2
 
-rm -rf build
diff --git a/tests/idris2/literate003/run b/tests/idris2/literate003/run
index 9af2ee2de..1157580b9 100755
--- a/tests/idris2/literate003/run
+++ b/tests/idris2/literate003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate004/run b/tests/idris2/literate004/run
index 9af2ee2de..1157580b9 100755
--- a/tests/idris2/literate004/run
+++ b/tests/idris2/literate004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate005/run b/tests/idris2/literate005/run
index 9af2ee2de..1157580b9 100755
--- a/tests/idris2/literate005/run
+++ b/tests/idris2/literate005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate006/run b/tests/idris2/literate006/run
index 0ebd8f379..753346bbf 100755
--- a/tests/idris2/literate006/run
+++ b/tests/idris2/literate006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Door.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate007/run b/tests/idris2/literate007/run
index 7b751a270..242ed5b5c 100755
--- a/tests/idris2/literate007/run
+++ b/tests/idris2/literate007/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.lidr < input
 $1 --no-color --console-width 0 --no-banner IEditOrg.org < input2
 
-rm -rf build
diff --git a/tests/idris2/literate008/run b/tests/idris2/literate008/run
index 9af2ee2de..1157580b9 100755
--- a/tests/idris2/literate008/run
+++ b/tests/idris2/literate008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate009/run b/tests/idris2/literate009/run
index 954aa2826..30d3987b2 100755
--- a/tests/idris2/literate009/run
+++ b/tests/idris2/literate009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner WithLift.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate010/run b/tests/idris2/literate010/run
index d9f05e0e7..2eb4783fa 100755
--- a/tests/idris2/literate010/run
+++ b/tests/idris2/literate010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check --no-banner MyFirstIdrisProgram.org
 
-rm -rf build
diff --git a/tests/idris2/literate011/run b/tests/idris2/literate011/run
index 63fb85558..ec6152229 100755
--- a/tests/idris2/literate011/run
+++ b/tests/idris2/literate011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.md < input
 
-rm -rf build
diff --git a/tests/idris2/literate012/run b/tests/idris2/literate012/run
index a7f2e2344..a5104b95b 100755
--- a/tests/idris2/literate012/run
+++ b/tests/idris2/literate012/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.org < input
 
-rm -rf build
diff --git a/tests/idris2/literate013/run b/tests/idris2/literate013/run
index 333c3452e..829bc5c3f 100755
--- a/tests/idris2/literate013/run
+++ b/tests/idris2/literate013/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check Lit.lidr
 $1 --no-color --console-width 0 --no-banner --check LitTeX.tex
-rm -rf build
diff --git a/tests/idris2/literate014/run b/tests/idris2/literate014/run
index 15c1f260a..347151fde 100755
--- a/tests/idris2/literate014/run
+++ b/tests/idris2/literate014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner with.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate015/run b/tests/idris2/literate015/run
index 71a73737b..542885797 100755
--- a/tests/idris2/literate015/run
+++ b/tests/idris2/literate015/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner case.lidr < input
 
-rm -rf build
diff --git a/tests/idris2/literate016/run b/tests/idris2/literate016/run
index a7f2e2344..a5104b95b 100755
--- a/tests/idris2/literate016/run
+++ b/tests/idris2/literate016/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner IEdit.org < input
 
-rm -rf build
diff --git a/tests/idris2/namespace001/run b/tests/idris2/namespace001/run
index 2dd03672d..3c80c945c 100644
--- a/tests/idris2/namespace001/run
+++ b/tests/idris2/namespace001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 echo ':q' | $1 --no-color --console-width 0 --no-banner Dup.idr
 echo ':t Test' | $1 --no-color --console-width 0 --no-banner Scope.idr
 
-rm -rf build
diff --git a/tests/idris2/params001/run b/tests/idris2/params001/run
index 69dea4710..522748355 100755
--- a/tests/idris2/params001/run
+++ b/tests/idris2/params001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check param.idr
 $1 --no-color --console-width 0 --no-banner --check parambad.idr
 
-rm -rf build
diff --git a/tests/idris2/params002/run b/tests/idris2/params002/run
index 2e10a2e94..b04279265 100755
--- a/tests/idris2/params002/run
+++ b/tests/idris2/params002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner ParamsPrint.idr < input
 
-rm -rf build
diff --git a/tests/idris2/params003/run b/tests/idris2/params003/run
index 0d0747723..bf83222df 100755
--- a/tests/idris2/params003/run
+++ b/tests/idris2/params003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner casesplit.idr < input
 
-rm -rf build
diff --git a/tests/idris2/perf001/run b/tests/idris2/perf001/run
index cd36ea611..e328ebd8d 100755
--- a/tests/idris2/perf001/run
+++ b/tests/idris2/perf001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Big.idr
 
-rm -rf build
diff --git a/tests/idris2/perf002/run b/tests/idris2/perf002/run
index cd36ea611..e328ebd8d 100755
--- a/tests/idris2/perf002/run
+++ b/tests/idris2/perf002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Big.idr
 
-rm -rf build
diff --git a/tests/idris2/perf003/run b/tests/idris2/perf003/run
index 87caefbc2..499008676 100755
--- a/tests/idris2/perf003/run
+++ b/tests/idris2/perf003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Auto.idr
 
-rm -rf build
diff --git a/tests/idris2/perf004/run b/tests/idris2/perf004/run
index 6d4b24468..71fd0c56f 100755
--- a/tests/idris2/perf004/run
+++ b/tests/idris2/perf004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check bigdpair.idr
 
-rm -rf build
diff --git a/tests/idris2/perf005/run b/tests/idris2/perf005/run
index ca5fccee2..67bfd9e53 100755
--- a/tests/idris2/perf005/run
+++ b/tests/idris2/perf005/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Lambda.idr
 
 $1 --no-color --console-width 0 --check Bad1.idr
@@ -6,4 +8,3 @@ $1 --no-color --console-width 0 --check Bad2.idr
 
 $1 --no-color --console-width 0 --check Bad3.idr
 
-rm -rf build
diff --git a/tests/idris2/perf007/run b/tests/idris2/perf007/run
index 0d1ea08ab..63c6f890d 100644
--- a/tests/idris2/perf007/run
+++ b/tests/idris2/perf007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --check Slooow.idr
 
-rm -rf build
diff --git a/tests/idris2/perf008/run b/tests/idris2/perf008/run
index 1a5f708e1..642c3b27c 100644
--- a/tests/idris2/perf008/run
+++ b/tests/idris2/perf008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 FinPerf.idr --exec main
 
-rm -rf build/
diff --git a/tests/idris2/perror001/run b/tests/idris2/perror001/run
index 65133be9c..341244919 100755
--- a/tests/idris2/perror001/run
+++ b/tests/idris2/perror001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check PError.idr
 
-rm -rf build
diff --git a/tests/idris2/perror002/run b/tests/idris2/perror002/run
index 65133be9c..341244919 100755
--- a/tests/idris2/perror002/run
+++ b/tests/idris2/perror002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check PError.idr
 
-rm -rf build
diff --git a/tests/idris2/perror003/run b/tests/idris2/perror003/run
index d9e626dc9..500fb9052 100755
--- a/tests/idris2/perror003/run
+++ b/tests/idris2/perror003/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check PError.idr
 $1 --no-color --console-width 0 --check PError2.idr
 
-rm -rf build
diff --git a/tests/idris2/perror004/run b/tests/idris2/perror004/run
index 65133be9c..341244919 100755
--- a/tests/idris2/perror004/run
+++ b/tests/idris2/perror004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check PError.idr
 
-rm -rf build
diff --git a/tests/idris2/perror005/run b/tests/idris2/perror005/run
index 65133be9c..341244919 100755
--- a/tests/idris2/perror005/run
+++ b/tests/idris2/perror005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check PError.idr
 
-rm -rf build
diff --git a/tests/idris2/perror006/run b/tests/idris2/perror006/run
index 65133be9c..341244919 100755
--- a/tests/idris2/perror006/run
+++ b/tests/idris2/perror006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check PError.idr
 
-rm -rf build
diff --git a/tests/idris2/perror007/run b/tests/idris2/perror007/run
index c35e9dc60..951c2ccd1 100755
--- a/tests/idris2/perror007/run
+++ b/tests/idris2/perror007/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check StrError1.idr || true
 $1 --no-color --console-width 0 --check StrError2.idr || true
 $1 --no-color --console-width 0 --check StrError3.idr || true
@@ -11,4 +13,3 @@ $1 --no-color --console-width 0 --check StrError10.idr || true
 $1 --no-color --console-width 0 --check StrError11.idr || true
 $1 --no-color --console-width 0 --check StrError12.idr || true
 
-rm -rf build
diff --git a/tests/idris2/perror008/run b/tests/idris2/perror008/run
index 09d561bb9..9464c8f20 100755
--- a/tests/idris2/perror008/run
+++ b/tests/idris2/perror008/run
@@ -1,3 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Issue710a.idr || true
 $1 --no-color --console-width 0 --check Issue710b.idr || true
 $1 --no-color --console-width 0 --check Issue710c.idr || true
@@ -8,4 +10,3 @@ $1 --no-color --console-width 0 --check Issue710f.idr || true
 $1 --no-color --console-width 0 --check Issue1224a.idr || true
 $1 --no-color --console-width 0 --check Issue1224b.idr || true
 
-rm -rf build
diff --git a/tests/idris2/pkg001/run b/tests/idris2/pkg001/run
index 0da437ff2..fa9604f3f 100755
--- a/tests/idris2/pkg001/run
+++ b/tests/idris2/pkg001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --build dummy.ipkg
 
-rm -rf build
diff --git a/tests/idris2/pkg002/run b/tests/idris2/pkg002/run
index 4b6dfd2dd..74a38aba0 100755
--- a/tests/idris2/pkg002/run
+++ b/tests/idris2/pkg002/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 cd src/Top
 $1 --find-ipkg --check Dummy.idr
 cd ../..
 
-rm -rf build
diff --git a/tests/idris2/pkg004/run b/tests/idris2/pkg004/run
index 3e75fd7db..f27e74a2d 100755
--- a/tests/idris2/pkg004/run
+++ b/tests/idris2/pkg004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --repl dummy.ipkg < input
 
-rm -rf build
diff --git a/tests/idris2/pkg005/run b/tests/idris2/pkg005/run
index 2d2d438e5..0b6a055a9 100755
--- a/tests/idris2/pkg005/run
+++ b/tests/idris2/pkg005/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --clean foo.ipkg
 $1 --repl foo.ipkg < input
 $1 --repl foo.ipkg < input
 
-rm -rf build
diff --git a/tests/idris2/pkg006/run b/tests/idris2/pkg006/run
index 8359b90cb..34835befc 100755
--- a/tests/idris2/pkg006/run
+++ b/tests/idris2/pkg006/run
@@ -1,7 +1,8 @@
+rm -rf build
+
 $1 --build test1.ipkg
 $1 --build test2.ipkg
 $1 --build test3.ipkg
 $1 --build test4.ipkg
 $1 --build test5.ipkg
 
-rm -rf build
diff --git a/tests/idris2/positivity001/run b/tests/idris2/positivity001/run
index eaf79029f..37a2509d4 100644
--- a/tests/idris2/positivity001/run
+++ b/tests/idris2/positivity001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Issue660.idr --check
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/positivity002/run b/tests/idris2/positivity002/run
index eaf79029f..37a2509d4 100644
--- a/tests/idris2/positivity002/run
+++ b/tests/idris2/positivity002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Issue660.idr --check
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/positivity003/run b/tests/idris2/positivity003/run
index eaf79029f..37a2509d4 100644
--- a/tests/idris2/positivity003/run
+++ b/tests/idris2/positivity003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Issue660.idr --check
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/positivity004/run b/tests/idris2/positivity004/run
index a1c6501fb..53807cc02 100644
--- a/tests/idris2/positivity004/run
+++ b/tests/idris2/positivity004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 Issue524.idr --check
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/idris2/pretty001/run b/tests/idris2/pretty001/run
index 78105a68b..674b63cfb 100644
--- a/tests/idris2/pretty001/run
+++ b/tests/idris2/pretty001/run
@@ -1,2 +1,3 @@
-$1 --no-color --console-width 0 --no-banner Issue1328A.idr < input
 rm -rf build
+
+$1 --no-color --console-width 0 --no-banner Issue1328A.idr < input
diff --git a/tests/idris2/real001/run b/tests/idris2/real001/run
index 1040061a3..7108a56ac 100644
--- a/tests/idris2/real001/run
+++ b/tests/idris2/real001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check TestProto.idr
 #$1 --no-color --console-width 0 --check MakeChans.idr
 
-rm -rf build
diff --git a/tests/idris2/real002/run b/tests/idris2/real002/run
index cca874c41..447a958c9 100644
--- a/tests/idris2/real002/run
+++ b/tests/idris2/real002/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Store.idr
 $1 --no-color --console-width 0 --check StoreL.idr
 
-rm -rf build
diff --git a/tests/idris2/record001/run b/tests/idris2/record001/run
index 44414673f..77e8ba283 100755
--- a/tests/idris2/record001/run
+++ b/tests/idris2/record001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Record.idr < input
 
-rm -rf build
diff --git a/tests/idris2/record002/run b/tests/idris2/record002/run
index 44414673f..77e8ba283 100755
--- a/tests/idris2/record002/run
+++ b/tests/idris2/record002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Record.idr < input
 
-rm -rf build
diff --git a/tests/idris2/record003/run b/tests/idris2/record003/run
index c15daba55..d5f64b07d 100755
--- a/tests/idris2/record003/run
+++ b/tests/idris2/record003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 -c --no-color --console-width 0 --no-banner Record.idr
 
-rm -rf build
diff --git a/tests/idris2/record004/run b/tests/idris2/record004/run
index deba354b0..600229413 100755
--- a/tests/idris2/record004/run
+++ b/tests/idris2/record004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Main.idr < input
 
-rm -rf build
diff --git a/tests/idris2/record005/run b/tests/idris2/record005/run
index 075d41092..339b3ef5a 100755
--- a/tests/idris2/record005/run
+++ b/tests/idris2/record005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Fld.idr < input
 
-rm -rf build
diff --git a/tests/idris2/record006/run b/tests/idris2/record006/run
index 075d41092..339b3ef5a 100755
--- a/tests/idris2/record006/run
+++ b/tests/idris2/record006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Fld.idr < input
 
-rm -rf build
diff --git a/tests/idris2/record007/run b/tests/idris2/record007/run
index 999b3bb7d..52df0913a 100755
--- a/tests/idris2/record007/run
+++ b/tests/idris2/record007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Bond.idr < input
 
-rm -rf build
diff --git a/tests/idris2/record008/run b/tests/idris2/record008/run
index e272c9b07..dc4e51ad4 100755
--- a/tests/idris2/record008/run
+++ b/tests/idris2/record008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Postfix.idr < input
 
-rm -rf build
diff --git a/tests/idris2/record009/run b/tests/idris2/record009/run
index cd4737a89..2dec80a33 100755
--- a/tests/idris2/record009/run
+++ b/tests/idris2/record009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner record.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reflection001/run b/tests/idris2/reflection001/run
index 4e3420c0f..eecdb30db 100755
--- a/tests/idris2/reflection001/run
+++ b/tests/idris2/reflection001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner quote.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reflection002/run b/tests/idris2/reflection002/run
index bb32aa8bd..ce864d2d0 100755
--- a/tests/idris2/reflection002/run
+++ b/tests/idris2/reflection002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner power.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reflection003/run b/tests/idris2/reflection003/run
index 4cdbe00a6..4317b7225 100755
--- a/tests/idris2/reflection003/run
+++ b/tests/idris2/reflection003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 refprims.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reflection004/run b/tests/idris2/reflection004/run
index 764092cbf..0429c5cc3 100755
--- a/tests/idris2/reflection004/run
+++ b/tests/idris2/reflection004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner refdecl.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reflection005/run b/tests/idris2/reflection005/run
index 764092cbf..0429c5cc3 100755
--- a/tests/idris2/reflection005/run
+++ b/tests/idris2/reflection005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner refdecl.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reflection006/run b/tests/idris2/reflection006/run
index 299671493..535b44e96 100755
--- a/tests/idris2/reflection006/run
+++ b/tests/idris2/reflection006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check refleq.idr
 
-rm -rf build
diff --git a/tests/idris2/reflection007/run b/tests/idris2/reflection007/run
index ef9669d1a..1dbad3053 100755
--- a/tests/idris2/reflection007/run
+++ b/tests/idris2/reflection007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner NatExpr.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reflection008/run b/tests/idris2/reflection008/run
index 2ba0db697..43847fecc 100755
--- a/tests/idris2/reflection008/run
+++ b/tests/idris2/reflection008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Interp.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reflection009/run b/tests/idris2/reflection009/run
index 24775d00c..6fe7bf109 100755
--- a/tests/idris2/reflection009/run
+++ b/tests/idris2/reflection009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check perf.idr
 
-rm -rf build
diff --git a/tests/idris2/reg001/run b/tests/idris2/reg001/run
index 96531b9ff..0b9d5f35e 100755
--- a/tests/idris2/reg001/run
+++ b/tests/idris2/reg001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check D.idr
 
-rm -rf build
diff --git a/tests/idris2/reg002/run b/tests/idris2/reg002/run
index 92b000fe3..c0d757d48 100755
--- a/tests/idris2/reg002/run
+++ b/tests/idris2/reg002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check linm.idr
 
-rm -rf build
diff --git a/tests/idris2/reg003/run b/tests/idris2/reg003/run
index 6ca79cef3..ad06951a3 100755
--- a/tests/idris2/reg003/run
+++ b/tests/idris2/reg003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --no-prelude Holes.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reg004/run b/tests/idris2/reg004/run
index ae055d721..1d2365fb4 100755
--- a/tests/idris2/reg004/run
+++ b/tests/idris2/reg004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check ambig.idr
 
-rm -rf build
diff --git a/tests/idris2/reg005/run b/tests/idris2/reg005/run
index e864e9080..2c5473229 100755
--- a/tests/idris2/reg005/run
+++ b/tests/idris2/reg005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check iftype.idr
 
-rm -rf build
diff --git a/tests/idris2/reg006/run b/tests/idris2/reg006/run
index 309de73de..8c77da2d3 100755
--- a/tests/idris2/reg006/run
+++ b/tests/idris2/reg006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Cmd.idr
 
-rm -rf build
diff --git a/tests/idris2/reg007/run b/tests/idris2/reg007/run
index adc522221..c3f47a417 100755
--- a/tests/idris2/reg007/run
+++ b/tests/idris2/reg007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Main.idr
 
-rm -rf build
diff --git a/tests/idris2/reg008/run b/tests/idris2/reg008/run
index f0b6ff130..fcb449932 100755
--- a/tests/idris2/reg008/run
+++ b/tests/idris2/reg008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Vending.idr --no-banner --debug-elab-check < input
 
-rm -rf build
diff --git a/tests/idris2/reg009/run b/tests/idris2/reg009/run
index fd7bc840e..2f746b23a 100755
--- a/tests/idris2/reg009/run
+++ b/tests/idris2/reg009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Case.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg010/run b/tests/idris2/reg010/run
index b6675c277..f1bacdfa5 100755
--- a/tests/idris2/reg010/run
+++ b/tests/idris2/reg010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Recordname.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg011/run b/tests/idris2/reg011/run
index f7674fe1c..85017a2fd 100755
--- a/tests/idris2/reg011/run
+++ b/tests/idris2/reg011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 mut.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg012/run b/tests/idris2/reg012/run
index 9a4958917..dd7af0aee 100755
--- a/tests/idris2/reg012/run
+++ b/tests/idris2/reg012/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Foo.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg013/run b/tests/idris2/reg013/run
index ef49db5c0..0687bb1ec 100755
--- a/tests/idris2/reg013/run
+++ b/tests/idris2/reg013/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 UnboundImplicits.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg014/run b/tests/idris2/reg014/run
index 8c431002e..95660f141 100755
--- a/tests/idris2/reg014/run
+++ b/tests/idris2/reg014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 casecase.idr --check --debug-elab-check
 
-rm -rf build
diff --git a/tests/idris2/reg015/run b/tests/idris2/reg015/run
index 25dc886d3..c03ffb24c 100755
--- a/tests/idris2/reg015/run
+++ b/tests/idris2/reg015/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 anyfail.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg016/run b/tests/idris2/reg016/run
index 5a23aa265..24bd5e240 100755
--- a/tests/idris2/reg016/run
+++ b/tests/idris2/reg016/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Using.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg017/run b/tests/idris2/reg017/run
index dec6a70df..096ac67be 100755
--- a/tests/idris2/reg017/run
+++ b/tests/idris2/reg017/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 lammult.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg018/run b/tests/idris2/reg018/run
index b1766de6f..3ff6b91ee 100755
--- a/tests/idris2/reg018/run
+++ b/tests/idris2/reg018/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 cycle.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg019/run b/tests/idris2/reg019/run
index f66271248..f4c962db6 100755
--- a/tests/idris2/reg019/run
+++ b/tests/idris2/reg019/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 lazybug.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg020/run b/tests/idris2/reg020/run
index 61a290bcb..2488030b0 100755
--- a/tests/idris2/reg020/run
+++ b/tests/idris2/reg020/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 matchlits.idr --no-banner < input
 
-rm -rf build
diff --git a/tests/idris2/reg021/run b/tests/idris2/reg021/run
index ae7c2e01d..2204818c0 100755
--- a/tests/idris2/reg021/run
+++ b/tests/idris2/reg021/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check case.idr
 
-rm -rf build
diff --git a/tests/idris2/reg022/run b/tests/idris2/reg022/run
index ae7c2e01d..2204818c0 100755
--- a/tests/idris2/reg022/run
+++ b/tests/idris2/reg022/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check case.idr
 
-rm -rf build
diff --git a/tests/idris2/reg023/run b/tests/idris2/reg023/run
index 45d57ea54..5a44b0870 100755
--- a/tests/idris2/reg023/run
+++ b/tests/idris2/reg023/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check boom.idr
 
-rm -rf build
diff --git a/tests/idris2/reg024/run b/tests/idris2/reg024/run
index 0bb50dd54..456d6ed0e 100755
--- a/tests/idris2/reg024/run
+++ b/tests/idris2/reg024/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner split.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reg025/run b/tests/idris2/reg025/run
index 318528f3d..718347d05 100755
--- a/tests/idris2/reg025/run
+++ b/tests/idris2/reg025/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner lift.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reg026/run b/tests/idris2/reg026/run
index 9b0a193b0..c42b04ff7 100755
--- a/tests/idris2/reg026/run
+++ b/tests/idris2/reg026/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Meh.idr
 
-rm -rf build
diff --git a/tests/idris2/reg027/run b/tests/idris2/reg027/run
index d8dc0efc6..ac597bc18 100755
--- a/tests/idris2/reg027/run
+++ b/tests/idris2/reg027/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check pwhere.idr
 
-rm -rf build
diff --git a/tests/idris2/reg028/run b/tests/idris2/reg028/run
index b98f33ff9..586e9799f 100755
--- a/tests/idris2/reg028/run
+++ b/tests/idris2/reg028/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Test.idr
 
-rm -rf build
diff --git a/tests/idris2/reg029/run b/tests/idris2/reg029/run
index e916a0edc..dccce0291 100755
--- a/tests/idris2/reg029/run
+++ b/tests/idris2/reg029/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check lqueue.idr
 
-rm -rf build
diff --git a/tests/idris2/reg030/run b/tests/idris2/reg030/run
index 76867f726..713144059 100755
--- a/tests/idris2/reg030/run
+++ b/tests/idris2/reg030/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check A.idr
 
-rm -rf build
diff --git a/tests/idris2/reg031/run b/tests/idris2/reg031/run
index 6330e440e..990276edb 100755
--- a/tests/idris2/reg031/run
+++ b/tests/idris2/reg031/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check dpair.idr
 
-rm -rf build
diff --git a/tests/idris2/reg032/run b/tests/idris2/reg032/run
index 3373bae5f..68d2f832b 100755
--- a/tests/idris2/reg032/run
+++ b/tests/idris2/reg032/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check recupdate.idr
 
-rm -rf build
diff --git a/tests/idris2/reg033/run b/tests/idris2/reg033/run
index 82a98fdfd..c886d939f 100755
--- a/tests/idris2/reg033/run
+++ b/tests/idris2/reg033/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check test.idr
 
-rm -rf build
diff --git a/tests/idris2/reg034/run b/tests/idris2/reg034/run
index 07f7ba2ea..091b7eb34 100755
--- a/tests/idris2/reg034/run
+++ b/tests/idris2/reg034/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check void.idr
 
-rm -rf build
diff --git a/tests/idris2/reg035/run b/tests/idris2/reg035/run
index 803592018..3021eaf6e 100755
--- a/tests/idris2/reg035/run
+++ b/tests/idris2/reg035/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Implicit.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg036/run b/tests/idris2/reg036/run
index e6ae2e49d..8bf84b6b0 100755
--- a/tests/idris2/reg036/run
+++ b/tests/idris2/reg036/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Test.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg037/run b/tests/idris2/reg037/run
index e6ae2e49d..8bf84b6b0 100755
--- a/tests/idris2/reg037/run
+++ b/tests/idris2/reg037/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Test.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg038/run b/tests/idris2/reg038/run
index 2299026b8..a8d8e647f 100755
--- a/tests/idris2/reg038/run
+++ b/tests/idris2/reg038/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 Test1.idr --check
 $1 --no-color --console-width 0 Test2.idr --check
 
-rm -rf build
diff --git a/tests/idris2/reg039/run b/tests/idris2/reg039/run
index 2e94425ac..c34c5ac5b 100755
--- a/tests/idris2/reg039/run
+++ b/tests/idris2/reg039/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check dupdup.idr
 
-rm -rf build
diff --git a/tests/idris2/reg040/run b/tests/idris2/reg040/run
index e87b34a3a..c897e5dce 100755
--- a/tests/idris2/reg040/run
+++ b/tests/idris2/reg040/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check CoverBug.idr
 
-rm -rf build
diff --git a/tests/idris2/reg041/run b/tests/idris2/reg041/run
index 6541f5f3b..33a85b5e2 100755
--- a/tests/idris2/reg041/run
+++ b/tests/idris2/reg041/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check tuple.idr
 
-rm -rf build
diff --git a/tests/idris2/reg042/run b/tests/idris2/reg042/run
index 63d6030e2..f03173688 100644
--- a/tests/idris2/reg042/run
+++ b/tests/idris2/reg042/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner NatOpts.idr < input
 
-rm -rf build
diff --git a/tests/idris2/reg043/run b/tests/idris2/reg043/run
index ec5c7884b..f18707b76 100755
--- a/tests/idris2/reg043/run
+++ b/tests/idris2/reg043/run
@@ -1,6 +1,7 @@
+rm -rf build
+
 mkdir -p build/ttc
 echo "TT2This Is A Fake TTC" > build/ttc/Fake.ttc
 
 $1 --no-color --console-width 0 --check TestFake.idr
 
-rm -rf build
diff --git a/tests/idris2/reg044/run b/tests/idris2/reg044/run
index 327219cc5..d4edee6e1 100755
--- a/tests/idris2/reg044/run
+++ b/tests/idris2/reg044/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Methods.idr
 
-rm -rf build
diff --git a/tests/idris2/total001/run b/tests/idris2/total001/run
index 09d88e0cc..4f97a2d2d 100755
--- a/tests/idris2/total001/run
+++ b/tests/idris2/total001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Total.idr < input
 
-rm -rf build
diff --git a/tests/idris2/total002/run b/tests/idris2/total002/run
index 09d88e0cc..4f97a2d2d 100755
--- a/tests/idris2/total002/run
+++ b/tests/idris2/total002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Total.idr < input
 
-rm -rf build
diff --git a/tests/idris2/total003/run b/tests/idris2/total003/run
index 09d88e0cc..4f97a2d2d 100755
--- a/tests/idris2/total003/run
+++ b/tests/idris2/total003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Total.idr < input
 
-rm -rf build
diff --git a/tests/idris2/total004/run b/tests/idris2/total004/run
index 09d88e0cc..4f97a2d2d 100755
--- a/tests/idris2/total004/run
+++ b/tests/idris2/total004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Total.idr < input
 
-rm -rf build
diff --git a/tests/idris2/total005/run b/tests/idris2/total005/run
index 09d88e0cc..4f97a2d2d 100755
--- a/tests/idris2/total005/run
+++ b/tests/idris2/total005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Total.idr < input
 
-rm -rf build
diff --git a/tests/idris2/total006/run b/tests/idris2/total006/run
index 09d88e0cc..4f97a2d2d 100755
--- a/tests/idris2/total006/run
+++ b/tests/idris2/total006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Total.idr < input
 
-rm -rf build
diff --git a/tests/idris2/total007/run b/tests/idris2/total007/run
index 53ccef5db..d1891c919 100755
--- a/tests/idris2/total007/run
+++ b/tests/idris2/total007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner partial.idr --check
 
-rm -rf build
diff --git a/tests/idris2/total008/run b/tests/idris2/total008/run
index 53ccef5db..d1891c919 100755
--- a/tests/idris2/total008/run
+++ b/tests/idris2/total008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner partial.idr --check
 
-rm -rf build
diff --git a/tests/idris2/total009/run b/tests/idris2/total009/run
index c703e4b8c..65d1dce1e 100755
--- a/tests/idris2/total009/run
+++ b/tests/idris2/total009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 tree.idr --check
 
-rm -rf build
diff --git a/tests/idris2/total010/run b/tests/idris2/total010/run
index e5bbd1bd9..a31050712 100755
--- a/tests/idris2/total010/run
+++ b/tests/idris2/total010/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 PartialWith.idr --check
 
-rm -rf build
diff --git a/tests/idris2/warning001/run b/tests/idris2/warning001/run
index a5d45e6ba..22324f1d3 100755
--- a/tests/idris2/warning001/run
+++ b/tests/idris2/warning001/run
@@ -1,7 +1,8 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Issue539.idr
 $1 --no-color --console-width 0 --check Issue621.idr
 $1 --no-color --console-width 0 --check Issue1401.idr
 $1 --no-color --console-width 0 --check PR1407.idr
 $1 --no-color --console-width 0 --check Holes.idr
 
-rm -rf build
diff --git a/tests/idris2/with001/run b/tests/idris2/with001/run
index f5073c2d8..fd57b8850 100755
--- a/tests/idris2/with001/run
+++ b/tests/idris2/with001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Temp.idr
 
-rm -rf build
diff --git a/tests/idris2/with002/run b/tests/idris2/with002/run
index f5073c2d8..fd57b8850 100755
--- a/tests/idris2/with002/run
+++ b/tests/idris2/with002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --check Temp.idr
 
-rm -rf build
diff --git a/tests/idris2/with003/run b/tests/idris2/with003/run
index deba354b0..600229413 100755
--- a/tests/idris2/with003/run
+++ b/tests/idris2/with003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Main.idr < input
 
-rm -rf build
diff --git a/tests/idris2/with004/run b/tests/idris2/with004/run
index 033e0f613..ba6fdcd70 100755
--- a/tests/idris2/with004/run
+++ b/tests/idris2/with004/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Issue637.idr < input
 $1 --no-color --console-width 0 --no-banner --check Issue637-2.idr
 $1 --no-color --console-width 0 --no-banner --check Issue637-3.idr
 
-rm -rf build
diff --git a/tests/idris2/with005/run b/tests/idris2/with005/run
index 49f0023fb..3f5656cda 100755
--- a/tests/idris2/with005/run
+++ b/tests/idris2/with005/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner --check WithProof.idr
 $1 --no-color --console-width 0 --no-banner --check Issue893.idr
 
-rm -rf build
diff --git a/tests/node/args/run b/tests/node/args/run
index 12dc17c51..c3c2880f7 100644
--- a/tests/node/args/run
+++ b/tests/node/args/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg node -o node_args TestArgs.idr > /dev/null
 node ./build/exec/node_args a b
 node ./build/exec/node_args c
 
-rm -rf build
diff --git a/tests/node/bitops/run b/tests/node/bitops/run
index 0ee1f73d5..5d135d8ec 100644
--- a/tests/node/bitops/run
+++ b/tests/node/bitops/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --cg node --no-banner --no-color --console-width 0 BitOps.idr < input
 
-rm -rf build
diff --git a/tests/node/casts/run b/tests/node/casts/run
index 7fe802eeb..c795c59c7 100644
--- a/tests/node/casts/run
+++ b/tests/node/casts/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --cg node --no-banner --no-color --console-width 0 Casts.idr < input
 
-rm -rf build
diff --git a/tests/node/idiom001/run b/tests/node/idiom001/run
index 33859be5a..cb2af60ef 100644
--- a/tests/node/idiom001/run
+++ b/tests/node/idiom001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner Main.idr < input
 
-rm -rf build
diff --git a/tests/node/integers/run b/tests/node/integers/run
index af477f107..80c2f5566 100644
--- a/tests/node/integers/run
+++ b/tests/node/integers/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg node -o node_integers.js TestIntegers.idr > /dev/null
 node build/exec/node_integers.js
 
-rm -rf build
diff --git a/tests/node/newints/run b/tests/node/newints/run
index 8017b9474..d62fdda2a 100644
--- a/tests/node/newints/run
+++ b/tests/node/newints/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --cg node --no-banner --no-color --console-width 0 IntOps.idr < input
 
-rm -rf build
diff --git a/tests/node/node001/run b/tests/node/node001/run
index 6f06e7358..1a43c1747 100755
--- a/tests/node/node001/run
+++ b/tests/node/node001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner Total.idr < input
 
-rm -rf build
diff --git a/tests/node/node002/run b/tests/node/node002/run
index 23ee11c11..596d8ce0b 100755
--- a/tests/node/node002/run
+++ b/tests/node/node002/run
@@ -1,2 +1,3 @@
-$1 --no-color --console-width 0 --cg node --no-banner Pythag.idr < input
 rm -rf build
+
+$1 --no-color --console-width 0 --cg node --no-banner Pythag.idr < input
diff --git a/tests/node/node003/run b/tests/node/node003/run
index 401787072..1ee4e4937 100755
--- a/tests/node/node003/run
+++ b/tests/node/node003/run
@@ -1,2 +1,3 @@
-$1 --no-color --console-width 0 --cg node --no-banner IORef.idr < input
 rm -rf build
+
+$1 --no-color --console-width 0 --cg node --no-banner IORef.idr < input
diff --git a/tests/node/node005/run b/tests/node/node005/run
index 2034ab18e..a20d525f9 100755
--- a/tests/node/node005/run
+++ b/tests/node/node005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner Filter.idr < input
 
-rm -rf build
diff --git a/tests/node/node006/run b/tests/node/node006/run
index f0b01dd2a..679e4677a 100755
--- a/tests/node/node006/run
+++ b/tests/node/node006/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner TypeCase.idr < input
 $1 --no-color --console-width 0 --cg node --no-banner TypeCase2.idr --check
 
-rm -rf build
diff --git a/tests/node/node007/run b/tests/node/node007/run
index 55fc80667..2f13221ff 100755
--- a/tests/node/node007/run
+++ b/tests/node/node007/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner TypeCase.idr < input
 
-rm -rf build
diff --git a/tests/node/node008/run b/tests/node/node008/run
index 90c20e7f0..cfd2932ed 100755
--- a/tests/node/node008/run
+++ b/tests/node/node008/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner Nat.idr < input
 
-rm -rf build
diff --git a/tests/node/node009/run b/tests/node/node009/run
index e379ebc1e..6fc0d7289 100755
--- a/tests/node/node009/run
+++ b/tests/node/node009/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner uni.idr < input
 
-rm -rf build
diff --git a/tests/node/node011/run b/tests/node/node011/run
index 462a3afc9..83676264a 100644
--- a/tests/node/node011/run
+++ b/tests/node/node011/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner bangs.idr < input
 
-rm -rf build
diff --git a/tests/node/node012/run b/tests/node/node012/run
index 1d49a1fe9..482634d2b 100755
--- a/tests/node/node012/run
+++ b/tests/node/node012/run
@@ -1,2 +1,3 @@
-$1 --no-color --console-width 0 --cg node --no-banner array.idr < input
 rm -rf build
+
+$1 --no-color --console-width 0 --cg node --no-banner array.idr < input
diff --git a/tests/node/node014/run b/tests/node/node014/run
index 1a283501e..513db346a 100755
--- a/tests/node/node014/run
+++ b/tests/node/node014/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner -p network Echo.idr < input
 
-rm -rf build
diff --git a/tests/node/node015/run b/tests/node/node015/run
index 06fd7958f..e533c19be 100755
--- a/tests/node/node015/run
+++ b/tests/node/node015/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner Numbers.idr < input
 
-rm -rf build
diff --git a/tests/node/node019/run b/tests/node/node019/run
index 127024cf8..3d76c0649 100755
--- a/tests/node/node019/run
+++ b/tests/node/node019/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner partial.idr < input
 
-rm -rf build
diff --git a/tests/node/node020/run b/tests/node/node020/run
index 83222d9ea..81cdebd5b 100644
--- a/tests/node/node020/run
+++ b/tests/node/node020/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 POPEN_CMD="$1 --version" $1 --no-color --console-width 0 --cg node --no-banner Popen.idr < input
 
-rm -rf build
diff --git a/tests/node/node021/run b/tests/node/node021/run
index 919ea53e4..d9ad20018 100644
--- a/tests/node/node021/run
+++ b/tests/node/node021/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node --no-banner Bits.idr < input
 
-rm -rf build
diff --git a/tests/node/node022/run b/tests/node/node022/run
index 508c180c4..2732a3e76 100644
--- a/tests/node/node022/run
+++ b/tests/node/node022/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --cg node --no-banner --no-color --console-width 0 BitCasts.idr < input
 
-rm -rf build
\ No newline at end of file
diff --git a/tests/node/node023/run b/tests/node/node023/run
index 7fe802eeb..c795c59c7 100644
--- a/tests/node/node023/run
+++ b/tests/node/node023/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --cg node --no-banner --no-color --console-width 0 Casts.idr < input
 
-rm -rf build
diff --git a/tests/node/node024/run b/tests/node/node024/run
index 0ee1f73d5..5d135d8ec 100644
--- a/tests/node/node024/run
+++ b/tests/node/node024/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --cg node --no-banner --no-color --console-width 0 BitOps.idr < input
 
-rm -rf build
diff --git a/tests/node/node025/run b/tests/node/node025/run
index acd87a4a4..593a952eb 100644
--- a/tests/node/node025/run
+++ b/tests/node/node025/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --cg node --no-banner --no-color --console-width 0 Fix1037.idr < input
 
-rm -rf build
diff --git a/tests/node/perf001/run b/tests/node/perf001/run
index 85bdefa67..6b4ef7531 100644
--- a/tests/node/perf001/run
+++ b/tests/node/perf001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --cg node --no-banner --no-color --console-width 0 Span.idr < input
 
-rm -rf build
diff --git a/tests/node/reg001/run b/tests/node/reg001/run
index eb9d10651..f6e106f16 100755
--- a/tests/node/reg001/run
+++ b/tests/node/reg001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node numbers.idr -x main
 
-rm -rf build
diff --git a/tests/node/syntax001/run b/tests/node/syntax001/run
index 5f0dd8caa..df458eac0 100644
--- a/tests/node/syntax001/run
+++ b/tests/node/syntax001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node caseBlock.idr -x main
 
-rm -rf build
diff --git a/tests/node/tailrec001/run b/tests/node/tailrec001/run
index 865cc6893..3e63f60f0 100755
--- a/tests/node/tailrec001/run
+++ b/tests/node/tailrec001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --cg node tailrec.idr -x main
 
-rm -rf build
diff --git a/tests/prelude/reg001/run b/tests/prelude/reg001/run
index 33c707e7b..f28637131 100755
--- a/tests/prelude/reg001/run
+++ b/tests/prelude/reg001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --check fixity.idr
 
-rm -rf build
diff --git a/tests/refc/args/run b/tests/refc/args/run
index cac0eb899..df2974a9d 100644
--- a/tests/refc/args/run
+++ b/tests/refc/args/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg refc -o refc_args TestArgs.idr > /dev/null
 ./build/exec/refc_args a b
 ./build/exec/refc_args c
 
-rm -rf build
diff --git a/tests/refc/buffer/run b/tests/refc/buffer/run
index 713e2d3a4..6f8c7223d 100644
--- a/tests/refc/buffer/run
+++ b/tests/refc/buffer/run
@@ -1,6 +1,7 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg refc -o refc_buffer TestBuffer.idr > /dev/null
 ./build/exec/refc_buffer
 base64 testWrite.buf
 
 rm testWrite.buf
-rm -rf build
diff --git a/tests/refc/clock/run b/tests/refc/clock/run
index 43565dbbe..91a64df31 100644
--- a/tests/refc/clock/run
+++ b/tests/refc/clock/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg refc -o refc_clock TestClock.idr > /dev/null
 ./build/exec/refc_clock
 
-rm -rf build
diff --git a/tests/refc/doubles/run b/tests/refc/doubles/run
index 6c0710b3d..637e2c629 100644
--- a/tests/refc/doubles/run
+++ b/tests/refc/doubles/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg refc -o refc_doubles TestDoubles.idr > /dev/null
 ./build/exec/refc_doubles
 
-rm -rf build
diff --git a/tests/refc/integers/run b/tests/refc/integers/run
index a1988e43c..8ad0dbb08 100644
--- a/tests/refc/integers/run
+++ b/tests/refc/integers/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg refc -o refc_integers TestIntegers.idr > /dev/null
 ./build/exec/refc_integers
 
-rm -rf build
diff --git a/tests/refc/refc001/run b/tests/refc/refc001/run
index 10a5aa890..ae7b8087b 100644
--- a/tests/refc/refc001/run
+++ b/tests/refc/refc001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg refc -o refc001 Tail.idr > /dev/null
 ./build/exec/refc001
 
-rm -rf build
diff --git a/tests/refc/refc002/run b/tests/refc/refc002/run
index 632d63b82..e3099b7c1 100644
--- a/tests/refc/refc002/run
+++ b/tests/refc/refc002/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg refc -o refc002 RecordProjection.idr > /dev/null
 ./build/exec/refc002
 
-rm -rf build
diff --git a/tests/refc/strings/run b/tests/refc/strings/run
index f571cc745..73ae9cf5c 100644
--- a/tests/refc/strings/run
+++ b/tests/refc/strings/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-banner --no-color --console-width 0 --cg refc -p contrib -o refc_strings TestStrings.idr > /dev/null
 ./build/exec/refc_strings
 
-rm -rf build
diff --git a/tests/templates/simple-test/run b/tests/templates/simple-test/run
index c126d2fe4..d2c00b30c 100755
--- a/tests/templates/simple-test/run
+++ b/tests/templates/simple-test/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr < input
 
-rm -rf build
diff --git a/tests/templates/ttimp/run b/tests/templates/ttimp/run
index 04cc9c364..0e705f540 100755
--- a/tests/templates/ttimp/run
+++ b/tests/templates/ttimp/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --yaffle Interp.yaff < input
 $1 --yaffle build/ttc/Interp.ttc < input
 
-rm -rf build
diff --git a/tests/templates/with-ipkg/run b/tests/templates/with-ipkg/run
index 0da437ff2..fa9604f3f 100755
--- a/tests/templates/with-ipkg/run
+++ b/tests/templates/with-ipkg/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --build dummy.ipkg
 
-rm -rf build
diff --git a/tests/ttimp/basic001/run b/tests/ttimp/basic001/run
index 04cc9c364..0e705f540 100755
--- a/tests/ttimp/basic001/run
+++ b/tests/ttimp/basic001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --yaffle Interp.yaff < input
 $1 --yaffle build/ttc/Interp.ttc < input
 
-rm -rf build
diff --git a/tests/ttimp/basic002/run b/tests/ttimp/basic002/run
index 839725b0f..7404d9d93 100755
--- a/tests/ttimp/basic002/run
+++ b/tests/ttimp/basic002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Adder.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/basic003/run b/tests/ttimp/basic003/run
index 9b22c8317..b80000004 100755
--- a/tests/ttimp/basic003/run
+++ b/tests/ttimp/basic003/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --yaffle Hole.yaff < input
 $1 --yaffle build/ttc/Hole.ttc < input
 
-rm -rf build
diff --git a/tests/ttimp/basic004/run b/tests/ttimp/basic004/run
index 3aed88c3d..5d67d8324 100755
--- a/tests/ttimp/basic004/run
+++ b/tests/ttimp/basic004/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle AsPat.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/basic005/run b/tests/ttimp/basic005/run
index cdc221b05..7d0918388 100755
--- a/tests/ttimp/basic005/run
+++ b/tests/ttimp/basic005/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Ambig.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/basic006/run b/tests/ttimp/basic006/run
index cdc221b05..7d0918388 100755
--- a/tests/ttimp/basic006/run
+++ b/tests/ttimp/basic006/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Ambig.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/coverage001/run b/tests/ttimp/coverage001/run
index 5dcb9edc9..c14bc23a9 100755
--- a/tests/ttimp/coverage001/run
+++ b/tests/ttimp/coverage001/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 echo ':q' | $1 --yaffle Vect.yaff
 echo ':q' | $1 --yaffle Vect2.yaff
 echo ':q' | $1 --yaffle Vect3.yaff
 
-rm -rf build
diff --git a/tests/ttimp/coverage002/run b/tests/ttimp/coverage002/run
index 8f5a005f5..4f68a0b59 100755
--- a/tests/ttimp/coverage002/run
+++ b/tests/ttimp/coverage002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Vect.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/dot001/run b/tests/ttimp/dot001/run
index 30bfa0992..75611ab8f 100755
--- a/tests/ttimp/dot001/run
+++ b/tests/ttimp/dot001/run
@@ -1,6 +1,7 @@
+rm -rf build
+
 echo ':q' | $1 --yaffle Dot.yaff
 echo ':q' | $1 --yaffle Dot2.yaff
 echo ':q' | $1 --yaffle Dot3.yaff
 echo ':q' | $1 --yaffle Dot4.yaff
 
-rm -rf build
diff --git a/tests/ttimp/eta001/run b/tests/ttimp/eta001/run
index 88aacbc1f..995d4b651 100755
--- a/tests/ttimp/eta001/run
+++ b/tests/ttimp/eta001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Eta.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/eta002/run b/tests/ttimp/eta002/run
index 8abbb08d6..8c74f6d6c 100755
--- a/tests/ttimp/eta002/run
+++ b/tests/ttimp/eta002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 echo ':q' | $1 --yaffle Eta.yaff
 
-rm -rf build
diff --git a/tests/ttimp/lazy001/run b/tests/ttimp/lazy001/run
index 036a6699c..7355a5616 100755
--- a/tests/ttimp/lazy001/run
+++ b/tests/ttimp/lazy001/run
@@ -1,5 +1,6 @@
+rm -rf build
+
 $1 --yaffle Lazy.yaff < input
 $1 --yaffle LazyInf.yaff < input
 $1 --yaffle build/ttc/LazyInf.ttc < input
 
-rm -rf build
diff --git a/tests/ttimp/nest001/run b/tests/ttimp/nest001/run
index b0f88bd20..0ce0d07fc 100755
--- a/tests/ttimp/nest001/run
+++ b/tests/ttimp/nest001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Let.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/nest002/run b/tests/ttimp/nest002/run
index e9e5d4e80..41582a5a7 100755
--- a/tests/ttimp/nest002/run
+++ b/tests/ttimp/nest002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Case.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/perf001/run b/tests/ttimp/perf001/run
index 71408ae75..3af683222 100755
--- a/tests/ttimp/perf001/run
+++ b/tests/ttimp/perf001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 echo ':q' | $1 --yaffle bigsuc.yaff
 
-rm -rf build
diff --git a/tests/ttimp/perf002/run b/tests/ttimp/perf002/run
index 6c9b8a036..971cf0084 100755
--- a/tests/ttimp/perf002/run
+++ b/tests/ttimp/perf002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle BigVect.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/perf003/run b/tests/ttimp/perf003/run
index dd2023450..ce9825d23 100755
--- a/tests/ttimp/perf003/run
+++ b/tests/ttimp/perf003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Id.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/qtt001/run b/tests/ttimp/qtt001/run
index d46f9b162..f520ad29c 100755
--- a/tests/ttimp/qtt001/run
+++ b/tests/ttimp/qtt001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle QTT.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/qtt003/run b/tests/ttimp/qtt003/run
index b5e870cc3..7bcf50567 100755
--- a/tests/ttimp/qtt003/run
+++ b/tests/ttimp/qtt003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle QTTEq.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/record001/run b/tests/ttimp/record001/run
index 2811e759a..c22772cde 100755
--- a/tests/ttimp/record001/run
+++ b/tests/ttimp/record001/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --yaffle Record.yaff < input
 $1 --yaffle build/ttc/Record.ttc < input
 
-rm -rf build
diff --git a/tests/ttimp/record002/run b/tests/ttimp/record002/run
index 9abaee9b9..03483aa5a 100755
--- a/tests/ttimp/record002/run
+++ b/tests/ttimp/record002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Record.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/record003/run b/tests/ttimp/record003/run
index c71f4c856..cc4093fb1 100755
--- a/tests/ttimp/record003/run
+++ b/tests/ttimp/record003/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --yaffle Record.yaff          < input
 $1 --yaffle build/ttc/Record.ttc < input
 
-rm -rf build
diff --git a/tests/ttimp/total001/run b/tests/ttimp/total001/run
index 8f5a005f5..4f68a0b59 100755
--- a/tests/ttimp/total001/run
+++ b/tests/ttimp/total001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Vect.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/total002/run b/tests/ttimp/total002/run
index 545ea51f1..dfa7a43e0 100755
--- a/tests/ttimp/total002/run
+++ b/tests/ttimp/total002/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Total.yaff < input
 
-rm -rf build
diff --git a/tests/ttimp/total003/run b/tests/ttimp/total003/run
index 09357d7dc..ba3176f3c 100755
--- a/tests/ttimp/total003/run
+++ b/tests/ttimp/total003/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --yaffle Bad.yaff < input
 
-rm -rf build
diff --git a/tests/typedd-book/chapter01/run b/tests/typedd-book/chapter01/run
index 96e7a8173..0a5fc2f80 100755
--- a/tests/typedd-book/chapter01/run
+++ b/tests/typedd-book/chapter01/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 $1 --no-color --console-width 0 --no-banner HoleFix.idr < input
 
-rm -rf build
diff --git a/tests/typedd-book/chapter02/run b/tests/typedd-book/chapter02/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter02/run
+++ b/tests/typedd-book/chapter02/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter03/run b/tests/typedd-book/chapter03/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter03/run
+++ b/tests/typedd-book/chapter03/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter04/run b/tests/typedd-book/chapter04/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter04/run
+++ b/tests/typedd-book/chapter04/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter05/run b/tests/typedd-book/chapter05/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter05/run
+++ b/tests/typedd-book/chapter05/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter06/run b/tests/typedd-book/chapter06/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter06/run
+++ b/tests/typedd-book/chapter06/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter07/run b/tests/typedd-book/chapter07/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter07/run
+++ b/tests/typedd-book/chapter07/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter08/run b/tests/typedd-book/chapter08/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter08/run
+++ b/tests/typedd-book/chapter08/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter09/run b/tests/typedd-book/chapter09/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter09/run
+++ b/tests/typedd-book/chapter09/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter10/run b/tests/typedd-book/chapter10/run
index 15a2bd090..db7b2ff58 100755
--- a/tests/typedd-book/chapter10/run
+++ b/tests/typedd-book/chapter10/run
@@ -1,4 +1,5 @@
+rm -rf build
+
 $1 --no-color --console-width 0 DLFail.idr --check
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter11/run b/tests/typedd-book/chapter11/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter11/run
+++ b/tests/typedd-book/chapter11/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter12/run b/tests/typedd-book/chapter12/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter12/run
+++ b/tests/typedd-book/chapter12/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter13/run b/tests/typedd-book/chapter13/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter13/run
+++ b/tests/typedd-book/chapter13/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/typedd-book/chapter14/run b/tests/typedd-book/chapter14/run
index 0a91f24cd..3a9f0e952 100755
--- a/tests/typedd-book/chapter14/run
+++ b/tests/typedd-book/chapter14/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 All.idr --check
 
-rm -rf build
diff --git a/tests/vmcode/basic001/run b/tests/vmcode/basic001/run
index 0f0438909..7d28a1632 100755
--- a/tests/vmcode/basic001/run
+++ b/tests/vmcode/basic001/run
@@ -1,3 +1,4 @@
+rm -rf build
+
 $1 --no-color --console-width 0 --no-banner Test.idr -x main --cg vmcode-interp
 
-rm -rf build