diff --git a/goal_src/test/generated-test.gc b/goal_src/test/generated-test.gc
deleted file mode 100644
index 6185b4d3b..000000000
--- a/goal_src/test/generated-test.gc
+++ /dev/null
@@ -1,2 +0,0 @@
-; simply return an integer
-#x123456789
\ No newline at end of file
diff --git a/goal_src/test/test-add-int-constants.gc b/goal_src/test/test-add-int-constants.gc
deleted file mode 100644
index 422b5923f..000000000
--- a/goal_src/test/test-add-int-constants.gc
+++ /dev/null
@@ -1 +0,0 @@
-(+ 15 -2)
\ No newline at end of file
diff --git a/goal_src/test/test-return-integer-1.gc b/goal_src/test/test-return-integer-1.gc
deleted file mode 100644
index 6185b4d3b..000000000
--- a/goal_src/test/test-return-integer-1.gc
+++ /dev/null
@@ -1,2 +0,0 @@
-; simply return an integer
-#x123456789
\ No newline at end of file
diff --git a/goal_src/test/test-return-integer-2.gc b/goal_src/test/test-return-integer-2.gc
deleted file mode 100644
index 254b43b37..000000000
--- a/goal_src/test/test-return-integer-2.gc
+++ /dev/null
@@ -1 +0,0 @@
-#x17
\ No newline at end of file
diff --git a/goal_src/test/test-return-integer-3.gc b/goal_src/test/test-return-integer-3.gc
deleted file mode 100644
index e85c88864..000000000
--- a/goal_src/test/test-return-integer-3.gc
+++ /dev/null
@@ -1 +0,0 @@
--17
\ No newline at end of file
diff --git a/goal_src/test/test-return-integer-4.gc b/goal_src/test/test-return-integer-4.gc
deleted file mode 100644
index f6712382e..000000000
--- a/goal_src/test/test-return-integer-4.gc
+++ /dev/null
@@ -1 +0,0 @@
--2147483648
\ No newline at end of file
diff --git a/goal_src/test/test-return-integer-5.gc b/goal_src/test/test-return-integer-5.gc
deleted file mode 100644
index 0a0dce03c..000000000
--- a/goal_src/test/test-return-integer-5.gc
+++ /dev/null
@@ -1 +0,0 @@
--2147483649
\ No newline at end of file
diff --git a/goal_src/test/test-return-integer-6.gc b/goal_src/test/test-return-integer-6.gc
deleted file mode 100644
index c22708346..000000000
--- a/goal_src/test/test-return-integer-6.gc
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/goal_src/test/test-return-integer-7.gc b/goal_src/test/test-return-integer-7.gc
deleted file mode 100644
index bf79039cd..000000000
--- a/goal_src/test/test-return-integer-7.gc
+++ /dev/null
@@ -1 +0,0 @@
--123
\ No newline at end of file
diff --git a/goal_src/test/test-add-function-returns.gc b/test/goalc/source_templates/arithmetic/add-function.static.gc
similarity index 100%
rename from goal_src/test/test-add-function-returns.gc
rename to test/goalc/source_templates/arithmetic/add-function.static.gc
diff --git a/test/goalc/source_templates/arithmetic/add-int-literals.static.gc b/test/goalc/source_templates/arithmetic/add-int-literals.static.gc
new file mode 100644
index 000000000..6b14a696e
--- /dev/null
+++ b/test/goalc/source_templates/arithmetic/add-int-literals.static.gc
@@ -0,0 +1,4 @@
+; TODO this would be an easy function to templatize
+; but I'm not sure how to easily do it in test_arithmetic.cpp without repeating the fixture boilerplate
+
+(+ 15 -2)
\ No newline at end of file
diff --git a/goal_src/test/test-add-int-multiple-2.gc b/test/goalc/source_templates/arithmetic/add-int-multiple-2.static.gc
similarity index 100%
rename from goal_src/test/test-add-int-multiple-2.gc
rename to test/goalc/source_templates/arithmetic/add-int-multiple-2.static.gc
diff --git a/goal_src/test/test-add-int-multiple.gc b/test/goalc/source_templates/arithmetic/add-int-multiple.static.gc
similarity index 100%
rename from goal_src/test/test-add-int-multiple.gc
rename to test/goalc/source_templates/arithmetic/add-int-multiple.static.gc
diff --git a/goal_src/test/test-add-int-vars.gc b/test/goalc/source_templates/arithmetic/add-int-vars.static.gc
similarity index 100%
rename from goal_src/test/test-add-int-vars.gc
rename to test/goalc/source_templates/arithmetic/add-int-vars.static.gc
diff --git a/goal_src/test/test-three-reg-add.gc b/test/goalc/source_templates/arithmetic/add-let.static.gc
similarity index 100%
rename from goal_src/test/test-three-reg-add.gc
rename to test/goalc/source_templates/arithmetic/add-let.static.gc
diff --git a/goal_src/test/test-ash.gc b/test/goalc/source_templates/arithmetic/ash.static.gc
similarity index 100%
rename from goal_src/test/test-ash.gc
rename to test/goalc/source_templates/arithmetic/ash.static.gc
diff --git a/goal_src/test/test-div-1.gc b/test/goalc/source_templates/arithmetic/divide-1.static.gc
similarity index 100%
rename from goal_src/test/test-div-1.gc
rename to test/goalc/source_templates/arithmetic/divide-1.static.gc
diff --git a/goal_src/test/test-div-2.gc b/test/goalc/source_templates/arithmetic/divide-2.static.gc
similarity index 100%
rename from goal_src/test/test-div-2.gc
rename to test/goalc/source_templates/arithmetic/divide-2.static.gc
diff --git a/test/goalc/source_templates/integer-test.template.gc b/test/goalc/source_templates/arithmetic/eval-integer.template.gc
similarity index 100%
rename from test/goalc/source_templates/integer-test.template.gc
rename to test/goalc/source_templates/arithmetic/eval-integer.template.gc
diff --git a/goal_src/test/test-mod.gc b/test/goalc/source_templates/arithmetic/mod.static.gc
similarity index 100%
rename from goal_src/test/test-mod.gc
rename to test/goalc/source_templates/arithmetic/mod.static.gc
diff --git a/goal_src/test/test-three-reg-mult.gc b/test/goalc/source_templates/arithmetic/multiply-let.static.gc
similarity index 100%
rename from goal_src/test/test-three-reg-mult.gc
rename to test/goalc/source_templates/arithmetic/multiply-let.static.gc
diff --git a/goal_src/test/test-mul-1.gc b/test/goalc/source_templates/arithmetic/multiply.static.gc
similarity index 100%
rename from goal_src/test/test-mul-1.gc
rename to test/goalc/source_templates/arithmetic/multiply.static.gc
diff --git a/goal_src/test/test-negative-integer-symbol.gc b/test/goalc/source_templates/arithmetic/negative-int-symbol.static.gc
similarity index 100%
rename from goal_src/test/test-negative-integer-symbol.gc
rename to test/goalc/source_templates/arithmetic/negative-int-symbol.static.gc
diff --git a/goal_src/test/test-nested-function-call-2.gc b/test/goalc/source_templates/arithmetic/nested-function.static.gc
similarity index 100%
rename from goal_src/test/test-nested-function-call-2.gc
rename to test/goalc/source_templates/arithmetic/nested-function.static.gc
diff --git a/goal_src/test/test-shiftvs.gc b/test/goalc/source_templates/arithmetic/shiftvs.static.gc
similarity index 100%
rename from goal_src/test/test-shiftvs.gc
rename to test/goalc/source_templates/arithmetic/shiftvs.static.gc
diff --git a/goal_src/test/test-sub-1.gc b/test/goalc/source_templates/arithmetic/subtract-1.static.gc
similarity index 100%
rename from goal_src/test/test-sub-1.gc
rename to test/goalc/source_templates/arithmetic/subtract-1.static.gc
diff --git a/goal_src/test/test-sub-2.gc b/test/goalc/source_templates/arithmetic/subtract-2.static.gc
similarity index 100%
rename from goal_src/test/test-sub-2.gc
rename to test/goalc/source_templates/arithmetic/subtract-2.static.gc
diff --git a/goal_src/test/test-three-reg-sub.gc b/test/goalc/source_templates/arithmetic/subtract-let.static.gc
similarity index 100%
rename from goal_src/test/test-three-reg-sub.gc
rename to test/goalc/source_templates/arithmetic/subtract-let.static.gc
diff --git a/goal_src/test/test-car-cdr-get.gc b/test/goalc/source_templates/collections/car-cdr-get.static.gc
similarity index 100%
rename from goal_src/test/test-car-cdr-get.gc
rename to test/goalc/source_templates/collections/car-cdr-get.static.gc
diff --git a/goal_src/test/test-car-cdr-set.gc b/test/goalc/source_templates/collections/car-cdr-set.static.gc
similarity index 100%
rename from goal_src/test/test-car-cdr-set.gc
rename to test/goalc/source_templates/collections/car-cdr-set.static.gc
diff --git a/goal_src/test/test-cons.gc b/test/goalc/source_templates/collections/cons.static.gc
similarity index 100%
rename from goal_src/test/test-cons.gc
rename to test/goalc/source_templates/collections/cons.static.gc
diff --git a/goal_src/test/test-empty-pair.gc b/test/goalc/source_templates/collections/empty-pair.static.gc
similarity index 100%
rename from goal_src/test/test-empty-pair.gc
rename to test/goalc/source_templates/collections/empty-pair.static.gc
diff --git a/goal_src/test/test-inline-array-field.gc b/test/goalc/source_templates/collections/inline-array-field.static.gc
similarity index 100%
rename from goal_src/test/test-inline-array-field.gc
rename to test/goalc/source_templates/collections/inline-array-field.static.gc
diff --git a/goal_src/test/test-list.gc b/test/goalc/source_templates/collections/list.static.gc
similarity index 100%
rename from goal_src/test/test-list.gc
rename to test/goalc/source_templates/collections/list.static.gc
diff --git a/goal_src/test/test-nested-car-cdr-set.gc b/test/goalc/source_templates/collections/nested-car-cdr-set.static.gc
similarity index 100%
rename from goal_src/test/test-nested-car-cdr-set.gc
rename to test/goalc/source_templates/collections/nested-car-cdr-set.static.gc
diff --git a/goal_src/test/test-pair-check.gc b/test/goalc/source_templates/collections/pair-check.static.gc
similarity index 100%
rename from goal_src/test/test-pair-check.gc
rename to test/goalc/source_templates/collections/pair-check.static.gc
diff --git a/test/goalc/source_templates/control-statements/conditional-compilation.static.gc b/test/goalc/source_templates/control-statements/conditional-compilation.static.gc
new file mode 100644
index 000000000..27e30228f
--- /dev/null
+++ b/test/goalc/source_templates/control-statements/conditional-compilation.static.gc
@@ -0,0 +1,12 @@
+;; test the use of #cond to evaluate goos expressions at compile time
+
+(#cond
+ ((> 2 (+ 2 1))
+  1
+  (invalid-code)
+  )
+
+ ((< 2 (+ 1 2))
+  3
+  )
+ )
\ No newline at end of file
diff --git a/goal_src/test/test-goto-1.gc b/test/goalc/source_templates/control-statements/goto.static.gc
similarity index 100%
rename from goal_src/test/test-goto-1.gc
rename to test/goalc/source_templates/control-statements/goto.static.gc
diff --git a/goal_src/test/test-nested-blocks-1.gc b/test/goalc/source_templates/control-statements/nested-blocks-1.static.gc
similarity index 100%
rename from goal_src/test/test-nested-blocks-1.gc
rename to test/goalc/source_templates/control-statements/nested-blocks-1.static.gc
diff --git a/goal_src/test/test-nested-blocks-2.gc b/test/goalc/source_templates/control-statements/nested-blocks-2.static.gc
similarity index 100%
rename from goal_src/test/test-nested-blocks-2.gc
rename to test/goalc/source_templates/control-statements/nested-blocks-2.static.gc
diff --git a/goal_src/test/test-nested-blocks-3.gc b/test/goalc/source_templates/control-statements/nested-blocks-3.static.gc
similarity index 100%
rename from goal_src/test/test-nested-blocks-3.gc
rename to test/goalc/source_templates/control-statements/nested-blocks-3.static.gc
diff --git a/goal_src/test/test-return-value-of-if.gc b/test/goalc/source_templates/control-statements/return-value-of-if.static.gc
similarity index 100%
rename from goal_src/test/test-return-value-of-if.gc
rename to test/goalc/source_templates/control-statements/return-value-of-if.static.gc
diff --git a/goal_src/test/test-float-function.gc b/test/goalc/source_templates/float/float-function.static.gc
similarity index 100%
rename from goal_src/test/test-float-function.gc
rename to test/goalc/source_templates/float/float-function.static.gc
diff --git a/goal_src/test/test-float-in-symbol.gc b/test/goalc/source_templates/float/float-in-symbol.static.gc
similarity index 100%
rename from goal_src/test/test-float-in-symbol.gc
rename to test/goalc/source_templates/float/float-in-symbol.static.gc
diff --git a/goal_src/test/test-float-pow-function.gc b/test/goalc/source_templates/float/float-pow.static.gc
similarity index 100%
rename from goal_src/test/test-float-pow-function.gc
rename to test/goalc/source_templates/float/float-pow.static.gc
diff --git a/goal_src/test/test-float-product.gc b/test/goalc/source_templates/float/float-product.static.gc
similarity index 100%
rename from goal_src/test/test-float-product.gc
rename to test/goalc/source_templates/float/float-product.static.gc
diff --git a/goal_src/test/test-floating-point-1.gc b/test/goalc/source_templates/float/float.static.gc
similarity index 100%
rename from goal_src/test/test-floating-point-1.gc
rename to test/goalc/source_templates/float/float.static.gc
diff --git a/goal_src/test/test-function-return-constant-float.gc b/test/goalc/source_templates/float/function-return-float-constant.static.gc
similarity index 100%
rename from goal_src/test/test-function-return-constant-float.gc
rename to test/goalc/source_templates/float/function-return-float-constant.static.gc
diff --git a/goal_src/test/test-nested-float-functions.gc b/test/goalc/source_templates/float/nested-float-functions.static.gc
similarity index 100%
rename from goal_src/test/test-nested-float-functions.gc
rename to test/goalc/source_templates/float/nested-float-functions.static.gc
diff --git a/goal_src/test/test-declare-inline.gc b/test/goalc/source_templates/functions/declare-inline.static.gc
similarity index 100%
rename from goal_src/test/test-declare-inline.gc
rename to test/goalc/source_templates/functions/declare-inline.static.gc
diff --git a/goal_src/test/test-defun-return-constant.gc b/test/goalc/source_templates/functions/defun-return-constant.static.gc
similarity index 100%
rename from goal_src/test/test-defun-return-constant.gc
rename to test/goalc/source_templates/functions/defun-return-constant.static.gc
diff --git a/goal_src/test/test-defun-return-symbol.gc b/test/goalc/source_templates/functions/defun-return-symbol.static.gc
similarity index 100%
rename from goal_src/test/test-defun-return-symbol.gc
rename to test/goalc/source_templates/functions/defun-return-symbol.static.gc
diff --git a/goal_src/test/test-inline-call.gc b/test/goalc/source_templates/functions/inline-call.static.gc
similarity index 100%
rename from goal_src/test/test-inline-call.gc
rename to test/goalc/source_templates/functions/inline-call.static.gc
diff --git a/goal_src/test/test-application-lambda-1.gc b/test/goalc/source_templates/functions/lambda-1.static.gc
similarity index 100%
rename from goal_src/test/test-application-lambda-1.gc
rename to test/goalc/source_templates/functions/lambda-1.static.gc
diff --git a/goal_src/test/test-nested-function-call.gc b/test/goalc/source_templates/functions/nested-call.static.gc
similarity index 100%
rename from goal_src/test/test-nested-function-call.gc
rename to test/goalc/source_templates/functions/nested-call.static.gc
diff --git a/goal_src/test/test-function-return-arg.gc b/test/goalc/source_templates/functions/return-arg.static.gc
similarity index 100%
rename from goal_src/test/test-function-return-arg.gc
rename to test/goalc/source_templates/functions/return-arg.static.gc
diff --git a/goal_src/test/test-return-from-f-tricky-color.gc b/test/goalc/source_templates/functions/return-colors.static.gc
similarity index 100%
rename from goal_src/test/test-return-from-f-tricky-color.gc
rename to test/goalc/source_templates/functions/return-colors.static.gc
diff --git a/goal_src/test/test-return-from-f.gc b/test/goalc/source_templates/functions/return.static.gc
similarity index 100%
rename from goal_src/test/test-return-from-f.gc
rename to test/goalc/source_templates/functions/return.static.gc
diff --git a/goal_src/test/test-simple-function-call.gc b/test/goalc/source_templates/functions/simple-call.static.gc
similarity index 100%
rename from goal_src/test/test-simple-function-call.gc
rename to test/goalc/source_templates/functions/simple-call.static.gc
diff --git a/goal_src/test/test-align16-1.gc b/test/goalc/source_templates/library/align16-1.static.gc
similarity index 100%
rename from goal_src/test/test-align16-1.gc
rename to test/goalc/source_templates/library/align16-1.static.gc
diff --git a/goal_src/test/test-align16-2.gc b/test/goalc/source_templates/library/align16-2.static.gc
similarity index 100%
rename from goal_src/test/test-align16-2.gc
rename to test/goalc/source_templates/library/align16-2.static.gc
diff --git a/goal_src/test/test-protect.gc b/test/goalc/source_templates/library/protect.static.gc
similarity index 100%
rename from goal_src/test/test-protect.gc
rename to test/goalc/source_templates/library/protect.static.gc
diff --git a/goal_src/test/test-set-symbol.gc b/test/goalc/source_templates/library/set-symbol.static.gc
similarity index 100%
rename from goal_src/test/test-set-symbol.gc
rename to test/goalc/source_templates/library/set-symbol.static.gc
diff --git a/goal_src/test/test-logand.gc b/test/goalc/source_templates/logic/logand.static.gc
similarity index 100%
rename from goal_src/test/test-logand.gc
rename to test/goalc/source_templates/logic/logand.static.gc
diff --git a/goal_src/test/test-logior.gc b/test/goalc/source_templates/logic/logior.static.gc
similarity index 100%
rename from goal_src/test/test-logior.gc
rename to test/goalc/source_templates/logic/logior.static.gc
diff --git a/goal_src/test/test-logxor.gc b/test/goalc/source_templates/logic/logxor.static.gc
similarity index 100%
rename from goal_src/test/test-logxor.gc
rename to test/goalc/source_templates/logic/logxor.static.gc
diff --git a/goal_src/test/test-signed-int-compare.gc b/test/goalc/source_templates/logic/signed-int-compare.static.gc
similarity index 100%
rename from goal_src/test/test-signed-int-compare.gc
rename to test/goalc/source_templates/logic/signed-int-compare.static.gc
diff --git a/goal_src/test/test-dotimes.gc b/test/goalc/source_templates/loop_recur/dotimes.static.gc
similarity index 100%
rename from goal_src/test/test-dotimes.gc
rename to test/goalc/source_templates/loop_recur/dotimes.static.gc
diff --git a/goal_src/test/test-factorial-loop.gc b/test/goalc/source_templates/loop_recur/factorial-iterative.static.gc
similarity index 100%
rename from goal_src/test/test-factorial-loop.gc
rename to test/goalc/source_templates/loop_recur/factorial-iterative.static.gc
diff --git a/goal_src/test/test-factorial-recursive.gc b/test/goalc/source_templates/loop_recur/factorial-recursive.static.gc
similarity index 100%
rename from goal_src/test/test-factorial-recursive.gc
rename to test/goalc/source_templates/loop_recur/factorial-recursive.static.gc
diff --git a/goal_src/test/test-defsmacro-defgmacro.gc b/test/goalc/source_templates/macros/defsmacro-defgmacro.static.gc
similarity index 100%
rename from goal_src/test/test-defsmacro-defgmacro.gc
rename to test/goalc/source_templates/macros/defsmacro-defgmacro.static.gc
diff --git a/goal_src/test/test-desfun.gc b/test/goalc/source_templates/macros/desfun.static.gc
similarity index 100%
rename from goal_src/test/test-desfun.gc
rename to test/goalc/source_templates/macros/desfun.static.gc
diff --git a/goal_src/test/test-methods.gc b/test/goalc/source_templates/methods/methods.static.gc
similarity index 100%
rename from goal_src/test/test-methods.gc
rename to test/goalc/source_templates/methods/methods.static.gc
diff --git a/goal_src/test/test-deref-simple.gc b/test/goalc/source_templates/pointers/deref-simple.static.gc
similarity index 100%
rename from goal_src/test/test-deref-simple.gc
rename to test/goalc/source_templates/pointers/deref-simple.static.gc
diff --git a/goal_src/test/test-pointers-1.gc b/test/goalc/source_templates/pointers/pointers.static.gc
similarity index 100%
rename from goal_src/test/test-pointers-1.gc
rename to test/goalc/source_templates/pointers/pointers.static.gc
diff --git a/goal_src/test/test-format-reg-order.gc b/test/goalc/source_templates/strings/format-reg-order.static.gc
similarity index 100%
rename from goal_src/test/test-format-reg-order.gc
rename to test/goalc/source_templates/strings/format-reg-order.static.gc
diff --git a/goal_src/test/test-quote-symbol.gc b/test/goalc/source_templates/strings/quote-symbol.static.gc
similarity index 100%
rename from goal_src/test/test-quote-symbol.gc
rename to test/goalc/source_templates/strings/quote-symbol.static.gc
diff --git a/goal_src/test/test-string-constant-1.gc b/test/goalc/source_templates/strings/string-constant-1.static.gc
similarity index 100%
rename from goal_src/test/test-string-constant-1.gc
rename to test/goalc/source_templates/strings/string-constant-1.static.gc
diff --git a/goal_src/test/test-string-constant-2.gc b/test/goalc/source_templates/strings/string-constant-2.static.gc
similarity index 100%
rename from goal_src/test/test-string-constant-2.gc
rename to test/goalc/source_templates/strings/string-constant-2.static.gc
diff --git a/goal_src/test/test-string-symbol.gc b/test/goalc/source_templates/strings/string-symbol.static.gc
similarity index 100%
rename from goal_src/test/test-string-symbol.gc
rename to test/goalc/source_templates/strings/string-symbol.static.gc
diff --git a/goal_src/test/test-get-symbol-1.gc b/test/goalc/source_templates/symbols/get-symbol-1.static.gc
similarity index 100%
rename from goal_src/test/test-get-symbol-1.gc
rename to test/goalc/source_templates/symbols/get-symbol-1.static.gc
diff --git a/goal_src/test/test-get-symbol-2.gc b/test/goalc/source_templates/symbols/get-symbol-2.static.gc
similarity index 100%
rename from goal_src/test/test-get-symbol-2.gc
rename to test/goalc/source_templates/symbols/get-symbol-2.static.gc
diff --git a/goal_src/test/test-defglobalconstant-1.gc b/test/goalc/source_templates/variables/defglobalconstant-1.static.gc
similarity index 100%
rename from goal_src/test/test-defglobalconstant-1.gc
rename to test/goalc/source_templates/variables/defglobalconstant-1.static.gc
diff --git a/goal_src/test/test-defglobalconstant-2.gc b/test/goalc/source_templates/variables/defglobalconstant-2.static.gc
similarity index 100%
rename from goal_src/test/test-defglobalconstant-2.gc
rename to test/goalc/source_templates/variables/defglobalconstant-2.static.gc
diff --git a/goal_src/test/test-define-1.gc b/test/goalc/source_templates/variables/define.static.gc
similarity index 100%
rename from goal_src/test/test-define-1.gc
rename to test/goalc/source_templates/variables/define.static.gc
diff --git a/goal_src/test/test-let-star-1.gc b/test/goalc/source_templates/variables/let-star.static.gc
similarity index 100%
rename from goal_src/test/test-let-star-1.gc
rename to test/goalc/source_templates/variables/let-star.static.gc
diff --git a/goal_src/test/test-let-1.gc b/test/goalc/source_templates/variables/let.static.gc
similarity index 100%
rename from goal_src/test/test-let-1.gc
rename to test/goalc/source_templates/variables/let.static.gc
diff --git a/goal_src/test/test-mlet.gc b/test/goalc/source_templates/variables/mlet.static.gc
similarity index 100%
rename from goal_src/test/test-mlet.gc
rename to test/goalc/source_templates/variables/mlet.static.gc
diff --git a/test/goalc/source_templates/with_game/defun-return-constant.static.gc b/test/goalc/source_templates/with_game/defun-return-constant.static.gc
new file mode 100644
index 000000000..c23ae10ec
--- /dev/null
+++ b/test/goalc/source_templates/with_game/defun-return-constant.static.gc
@@ -0,0 +1,10 @@
+(defun return-13 ()
+  13)
+
+(defun return-12 ()
+  12)
+
+(defun return-11 ()
+  11)
+
+(return-12)
\ No newline at end of file
diff --git a/test/goalc/source_templates/with_game/defun-return-symbol.static.gc b/test/goalc/source_templates/with_game/defun-return-symbol.static.gc
new file mode 100644
index 000000000..727b5e0d7
--- /dev/null
+++ b/test/goalc/source_templates/with_game/defun-return-symbol.static.gc
@@ -0,0 +1,8 @@
+(define my-number 36)
+
+(defun return-my-number ()
+  my-number)
+
+(define my-number 42)
+
+(return-my-number)
\ No newline at end of file
diff --git a/goal_src/test/test-access-inline-array.gc b/test/goalc/source_templates/with_game/test-access-inline-array.gc
similarity index 100%
rename from goal_src/test/test-access-inline-array.gc
rename to test/goalc/source_templates/with_game/test-access-inline-array.gc
diff --git a/goal_src/test/test-addr-of.gc b/test/goalc/source_templates/with_game/test-addr-of.gc
similarity index 100%
rename from goal_src/test/test-addr-of.gc
rename to test/goalc/source_templates/with_game/test-addr-of.gc
diff --git a/goal_src/test/test-append.gc b/test/goalc/source_templates/with_game/test-append.gc
similarity index 100%
rename from goal_src/test/test-append.gc
rename to test/goalc/source_templates/with_game/test-append.gc
diff --git a/goal_src/test/test-approx-pi.gc b/test/goalc/source_templates/with_game/test-approx-pi.gc
similarity index 100%
rename from goal_src/test/test-approx-pi.gc
rename to test/goalc/source_templates/with_game/test-approx-pi.gc
diff --git a/goal_src/test/test-assoc-1.gc b/test/goalc/source_templates/with_game/test-assoc-1.gc
similarity index 100%
rename from goal_src/test/test-assoc-1.gc
rename to test/goalc/source_templates/with_game/test-assoc-1.gc
diff --git a/goal_src/test/test-assoc-2.gc b/test/goalc/source_templates/with_game/test-assoc-2.gc
similarity index 100%
rename from goal_src/test/test-assoc-2.gc
rename to test/goalc/source_templates/with_game/test-assoc-2.gc
diff --git a/goal_src/test/test-assoce-1.gc b/test/goalc/source_templates/with_game/test-assoce-1.gc
similarity index 100%
rename from goal_src/test/test-assoce-1.gc
rename to test/goalc/source_templates/with_game/test-assoce-1.gc
diff --git a/goal_src/test/test-assoce-2.gc b/test/goalc/source_templates/with_game/test-assoce-2.gc
similarity index 100%
rename from goal_src/test/test-assoce-2.gc
rename to test/goalc/source_templates/with_game/test-assoce-2.gc
diff --git a/goal_src/test/test-basic-type-check.gc b/test/goalc/source_templates/with_game/test-basic-type-check.gc
similarity index 100%
rename from goal_src/test/test-basic-type-check.gc
rename to test/goalc/source_templates/with_game/test-basic-type-check.gc
diff --git a/goal_src/test/test-bfloat.gc b/test/goalc/source_templates/with_game/test-bfloat.gc
similarity index 100%
rename from goal_src/test/test-bfloat.gc
rename to test/goalc/source_templates/with_game/test-bfloat.gc
diff --git a/goal_src/test/test-binteger-print.gc b/test/goalc/source_templates/with_game/test-binteger-print.gc
similarity index 100%
rename from goal_src/test/test-binteger-print.gc
rename to test/goalc/source_templates/with_game/test-binteger-print.gc
diff --git a/goal_src/test/test-condition-boolean.gc b/test/goalc/source_templates/with_game/test-condition-boolean.gc
similarity index 100%
rename from goal_src/test/test-condition-boolean.gc
rename to test/goalc/source_templates/with_game/test-condition-boolean.gc
diff --git a/goal_src/test/test-delete-car.gc b/test/goalc/source_templates/with_game/test-delete-car.gc
similarity index 100%
rename from goal_src/test/test-delete-car.gc
rename to test/goalc/source_templates/with_game/test-delete-car.gc
diff --git a/goal_src/test/test-delete-list.gc b/test/goalc/source_templates/with_game/test-delete-list.gc
similarity index 100%
rename from goal_src/test/test-delete-list.gc
rename to test/goalc/source_templates/with_game/test-delete-list.gc
diff --git a/goal_src/test/test-dynamic-type.gc b/test/goalc/source_templates/with_game/test-dynamic-type.gc
similarity index 100%
rename from goal_src/test/test-dynamic-type.gc
rename to test/goalc/source_templates/with_game/test-dynamic-type.gc
diff --git a/goal_src/test/test-find-parent-method.gc b/test/goalc/source_templates/with_game/test-find-parent-method.gc
similarity index 100%
rename from goal_src/test/test-find-parent-method.gc
rename to test/goalc/source_templates/with_game/test-find-parent-method.gc
diff --git a/goal_src/test/test-insert-cons.gc b/test/goalc/source_templates/with_game/test-insert-cons.gc
similarity index 100%
rename from goal_src/test/test-insert-cons.gc
rename to test/goalc/source_templates/with_game/test-insert-cons.gc
diff --git a/goal_src/test/test-last.gc b/test/goalc/source_templates/with_game/test-last.gc
similarity index 100%
rename from goal_src/test/test-last.gc
rename to test/goalc/source_templates/with_game/test-last.gc
diff --git a/goal_src/test/test-member-1.gc b/test/goalc/source_templates/with_game/test-member-1.gc
similarity index 100%
rename from goal_src/test/test-member-1.gc
rename to test/goalc/source_templates/with_game/test-member-1.gc
diff --git a/goal_src/test/test-member-2.gc b/test/goalc/source_templates/with_game/test-member-2.gc
similarity index 100%
rename from goal_src/test/test-member-2.gc
rename to test/goalc/source_templates/with_game/test-member-2.gc
diff --git a/goal_src/test/test-memcpy.gc b/test/goalc/source_templates/with_game/test-memcpy.gc
similarity index 100%
rename from goal_src/test/test-memcpy.gc
rename to test/goalc/source_templates/with_game/test-memcpy.gc
diff --git a/goal_src/test/test-memset.gc b/test/goalc/source_templates/with_game/test-memset.gc
similarity index 100%
rename from goal_src/test/test-memset.gc
rename to test/goalc/source_templates/with_game/test-memset.gc
diff --git a/goal_src/test/test-min-max.gc b/test/goalc/source_templates/with_game/test-min-max.gc
similarity index 100%
rename from goal_src/test/test-min-max.gc
rename to test/goalc/source_templates/with_game/test-min-max.gc
diff --git a/goal_src/test/test-new-inline-array-class.gc b/test/goalc/source_templates/with_game/test-new-inline-array-class.gc
similarity index 100%
rename from goal_src/test/test-new-inline-array-class.gc
rename to test/goalc/source_templates/with_game/test-new-inline-array-class.gc
diff --git a/goal_src/test/test-new-string.gc b/test/goalc/source_templates/with_game/test-new-string.gc
similarity index 100%
rename from goal_src/test/test-new-string.gc
rename to test/goalc/source_templates/with_game/test-new-string.gc
diff --git a/goal_src/test/test-number-comparison.gc b/test/goalc/source_templates/with_game/test-number-comparison.gc
similarity index 100%
rename from goal_src/test/test-number-comparison.gc
rename to test/goalc/source_templates/with_game/test-number-comparison.gc
diff --git a/goal_src/test/test-pair-asize.gc b/test/goalc/source_templates/with_game/test-pair-asize.gc
similarity index 100%
rename from goal_src/test/test-pair-asize.gc
rename to test/goalc/source_templates/with_game/test-pair-asize.gc
diff --git a/goal_src/test/test-pair-length.gc b/test/goalc/source_templates/with_game/test-pair-length.gc
similarity index 100%
rename from goal_src/test/test-pair-length.gc
rename to test/goalc/source_templates/with_game/test-pair-length.gc
diff --git a/goal_src/test/test-ref.gc b/test/goalc/source_templates/with_game/test-ref.gc
similarity index 100%
rename from goal_src/test/test-ref.gc
rename to test/goalc/source_templates/with_game/test-ref.gc
diff --git a/goal_src/test/test-set-self.gc b/test/goalc/source_templates/with_game/test-set-self.gc
similarity index 100%
rename from goal_src/test/test-set-self.gc
rename to test/goalc/source_templates/with_game/test-set-self.gc
diff --git a/goal_src/test/test-sort-2.gc b/test/goalc/source_templates/with_game/test-sort-2.gc
similarity index 100%
rename from goal_src/test/test-sort-2.gc
rename to test/goalc/source_templates/with_game/test-sort-2.gc
diff --git a/goal_src/test/test-sort-3.gc b/test/goalc/source_templates/with_game/test-sort-3.gc
similarity index 100%
rename from goal_src/test/test-sort-3.gc
rename to test/goalc/source_templates/with_game/test-sort-3.gc
diff --git a/goal_src/test/test-sort.gc b/test/goalc/source_templates/with_game/test-sort.gc
similarity index 100%
rename from goal_src/test/test-sort.gc
rename to test/goalc/source_templates/with_game/test-sort.gc
diff --git a/goal_src/test/test-string-type.gc b/test/goalc/source_templates/with_game/test-string-type.gc
similarity index 100%
rename from goal_src/test/test-string-type.gc
rename to test/goalc/source_templates/with_game/test-string-type.gc
diff --git a/goal_src/test/test-tests.gc b/test/goalc/source_templates/with_game/test-tests.gc
similarity index 100%
rename from goal_src/test/test-tests.gc
rename to test/goalc/source_templates/with_game/test-tests.gc
diff --git a/goal_src/test/test-type-arrays.gc b/test/goalc/source_templates/with_game/test-type-arrays.gc
similarity index 100%
rename from goal_src/test/test-type-arrays.gc
rename to test/goalc/source_templates/with_game/test-type-arrays.gc
diff --git a/goal_src/test/test-type-type.gc b/test/goalc/source_templates/with_game/test-type-type.gc
similarity index 100%
rename from goal_src/test/test-type-type.gc
rename to test/goalc/source_templates/with_game/test-type-type.gc