diff --git a/src/test/java/ScannerParserTests.java b/src/test/java/ScannerParserTests.java
index 83f65b8..9f2479f 100644
--- a/src/test/java/ScannerParserTests.java
+++ b/src/test/java/ScannerParserTests.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ScannerParserTests {
+class ScannerParserTests {
 //
 //    @Test
 //    public void testPublicClass() {
@@ -74,147 +74,147 @@ public class ScannerParserTests {
     // Feature Tests
 
     @Test
-    public void testBreak() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Break.java"));
+    void testBreak() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Break.java"));
         assertEquals(AST_Break.get(), resultAst);
     }
 
     @Test
-    public void testClass() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Class.java"));
+    void testClass() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Class.java"));
         assertEquals(AST_Class.get(), resultAst);
     }
 
     @Test
-    public void testClassObjects() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/ClassObjects.java"));
+    void testClassObjects() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/ClassObjects.java"));
         assertEquals(AST_ClassObjects.get(), resultAst);
     }
     //TODO: nochmal drüberschauen, nachfragen wegen true/false bei FieldVarAccess
 
     @Test
-    public void testComment() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Comment.java"));
+    void testComment() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Comment.java"));
         assertEquals(AST_Comment.get(), resultAst);
     }
 
     @Test
-    public void testCompAssign() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/CompAssign.java"));
+    void testCompAssign() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/CompAssign.java"));
         assertEquals(AST_CompAssign.get(), resultAst);
     }
 
     @Test
-    public void testComplexCalls() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/ComplexCalls.java"));
+    void testComplexCalls() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/ComplexCalls.java"));
         assertEquals(AST_ComplexCalls.get(), resultAst);
     }
 
     @Test
-    public void testConstructor() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Constructor.java"));
+    void testConstructor() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Constructor.java"));
         assertEquals(AST_Constructor.get(), resultAst);
     }
 
     @Test
-    public void testContinue() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Continue.java"));
+    void testContinue() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Continue.java"));
         assertEquals(AST_Continue.get(), resultAst);
     }
 
     @Test
-    public void testDataTypes() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/DataTypes.java"));
+    void testDataTypes() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/DataTypes.java"));
         assertEquals(AST_DataTypes.get(), resultAst);
     }
 
     @Test
-    public void testField() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Field.java"));
+    void testField() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Field.java"));
         assertEquals(AST_Field.get(), resultAst);
     }
 
     @Test
-    public void testFor() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/For.java"));
+    void testFor() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/For.java"));
         assertEquals(AST_For.get(), resultAst);
     }
 
     @Test
-    public void testIf() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/If.java"));
+    void testIf() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/If.java"));
         assertEquals(AST_If.get(), resultAst);
     }
 
     @Test
-    public void testLogicExpr() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/LogicExpr.java"));
+    void testLogicExpr() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/LogicExpr.java"));
         assertEquals(AST_LogicExpr.get(), resultAst);
     }
 
     @Test
-    public void testMain() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Main.java"));
+    void testMain() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Main.java"));
         assertEquals(AST_Main.get(), resultAst);
     }
 
     @Test
-    public void testMethod() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Method.java"));
+    void testMethod() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Method.java"));
         assertEquals(AST_Method.get(), resultAst);
     }
 
     @Test
-    public void testMethodCall() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/MethodCall.java"));
+    void testMethodCall() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/MethodCall.java"));
         assertEquals(AST_MethodCall.get(), resultAst);
     }
 
     @Test
-    public void testMultipleClasses() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/MultipleClasses1.java"));
+    void testMultipleClasses() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/MultipleClasses.java"));
         assertEquals(AST_MultipleClasses.get(), resultAst);
     }
 
     @Test
-    public void testOperators() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Operators.java"));
+    void testOperators() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Operators.java"));
         assertEquals(AST_Operators.get(), resultAst);
     }
 
     @Test
-    public void testOverloaded() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Overloaded.java"));
+    void testOverloaded() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Overloaded.java"));
         assertEquals(AST_Overloaded.get(), resultAst);
     }
 
     @Test
-    public void testPrint() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Print.java"));
+    void testPrint() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Print.java"));
         assertEquals(AST_Print.get(), resultAst);
     }
 
     @Test
-    public void testReturn() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Return.java"));
+    void testReturn() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Return.java"));
         assertEquals(AST_Return.get(), resultAst);
     }
 
     @Test
-    public void testUnary() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/Unary.java"));
+    void testUnary() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/Unary.java"));
         assertEquals(AST_Unary.get(), resultAst);
     }
 
     @Test
-    public void testVariableDefWithDecl() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/VariableDefWithDecl.java"));
+    void testVariableDefWithDecl() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/VariableDefWithDecl.java"));
         assertEquals(AST_VariableDefWithDecl.get(), resultAst);
     }
 
     @Test
-    public void testWhile() {
-        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/JavaTestfilesFeatures/While.java"));
+    void testWhile() {
+        Program resultAst = Compiler.generateASTFromFiles(List.of("src/test/testFiles/ASTandTypedASTFeatures/While.java"));
         assertEquals(AST_While.get(), resultAst);
     }
 }