diff --git a/.github/workflows/ci-idris2-and-libs.yml b/.github/workflows/ci-idris2-and-libs.yml
index c757ccab2fd..73295b145d6 100644
--- a/.github/workflows/ci-idris2-and-libs.yml
+++ b/.github/workflows/ci-idris2-and-libs.yml
@@ -362,7 +362,7 @@ jobs:
   ubuntu-self-host-racket:
     needs: ubuntu-bootstrap-racket
     runs-on: ubuntu-latest
-    if: false
+    timeout-minutes: 60
     env:
       IDRIS2_CG: racket
     steps:
diff --git a/libs/test/Test/Golden.idr b/libs/test/Test/Golden.idr
index 7fa08dc684f..3ac7b3bc24b 100644
--- a/libs/test/Test/Golden.idr
+++ b/libs/test/Test/Golden.idr
@@ -431,8 +431,8 @@ record TestPool where
   codegen : Codegen
   testCases : List String
 
-findTests : (String -> Bool) -> Codegen -> String -> String -> IO (List String)
-findTests pred codegen poolName dirName = do
+findTests : (String -> Bool) -> String -> IO (List String)
+findTests pred dirName = do
   Right names <- listDir dirName
     | Left e => die $ "failed to list " ++ dirName ++ ": " ++ show e
   let names = [n | n <- names, pred n]
@@ -462,7 +462,7 @@ testsInDir :
   {default Nothing codegen : Codegen} ->
   Lazy (IO TestPool)
 testsInDir dirName poolName = do
-  testNames <- findTests pred codegen poolName dirName
+  testNames <- findTests pred dirName
   when (length testNames == 0) $ die $ "no tests found in " ++ dirName
   pure $ MkTestPool poolName requirements codegen testNames
 
diff --git a/tests/chez/barrier001/run b/tests/chez/barrier001/run
index 108c440fda6..c6e6f2ab79c 100644
--- a/tests/chez/barrier001/run
+++ b/tests/chez/barrier001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg chez Main.idr
+run Main.idr
diff --git a/tests/idris2/basic/case001/InlineCase.idr b/tests/chez/case001/InlineCase.idr
similarity index 100%
rename from tests/idris2/basic/case001/InlineCase.idr
rename to tests/chez/case001/InlineCase.idr
diff --git a/tests/idris2/basic/case001/expected b/tests/chez/case001/expected
similarity index 100%
rename from tests/idris2/basic/case001/expected
rename to tests/chez/case001/expected
diff --git a/tests/idris2/basic/case001/run b/tests/chez/case001/run
similarity index 50%
rename from tests/idris2/basic/case001/run
rename to tests/chez/case001/run
index c56b10dc1cf..d9825f10521 100755
--- a/tests/idris2/basic/case001/run
+++ b/tests/chez/case001/run
@@ -1,4 +1,4 @@
-. ../../../testutils.sh
+. ../../testutils.sh
 
-idris2 --codegen chez InlineCase.idr -o inline-case
+idris2 InlineCase.idr -o inline-case
 grep "define InlineCase-product" build/exec/inline-case_app/inline-case.ss
diff --git a/tests/chez/chez031/run b/tests/chez/chez031/run
index 46af2cb2427..c259a459525 100644
--- a/tests/chez/chez031/run
+++ b/tests/chez/chez031/run
@@ -1,5 +1,5 @@
 . ../../testutils.sh
 
-run --cg chez Specifiers.idr
-idris2 --cg chez Specifiers.idr -o build/foo
-idris2 --cg chez < input
+run Specifiers.idr
+idris2 Specifiers.idr -o build/foo
+idris2 < input
diff --git a/tests/codegen/enum/Check.idr b/tests/chez/enum/Check.idr
similarity index 100%
rename from tests/codegen/enum/Check.idr
rename to tests/chez/enum/Check.idr
diff --git a/tests/codegen/enum/Enum.idr b/tests/chez/enum/Enum.idr
similarity index 100%
rename from tests/codegen/enum/Enum.idr
rename to tests/chez/enum/Enum.idr
diff --git a/tests/codegen/enum/expected b/tests/chez/enum/expected
similarity index 100%
rename from tests/codegen/enum/expected
rename to tests/chez/enum/expected
diff --git a/tests/codegen/enum/run b/tests/chez/enum/run
similarity index 100%
rename from tests/codegen/enum/run
rename to tests/chez/enum/run
diff --git a/tests/chez/forkjoin001/run b/tests/chez/forkjoin001/run
index 108c440fda6..c6e6f2ab79c 100644
--- a/tests/chez/forkjoin001/run
+++ b/tests/chez/forkjoin001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg chez Main.idr
+run Main.idr
diff --git a/tests/chez/futures001/run b/tests/chez/futures001/run
index 27a0b47fe2e..095816b14cd 100644
--- a/tests/chez/futures001/run
+++ b/tests/chez/futures001/run
@@ -1,15 +1,15 @@
 . ../../testutils.sh
 
-idris2 --cg chez Futures.idr -p contrib --exec constant
-idris2 --cg chez Futures.idr -p contrib --exec simpleIO
-idris2 --cg chez Futures.idr -p contrib --exec erasureAndNonbindTest
-idris2 --cg chez Futures.idr -p contrib --exec map
+idris2 Futures.idr -p contrib --exec constant
+idris2 Futures.idr -p contrib --exec simpleIO
+idris2 Futures.idr -p contrib --exec erasureAndNonbindTest
+idris2 Futures.idr -p contrib --exec map
 
 echo "----"
 
-idris2 --cg chez --directive lazy=weakMemo Futures.idr -p contrib --exec constant
-idris2 --cg chez --directive lazy=weakMemo Futures.idr -p contrib --exec simpleIO
-idris2 --cg chez --directive lazy=weakMemo Futures.idr -p contrib --exec erasureAndNonbindTest
-idris2 --cg chez --directive lazy=weakMemo Futures.idr -p contrib --exec map
+idris2 --directive lazy=weakMemo Futures.idr -p contrib --exec constant
+idris2 --directive lazy=weakMemo Futures.idr -p contrib --exec simpleIO
+idris2 --directive lazy=weakMemo Futures.idr -p contrib --exec erasureAndNonbindTest
+idris2 --directive lazy=weakMemo Futures.idr -p contrib --exec map
 
 rm -r build
diff --git a/tests/chez/futures002/run b/tests/chez/futures002/run
index e62745d3cd6..f0c62f9c62c 100644
--- a/tests/chez/futures002/run
+++ b/tests/chez/futures002/run
@@ -1,7 +1,7 @@
 . ../../testutils.sh
 
-idris2 --cg chez Futures.idr -p contrib --exec main
+idris2 Futures.idr -p contrib --exec main
 echo "----"
-idris2 --cg chez --directive lazy=weakMemo Futures.idr -p contrib --exec main
+idris2 --directive lazy=weakMemo Futures.idr -p contrib --exec main
 
 rm -r build
diff --git a/tests/chez/semaphores001/run b/tests/chez/semaphores001/run
index 108c440fda6..c6e6f2ab79c 100644
--- a/tests/chez/semaphores001/run
+++ b/tests/chez/semaphores001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg chez Main.idr
+run Main.idr
diff --git a/tests/chez/semaphores002/run b/tests/chez/semaphores002/run
index 108c440fda6..c6e6f2ab79c 100644
--- a/tests/chez/semaphores002/run
+++ b/tests/chez/semaphores002/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg chez Main.idr
+run Main.idr
diff --git a/tests/codegen/fix3515/expected b/tests/codegen/fix3515/expected
index b261da18d51..ee16254fbec 100644
--- a/tests/codegen/fix3515/expected
+++ b/tests/codegen/fix3515/expected
@@ -1,2 +1,27 @@
 1
 0
+------
+Main> Main.toNat
+Arguments [{arg:1}, {arg:2}]
+Compile time tree: case {arg:1} of
+  Z => case {arg:2} of
+    MkUnit => 1
+    _ => 0
+  _ => 0
+Detaggable arg types: [1]
+Compiled: \ {arg:1}, {arg:2} => case {arg:1} of
+  { 0 => 1
+  ; _ => 0
+  }
+Refers to: Prelude.Types.Z, Prelude.Types.S
+Flags: allguarded, covering
+Size change:
+  Prelude.Types.S:
+    l 0
+  r +--
+  0 | =
+  Prelude.Types.Z:
+    l
+  r +
+Main> 
+Bye for now!
diff --git a/tests/codegen/fix3515/input b/tests/codegen/fix3515/input
new file mode 100644
index 00000000000..80a5d41d8cc
--- /dev/null
+++ b/tests/codegen/fix3515/input
@@ -0,0 +1 @@
+:di Main.toNat
diff --git a/tests/codegen/fix3515/run b/tests/codegen/fix3515/run
index e727a3c0f1a..88d1d0e242b 100755
--- a/tests/codegen/fix3515/run
+++ b/tests/codegen/fix3515/run
@@ -1,5 +1,5 @@
 . ../../testutils.sh
 
-idris2 -o main Main.idr
-
-./build/exec/main
+run Main.idr
+echo "------"
+idris2 Main.idr < input
diff --git a/tests/idris2/basic/case003/Main.idr b/tests/idris2/casetree/casetree005/Main.idr
similarity index 100%
rename from tests/idris2/basic/case003/Main.idr
rename to tests/idris2/casetree/casetree005/Main.idr
diff --git a/tests/idris2/basic/case003/expected b/tests/idris2/casetree/casetree005/expected
similarity index 100%
rename from tests/idris2/basic/case003/expected
rename to tests/idris2/casetree/casetree005/expected
diff --git a/tests/idris2/basic/case003/run b/tests/idris2/casetree/casetree005/run
similarity index 100%
rename from tests/idris2/basic/case003/run
rename to tests/idris2/casetree/casetree005/run
diff --git a/tests/node/args/run b/tests/node/args/run
index e208edf544c..1212c71da5a 100644
--- a/tests/node/args/run
+++ b/tests/node/args/run
@@ -1,5 +1,5 @@
 . ../../testutils.sh
 
-idris2 --cg node -o node_args TestArgs.idr > /dev/null
+idris2 -o node_args TestArgs.idr > /dev/null
 node ./build/exec/node_args a b
 node ./build/exec/node_args c
diff --git a/tests/node/bitops/run b/tests/node/bitops/run
index 80bfdbf7fdd..5bb842ecfb8 100644
--- a/tests/node/bitops/run
+++ b/tests/node/bitops/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node BitOps.idr
+run BitOps.idr
diff --git a/tests/node/casts/run b/tests/node/casts/run
index f8481777743..2cb7ef45a2a 100644
--- a/tests/node/casts/run
+++ b/tests/node/casts/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Casts.idr
+run Casts.idr
diff --git a/tests/node/doubles/run b/tests/node/doubles/run
index 32bc5b35981..764a3685e9d 100644
--- a/tests/node/doubles/run
+++ b/tests/node/doubles/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg node -o node_doubles.js Doubles.idr > /dev/null
+idris2 -o node_doubles.js Doubles.idr > /dev/null
 node build/exec/node_doubles.js
diff --git a/tests/node/executable/run b/tests/node/executable/run
index c8d3201f1e4..1987d65c6f1 100644
--- a/tests/node/executable/run
+++ b/tests/node/executable/run
@@ -1,6 +1,6 @@
 . ../../testutils.sh
 
-idris2 --cg node -o node_executable TestExecutable.idr > /dev/null
+idris2 -o node_executable TestExecutable.idr > /dev/null
 
 # node still executes it:
 node ./build/exec/node_executable
diff --git a/tests/node/fastConcat/run b/tests/node/fastConcat/run
index fa8a84ed86e..dfeeb93fdd6 100644
--- a/tests/node/fastConcat/run
+++ b/tests/node/fastConcat/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node FastConcat.idr
+run FastConcat.idr
diff --git a/tests/node/ffi001/run b/tests/node/ffi001/run
index 0812734794f..e82e7abbfa3 100644
--- a/tests/node/ffi001/run
+++ b/tests/node/ffi001/run
@@ -1,2 +1,2 @@
 . ../../testutils.sh
-run --cg node Foreign.idr
+run Foreign.idr
diff --git a/tests/node/fix1839/run b/tests/node/fix1839/run
index f5d59600455..b947c6e4409 100644
--- a/tests/node/fix1839/run
+++ b/tests/node/fix1839/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-run --cg node OS.idr
+run OS.idr
 idris2 --cg javascript -o os.js OS.idr
diff --git a/tests/codegen/fix3375/Prog.idr b/tests/node/fix3375/Prog.idr
similarity index 100%
rename from tests/codegen/fix3375/Prog.idr
rename to tests/node/fix3375/Prog.idr
diff --git a/tests/codegen/fix3375/expected b/tests/node/fix3375/expected
similarity index 100%
rename from tests/codegen/fix3375/expected
rename to tests/node/fix3375/expected
diff --git a/tests/codegen/fix3375/run b/tests/node/fix3375/run
similarity index 73%
rename from tests/codegen/fix3375/run
rename to tests/node/fix3375/run
index c152c430d55..64bcb961f40 100644
--- a/tests/codegen/fix3375/run
+++ b/tests/node/fix3375/run
@@ -1,6 +1,6 @@
 . ../../testutils.sh
 
-idris2 --quiet --codegen node -o prog.js Prog.idr
+idris2 --quiet -o prog.js Prog.idr
 
 grep "const \$[a-z0-9]\+ = undefined;" build/exec/prog.js
 grep "const \$[a-z0-9]\+ = \$[a-z0-9]\+;" build/exec/prog.js
diff --git a/tests/node/idiom001/run b/tests/node/idiom001/run
index 71cd6129371..c6e6f2ab79c 100644
--- a/tests/node/idiom001/run
+++ b/tests/node/idiom001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Main.idr
+run Main.idr
diff --git a/tests/node/integer_array/run b/tests/node/integer_array/run
index a8b3a176e32..a69e093bbb2 100755
--- a/tests/node/integer_array/run
+++ b/tests/node/integer_array/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node array.idr
+run array.idr
diff --git a/tests/node/integers/run b/tests/node/integers/run
index 27effc59f8d..6b2ad0edf84 100644
--- a/tests/node/integers/run
+++ b/tests/node/integers/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg node -o node_integers.js TestIntegers.idr > /dev/null
+idris2 -o node_integers.js TestIntegers.idr > /dev/null
 node build/exec/node_integers.js
diff --git a/tests/node/memo/run b/tests/node/memo/run
index 0a41019e388..f8843a026dc 100644
--- a/tests/node/memo/run
+++ b/tests/node/memo/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Memo.idr
+run Memo.idr
diff --git a/tests/node/newints/run b/tests/node/newints/run
index 0b4c2e7ebb4..977371e71ef 100644
--- a/tests/node/newints/run
+++ b/tests/node/newints/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node IntOps.idr
+run IntOps.idr
diff --git a/tests/node/node001/run b/tests/node/node001/run
index b938f77a74e..b1513928dc7 100755
--- a/tests/node/node001/run
+++ b/tests/node/node001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Total.idr
+run Total.idr
diff --git a/tests/node/node002/run b/tests/node/node002/run
index 7d83820f8dd..d24032639a6 100755
--- a/tests/node/node002/run
+++ b/tests/node/node002/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-idris2 --cg node Pythag.idr < input
+idris2 Pythag.idr < input
diff --git a/tests/node/node003/run b/tests/node/node003/run
index be60514c316..61ce178fddf 100755
--- a/tests/node/node003/run
+++ b/tests/node/node003/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node IORef.idr
+run IORef.idr
diff --git a/tests/node/node004/run b/tests/node/node004/run
index 218079faceb..ed530ac290e 100755
--- a/tests/node/node004/run
+++ b/tests/node/node004/run
@@ -2,4 +2,4 @@
 
 rm test.buf
 
-run --cg node Buffer.idr
+run Buffer.idr
diff --git a/tests/node/node005/run b/tests/node/node005/run
index ec47e16de0a..653275eef21 100755
--- a/tests/node/node005/run
+++ b/tests/node/node005/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-idris2 --cg node Filter.idr < input
+idris2 Filter.idr < input
diff --git a/tests/node/node006/run b/tests/node/node006/run
index 53f8c44f3cc..47e40c235d6 100755
--- a/tests/node/node006/run
+++ b/tests/node/node006/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg node TypeCase.idr < input
-check --cg node TypeCase2.idr
+idris2 TypeCase.idr < input
+check TypeCase2.idr
diff --git a/tests/node/node007/run b/tests/node/node007/run
index 52afecedbb7..8a1cb2e9448 100755
--- a/tests/node/node007/run
+++ b/tests/node/node007/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node TypeCase.idr
+run TypeCase.idr
diff --git a/tests/node/node008/run b/tests/node/node008/run
index f350dc22998..bb2e1d58b28 100755
--- a/tests/node/node008/run
+++ b/tests/node/node008/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Nat.idr
+run Nat.idr
diff --git a/tests/node/node009/run b/tests/node/node009/run
index a4bce0a9a77..34bb6f6e739 100755
--- a/tests/node/node009/run
+++ b/tests/node/node009/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node uni.idr
+run uni.idr
diff --git a/tests/node/node011/run b/tests/node/node011/run
index fe2b80cdd7b..2f7e60c4271 100644
--- a/tests/node/node011/run
+++ b/tests/node/node011/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-idris2 --cg node bangs.idr < input
+idris2 bangs.idr < input
diff --git a/tests/node/node012/run b/tests/node/node012/run
index a8b3a176e32..a69e093bbb2 100755
--- a/tests/node/node012/run
+++ b/tests/node/node012/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node array.idr
+run array.idr
diff --git a/tests/node/node015/run b/tests/node/node015/run
index a91652ce9b4..b2b292332d8 100755
--- a/tests/node/node015/run
+++ b/tests/node/node015/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Numbers.idr
+run Numbers.idr
diff --git a/tests/node/node017/run b/tests/node/node017/run
index beb8b73c582..6876843f2cc 100755
--- a/tests/node/node017/run
+++ b/tests/node/node017/run
@@ -2,5 +2,5 @@
 
 rm -rf testdir
 
-run --cg node dir.idr | filter_test_dir
+run dir.idr | filter_test_dir
 cat testdir/test.txt
diff --git a/tests/node/node018/run b/tests/node/node018/run
index bc1a5021cdb..2443212169e 100755
--- a/tests/node/node018/run
+++ b/tests/node/node018/run
@@ -2,4 +2,4 @@
 
 rm testout.txt
 
-run --cg node File.idr
+run File.idr
diff --git a/tests/node/node019/run b/tests/node/node019/run
index 22b79e49c80..7b2551ee28c 100755
--- a/tests/node/node019/run
+++ b/tests/node/node019/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-idris2 --cg node partial.idr < input
+idris2 partial.idr < input
diff --git a/tests/node/node020/run b/tests/node/node020/run
index f5d9e3c9b18..7a47b290f1c 100644
--- a/tests/node/node020/run
+++ b/tests/node/node020/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-POPEN_CMD="$idris2 --version" run --cg node Popen.idr
+POPEN_CMD="$idris2 --version" run Popen.idr
diff --git a/tests/node/node021/run b/tests/node/node021/run
index 5dd72645c5a..6d2f3057d29 100644
--- a/tests/node/node021/run
+++ b/tests/node/node021/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-idris2 --cg node Bits.idr < input
+idris2 Bits.idr < input
diff --git a/tests/node/node022/run b/tests/node/node022/run
index 997c6b8b011..9b07e12aefd 100644
--- a/tests/node/node022/run
+++ b/tests/node/node022/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node BitCasts.idr
+run BitCasts.idr
diff --git a/tests/node/node023/run b/tests/node/node023/run
index f8481777743..2cb7ef45a2a 100644
--- a/tests/node/node023/run
+++ b/tests/node/node023/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Casts.idr
+run Casts.idr
diff --git a/tests/node/node024/run b/tests/node/node024/run
index 80bfdbf7fdd..5bb842ecfb8 100644
--- a/tests/node/node024/run
+++ b/tests/node/node024/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node BitOps.idr
+run BitOps.idr
diff --git a/tests/node/node025/run b/tests/node/node025/run
index f0d56b8b2b0..bb6defe658a 100644
--- a/tests/node/node025/run
+++ b/tests/node/node025/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Fix1037.idr
+run Fix1037.idr
diff --git a/tests/node/node026/run b/tests/node/node026/run
index 7e20c37ba34..ea604780a09 100644
--- a/tests/node/node026/run
+++ b/tests/node/node026/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run -p contrib --cg node Fix1795.idr
+run -p contrib Fix1795.idr
diff --git a/tests/node/node027/run b/tests/node/node027/run
index 0aadf2f22b1..4ce95022d8f 100644
--- a/tests/node/node027/run
+++ b/tests/node/node027/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node PID.idr
+run PID.idr
diff --git a/tests/node/node028/run b/tests/node/node028/run
index f3885f86fbd..1f5831468ec 100644
--- a/tests/node/node028/run
+++ b/tests/node/node028/run
@@ -9,12 +9,12 @@ echo '--------------'
 
 echo '# Running an example without any top-level constants...'
 echo '# We expect no usages of `__lazy` to be present, maybe only a definition.'
-run --cg node -o hw.js HelloWorld.idr
+run -o hw.js HelloWorld.idr
 grep '__lazy' build/exec/hw.js
 
 echo '--------------'
 
 echo '# Running an example with some top-level constant...'
 echo '# We expect `__lazy` to be used on the RHS for the top-level constant called `topLevelConst`.'
-run --cg node -o lsth.js LazyIsStillThere.idr
+run -o lsth.js LazyIsStillThere.idr
 grep '__lazy' build/exec/lsth.js
diff --git a/tests/node/nomangle001/run b/tests/node/nomangle001/run
index 8f3d635efd8..a665197a57a 100644
--- a/tests/node/nomangle001/run
+++ b/tests/node/nomangle001/run
@@ -1,7 +1,7 @@
 . ../../testutils.sh
 
-idris2 nomangle.idr -o test1 --cg node
-idris2 nomangle.idr -o test2 --cg node --directive minimal
+idris2 nomangle.idr -o test1
+idris2 nomangle.idr -o test2 --directive minimal
 
 cat build/exec/test1 | grep -e foo -e baz -e another_name
 cat build/exec/test2 | grep -e foo -e baz -e another_name
diff --git a/tests/node/nomangle002/run b/tests/node/nomangle002/run
index 9d8a5c156b5..c66e99ba9e2 100644
--- a/tests/node/nomangle002/run
+++ b/tests/node/nomangle002/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 nomangle1.idr -o test --cg node
-idris2 nomangle2.idr -o test --cg node
+idris2 nomangle1.idr -o test
+idris2 nomangle2.idr -o test
diff --git a/tests/node/perf001/run b/tests/node/perf001/run
index ff95006be79..6e2acf52fde 100644
--- a/tests/node/perf001/run
+++ b/tests/node/perf001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Span.idr
+run Span.idr
diff --git a/tests/node/reg001/run b/tests/node/reg001/run
index dd8069709b7..05c56b2e35a 100755
--- a/tests/node/reg001/run
+++ b/tests/node/reg001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node numbers.idr
+run numbers.idr
diff --git a/tests/node/reg002/run b/tests/node/reg002/run
index 58498217ac7..99af9bf38da 100755
--- a/tests/node/reg002/run
+++ b/tests/node/reg002/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node Issue1843.idr
+run Issue1843.idr
diff --git a/tests/node/stringcast/run b/tests/node/stringcast/run
index 1e92367f464..8ee0f0114bc 100644
--- a/tests/node/stringcast/run
+++ b/tests/node/stringcast/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node StringCast.idr
+run StringCast.idr
diff --git a/tests/node/syntax001/run b/tests/node/syntax001/run
index 9449b9c9504..8d042e21329 100644
--- a/tests/node/syntax001/run
+++ b/tests/node/syntax001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node caseBlock.idr
+run caseBlock.idr
diff --git a/tests/node/tailrec001/run b/tests/node/tailrec001/run
index 2a0746dde49..8b6e2945a64 100755
--- a/tests/node/tailrec001/run
+++ b/tests/node/tailrec001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node tailrec.idr
+run tailrec.idr
diff --git a/tests/node/tailrec002/run b/tests/node/tailrec002/run
index 92679e9c1a0..e3bcdf52173 100755
--- a/tests/node/tailrec002/run
+++ b/tests/node/tailrec002/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg node EvenOdd.idr -o app.js
+idris2 EvenOdd.idr -o app.js
 run Main.idr
diff --git a/tests/node/tailrec_libs/run b/tests/node/tailrec_libs/run
index 2a0746dde49..8b6e2945a64 100644
--- a/tests/node/tailrec_libs/run
+++ b/tests/node/tailrec_libs/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg node tailrec.idr
+run tailrec.idr
diff --git a/tests/racket/barrier001/run b/tests/racket/barrier001/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/barrier001/run
+++ b/tests/racket/barrier001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/conditions001/run b/tests/racket/conditions001/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/conditions001/run
+++ b/tests/racket/conditions001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/conditions002/run b/tests/racket/conditions002/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/conditions002/run
+++ b/tests/racket/conditions002/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/conditions003/run b/tests/racket/conditions003/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/conditions003/run
+++ b/tests/racket/conditions003/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/conditions004/run b/tests/racket/conditions004/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/conditions004/run
+++ b/tests/racket/conditions004/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/conditions005/run b/tests/racket/conditions005/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/conditions005/run
+++ b/tests/racket/conditions005/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/conditions006/run b/tests/racket/conditions006/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/conditions006/run
+++ b/tests/racket/conditions006/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/conditions007/run b/tests/racket/conditions007/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/conditions007/run
+++ b/tests/racket/conditions007/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/ffi001/run b/tests/racket/ffi001/run
index 825a99dacad..4340580e6f8 100644
--- a/tests/racket/ffi001/run
+++ b/tests/racket/ffi001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket RacketLib.idr
+run RacketLib.idr
diff --git a/tests/racket/forkjoin001/run b/tests/racket/forkjoin001/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/forkjoin001/run
+++ b/tests/racket/forkjoin001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/futures001/run b/tests/racket/futures001/run
index b362b8b38ac..0e9b6356a0f 100644
--- a/tests/racket/futures001/run
+++ b/tests/racket/futures001/run
@@ -1,9 +1,9 @@
 . ../../testutils.sh
 
-idris2 --cg racket Futures.idr -p contrib --exec constant
-idris2 --cg racket Futures.idr -p contrib --exec map
+idris2 Futures.idr -p contrib --exec constant
+idris2 Futures.idr -p contrib --exec map
 
 echo "----"
 
-idris2 --cg racket --directive lazy=weakMemo Futures.idr -p contrib --exec constant
-idris2 --cg racket --directive lazy=weakMemo Futures.idr -p contrib --exec map
+idris2 --directive lazy=weakMemo Futures.idr -p contrib --exec constant
+idris2 --directive lazy=weakMemo Futures.idr -p contrib --exec map
diff --git a/tests/racket/futures002/run b/tests/racket/futures002/run
index bd5fdbeb527..f0c62f9c62c 100644
--- a/tests/racket/futures002/run
+++ b/tests/racket/futures002/run
@@ -1,7 +1,7 @@
 . ../../testutils.sh
 
-idris2 --cg racket Futures.idr -p contrib --exec main
+idris2 Futures.idr -p contrib --exec main
 echo "----"
-idris2 --cg racket --directive lazy=weakMemo Futures.idr -p contrib --exec main
+idris2 --directive lazy=weakMemo Futures.idr -p contrib --exec main
 
 rm -r build
diff --git a/tests/racket/mutex001/run b/tests/racket/mutex001/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/mutex001/run
+++ b/tests/racket/mutex001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/mutex002/run b/tests/racket/mutex002/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/mutex002/run
+++ b/tests/racket/mutex002/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/mutex003/run b/tests/racket/mutex003/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/mutex003/run
+++ b/tests/racket/mutex003/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/mutex004/run b/tests/racket/mutex004/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/mutex004/run
+++ b/tests/racket/mutex004/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/mutex005/run b/tests/racket/mutex005/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/mutex005/run
+++ b/tests/racket/mutex005/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/semaphores001/run b/tests/racket/semaphores001/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/semaphores001/run
+++ b/tests/racket/semaphores001/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/racket/semaphores002/run b/tests/racket/semaphores002/run
index d0aff72ed69..c6e6f2ab79c 100644
--- a/tests/racket/semaphores002/run
+++ b/tests/racket/semaphores002/run
@@ -1,3 +1,3 @@
 . ../../testutils.sh
 
-run --cg racket Main.idr
+run Main.idr
diff --git a/tests/refc/args/run b/tests/refc/args/run
index 0cd180fe38f..532da5f7b1e 100644
--- a/tests/refc/args/run
+++ b/tests/refc/args/run
@@ -1,5 +1,5 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc_args TestArgs.idr
+idris2 -o refc_args TestArgs.idr
 $VALGRIND ./build/exec/refc_args a b
 ./build/exec/refc_args c
diff --git a/tests/refc/basicpatternmatch/run b/tests/refc/basicpatternmatch/run
index eaf14ec802f..a0a1ca7c838 100644
--- a/tests/refc/basicpatternmatch/run
+++ b/tests/refc/basicpatternmatch/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o main Main.idr
+idris2 -o main Main.idr
 $VALGRIND ./build/exec/main
diff --git a/tests/refc/buffer/run b/tests/refc/buffer/run
index b604e04bac0..8cb74a0c348 100644
--- a/tests/refc/buffer/run
+++ b/tests/refc/buffer/run
@@ -1,6 +1,6 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc_buffer TestBuffer.idr
+idris2 -o refc_buffer TestBuffer.idr
 $VALGRIND ./build/exec/refc_buffer
 base64 -i testWrite.buf
 
diff --git a/tests/refc/callingConvention/run b/tests/refc/callingConvention/run
index d5065c402ba..96b3c92977e 100644
--- a/tests/refc/callingConvention/run
+++ b/tests/refc/callingConvention/run
@@ -1,6 +1,6 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o main Main.idr
+idris2 -o main Main.idr
 awk -v RS= '/Value \*Main_dupargs/' build/exec/main.c
 awk -v RS= '/Value \*Main_last/' build/exec/main.c
 awk -v RS= '/Value \*Main_main/' build/exec/main.c
diff --git a/tests/refc/ccompilerArgs/run b/tests/refc/ccompilerArgs/run
index ef84ccaefda..994297d7777 100755
--- a/tests/refc/ccompilerArgs/run
+++ b/tests/refc/ccompilerArgs/run
@@ -26,6 +26,6 @@ export LDLIBS="-lexternalc"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./library/"
 export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:./library/"
 
-idris2 --cg refc -o cffi Main.idr
+idris2 -o cffi Main.idr
 
 $VALGRIND ./build/exec/cffi
diff --git a/tests/refc/clock/run b/tests/refc/clock/run
index 06a0c52017d..e6674ac0e25 100644
--- a/tests/refc/clock/run
+++ b/tests/refc/clock/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc_clock TestClock.idr > /dev/null
+idris2 -o refc_clock TestClock.idr > /dev/null
 ./build/exec/refc_clock
diff --git a/tests/refc/doubles/run b/tests/refc/doubles/run
index 94fc97d4760..c8fd9318ac1 100644
--- a/tests/refc/doubles/run
+++ b/tests/refc/doubles/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc_doubles TestDoubles.idr
+idris2 -o refc_doubles TestDoubles.idr
 $VALGRIND ./build/exec/refc_doubles
diff --git a/tests/refc/garbageCollect/run b/tests/refc/garbageCollect/run
index c3714c3fb37..fc1a4f17809 100644
--- a/tests/refc/garbageCollect/run
+++ b/tests/refc/garbageCollect/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o testGC TestGarbageCollect.idr
+idris2 -o testGC TestGarbageCollect.idr
 $VALGRIND ./build/exec/testGC | safesort
diff --git a/tests/refc/integers/run b/tests/refc/integers/run
index cc6f588e8f5..98581995322 100644
--- a/tests/refc/integers/run
+++ b/tests/refc/integers/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc_integers TestIntegers.idr
+idris2 -o refc_integers TestIntegers.idr
 $VALGRIND ./build/exec/refc_integers
diff --git a/tests/refc/issue1778/run b/tests/refc/issue1778/run
index 8fb728a2751..37bc7dc0587 100644
--- a/tests/refc/issue1778/run
+++ b/tests/refc/issue1778/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o reverse Reverse.idr
+idris2 -o reverse Reverse.idr
 $VALGRIND ./build/exec/reverse
diff --git a/tests/refc/issue2424/run b/tests/refc/issue2424/run
index 7428adc7add..9d0388d2334 100644
--- a/tests/refc/issue2424/run
+++ b/tests/refc/issue2424/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o test ControlAppMonadTest.idr
+idris2 -o test ControlAppMonadTest.idr
 $VALGRIND ./build/exec/test
diff --git a/tests/refc/issue2452/run b/tests/refc/issue2452/run
index 396e30a2c5d..baf3dd9c457 100644
--- a/tests/refc/issue2452/run
+++ b/tests/refc/issue2452/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o bits_case BitsCase.idr
+idris2 -o bits_case BitsCase.idr
 $VALGRIND ./build/exec/bits_case
\ No newline at end of file
diff --git a/tests/refc/piTypecase001/run b/tests/refc/piTypecase001/run
index 636e6f75ce4..fdad6e6c470 100644
--- a/tests/refc/piTypecase001/run
+++ b/tests/refc/piTypecase001/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc_typecase Test.idr
+idris2 -o refc_typecase Test.idr
 ./build/exec/refc_typecase
diff --git a/tests/refc/prims/run b/tests/refc/prims/run
index b9143b166b9..5a376caea7b 100644
--- a/tests/refc/prims/run
+++ b/tests/refc/prims/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o test Test.idr
+idris2 -o test Test.idr
 $VALGRIND ./build/exec/test
diff --git a/tests/refc/refc001/run b/tests/refc/refc001/run
index 6a4cf2ab91e..56589f111a4 100644
--- a/tests/refc/refc001/run
+++ b/tests/refc/refc001/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc001 Tail.idr
+idris2 -o refc001 Tail.idr
 $VALGRIND ./build/exec/refc001
diff --git a/tests/refc/refc002/run b/tests/refc/refc002/run
index dc65addc0b2..9c9624b2b5a 100644
--- a/tests/refc/refc002/run
+++ b/tests/refc/refc002/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc002 RecordProjection.idr
+idris2 -o refc002 RecordProjection.idr
 $VALGRIND ./build/exec/refc002
diff --git a/tests/refc/refc003/run b/tests/refc/refc003/run
index 1c4b2bff9f9..da5faf29335 100644
--- a/tests/refc/refc003/run
+++ b/tests/refc/refc003/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o refc003 Issue1191.idr
+idris2 -o refc003 Issue1191.idr
 $VALGRIND ./build/exec/refc003
diff --git a/tests/refc/reg001/run b/tests/refc/reg001/run
index e412f72b3ea..250007beb58 100755
--- a/tests/refc/reg001/run
+++ b/tests/refc/reg001/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc Issue1843.idr -o test
+idris2 Issue1843.idr -o test
 $VALGRIND ./build/exec/test
diff --git a/tests/refc/reuse/run b/tests/refc/reuse/run
index 20b3b22f333..04daa4e47f6 100644
--- a/tests/refc/reuse/run
+++ b/tests/refc/reuse/run
@@ -1,5 +1,5 @@
 . ../../testutils.sh
 
-idris2 --cg refc -o main Main.idr
+idris2 -o main Main.idr
 $VALGRIND ./build/exec/main
-awk -v RS= '/Value \*Main_insert/' build/exec/main.c
\ No newline at end of file
+awk -v RS= '/Value \*Main_insert/' build/exec/main.c
diff --git a/tests/refc/strings/run b/tests/refc/strings/run
index 5bc9970184c..c2e79323a66 100644
--- a/tests/refc/strings/run
+++ b/tests/refc/strings/run
@@ -1,4 +1,4 @@
 . ../../testutils.sh
 
-idris2 --cg refc -p contrib -o refc_strings TestStrings.idr
+idris2 -p contrib -o refc_strings TestStrings.idr
 $VALGRIND ./build/exec/refc_strings