diff --git a/src/main/kotlin/function/builtin/Apply.kt b/src/main/kotlin/function/builtin/Apply.kt
index afe7766..66eb6c4 100644
--- a/src/main/kotlin/function/builtin/Apply.kt
+++ b/src/main/kotlin/function/builtin/Apply.kt
@@ -3,13 +3,12 @@ package function.builtin
 import function.ArgumentValidator
 import function.FunctionNames
 import function.LispFunction
+import function.builtin.Eval.Companion.applyFunction
+import function.builtin.Eval.Companion.lookupFunctionOrLambda
 import sexpression.Cons
 import sexpression.SExpression
 import table.FunctionTable
 
-import function.builtin.Eval.Companion.applyFunction
-import function.builtin.Eval.Companion.lookupFunctionOrLambda
-
 @FunctionNames("APPLY")
 class Apply(name: String) : LispFunction() {
 
diff --git a/src/test/kotlin/function/builtin/FuseTest.kt b/src/test/kotlin/function/builtin/FuseTest.kt
index fc59fa3..d01e112 100644
--- a/src/test/kotlin/function/builtin/FuseTest.kt
+++ b/src/test/kotlin/function/builtin/FuseTest.kt
@@ -6,10 +6,12 @@ import function.ArgumentValidator.TooManyArgumentsException
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
 import sexpression.Symbol
+import testutil.LispTestInstance
 import testutil.SymbolAndFunctionCleaner
 import testutil.TestUtilities.assertSExpressionsMatch
 import testutil.TestUtilities.evaluateString
 
+@LispTestInstance
 class FuseTest : SymbolAndFunctionCleaner() {
 
     @Test
diff --git a/src/test/kotlin/function/builtin/GensymTest.kt b/src/test/kotlin/function/builtin/GensymTest.kt
index 63baa3e..2c0250e 100644
--- a/src/test/kotlin/function/builtin/GensymTest.kt
+++ b/src/test/kotlin/function/builtin/GensymTest.kt
@@ -4,6 +4,7 @@ import function.ArgumentValidator.TooManyArgumentsException
 import function.builtin.Gensym.Companion.GENSYM_PREFIX
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
+import testutil.LispTestInstance
 import testutil.SymbolAndFunctionCleaner
 import testutil.TestUtilities.assertSExpressionsDoNotMatch
 import testutil.TestUtilities.assertSExpressionsMatch
@@ -11,6 +12,7 @@ import testutil.TestUtilities.evaluateString
 import testutil.TypeAssertions.assertSymbol
 import token.TokenFactory.BadCharacterException
 
+@LispTestInstance
 class GensymTest : SymbolAndFunctionCleaner() {
 
     @Test