diff --git a/src/test/resources/input/singleFeatureTests/Char.java b/src/test/resources/input/singleFeatureTests/Char.java
new file mode 100644
index 0000000..54ff6fa
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/Char.java
@@ -0,0 +1,12 @@
+class Char {
+
+    char a;
+
+    public Char(char a){
+        this.a = testMethod(a);
+    }
+
+    char testMethod(char a){
+        return a;
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/Comments.java b/src/test/resources/input/singleFeatureTests/Comments.java
new file mode 100644
index 0000000..fbf3e12
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/Comments.java
@@ -0,0 +1,8 @@
+/*
+
+    Mutliple Line Comment. Ignore
+
+ */
+class Comments{
+    private int a; // Ignore
+}
diff --git a/src/test/resources/input/singleFeatureTests/ConstructorMethodCall.java b/src/test/resources/input/singleFeatureTests/ConstructorMethodCall.java
new file mode 100644
index 0000000..2e0c4a8
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/ConstructorMethodCall.java
@@ -0,0 +1,12 @@
+public class ConstructorMethodCall {
+
+    int a;
+
+    public ConstructorMethodCall(){
+        this.a = testMethod();
+    }
+
+    int testMethod(){
+        return 1;
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/ConstructorMethodCallParameters.java b/src/test/resources/input/singleFeatureTests/ConstructorMethodCallParameters.java
new file mode 100644
index 0000000..61f83e1
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/ConstructorMethodCallParameters.java
@@ -0,0 +1,12 @@
+class ConstructorMethodCallParameters {
+
+    int a;
+
+    public ConstructorMethodCallParameters(int a){
+        this.a = testMethod(a);
+    }
+
+    int testMethod(int a){
+        return a;
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/ConstructorParameter.java b/src/test/resources/input/singleFeatureTests/ConstructorParameter.java
new file mode 100644
index 0000000..1d821ca
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/ConstructorParameter.java
@@ -0,0 +1,5 @@
+class ConstructorParameter {
+    public ConstructorParameter(int a, int b){
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/ConstructorThisDot.java b/src/test/resources/input/singleFeatureTests/ConstructorThisDot.java
new file mode 100644
index 0000000..8e8077b
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/ConstructorThisDot.java
@@ -0,0 +1,8 @@
+class ConstructorThisDot {
+
+    private int a;
+
+    public ConstructorThisDot(int a){
+        this.a = a;
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/DoWhile.java b/src/test/resources/input/singleFeatureTests/DoWhile.java
new file mode 100644
index 0000000..db1b1ab
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/DoWhile.java
@@ -0,0 +1,10 @@
+class DoWhile{
+
+    public DoWhile(){
+        int i = 0;
+
+        do{
+            i++;
+        }while(i < 10);
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/EmptyClass.java b/src/test/resources/input/singleFeatureTests/EmptyClass.java
new file mode 100644
index 0000000..1d9bc30
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/EmptyClass.java
@@ -0,0 +1 @@
+class EmptyClass {}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/EmptyClassWithConstructor.java b/src/test/resources/input/singleFeatureTests/EmptyClassWithConstructor.java
new file mode 100644
index 0000000..5d7333a
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/EmptyClassWithConstructor.java
@@ -0,0 +1,5 @@
+public class EmptyClassWithConstructor {
+    public EmptyClassWithConstructor() {
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/Field.java b/src/test/resources/input/singleFeatureTests/Field.java
new file mode 100644
index 0000000..218857c
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/Field.java
@@ -0,0 +1,3 @@
+class Field {
+    int a;
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/FieldWithAccessModifier.java b/src/test/resources/input/singleFeatureTests/FieldWithAccessModifier.java
new file mode 100644
index 0000000..6bb9e11
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/FieldWithAccessModifier.java
@@ -0,0 +1,3 @@
+public class FieldWithAccessModifier {
+    public int a;
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/For.java b/src/test/resources/input/singleFeatureTests/For.java
new file mode 100644
index 0000000..f8f0fd6
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/For.java
@@ -0,0 +1,8 @@
+class For{
+
+    public For(){
+        for(int i = 0; i < 10; i++){
+            int a;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/If.java b/src/test/resources/input/singleFeatureTests/If.java
new file mode 100644
index 0000000..a83dbbf
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/If.java
@@ -0,0 +1,8 @@
+public class If {
+    public If() {
+        int intValue = 5;
+        if(intValue == 5) {
+            intValue--;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/IfElse.java b/src/test/resources/input/singleFeatureTests/IfElse.java
new file mode 100644
index 0000000..a3a597a
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/IfElse.java
@@ -0,0 +1,10 @@
+public class IfElse {
+    public IfElse() {
+        int intValue = 5;
+        if(intValue == 5) {
+            intValue--;
+        } else {
+            intValue++;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/IfElseIfElse.java b/src/test/resources/input/singleFeatureTests/IfElseIfElse.java
new file mode 100644
index 0000000..b20fb7e
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/IfElseIfElse.java
@@ -0,0 +1,12 @@
+public class IfElseIfElse {
+    public IfElseIfElse() {
+        int intValue = 5;
+        if(intValue == 5) {
+            intValue--;
+        } else if(intValue ==4) {
+            intValue++;
+        } else {
+            intValue++;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/Increment.java b/src/test/resources/input/singleFeatureTests/Increment.java
new file mode 100644
index 0000000..d2789c9
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/Increment.java
@@ -0,0 +1,12 @@
+public class Increment {
+
+    public int test;
+
+    public void increment(int p) {
+        test = p++;
+
+        for(int i = 1; i<=10; i++) {
+            int a = 5;
+        }
+    }
+}
diff --git a/src/test/resources/input/singleFeatureTests/MainMethod.java b/src/test/resources/input/singleFeatureTests/MainMethod.java
new file mode 100644
index 0000000..b6079ae
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/MainMethod.java
@@ -0,0 +1,5 @@
+class MainMethod{
+
+    public static void main(String[] args) {
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/MultipleClasses.java b/src/test/resources/input/singleFeatureTests/MultipleClasses.java
new file mode 100644
index 0000000..dda277c
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/MultipleClasses.java
@@ -0,0 +1,3 @@
+class MultipleClasses {}
+
+class TestClass2{}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/Null.java b/src/test/resources/input/singleFeatureTests/Null.java
new file mode 100644
index 0000000..1c843fa
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/Null.java
@@ -0,0 +1,8 @@
+class Null{
+
+    Null a;
+
+    public Null(){
+      this.a = null;
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/SelfReference.java b/src/test/resources/input/singleFeatureTests/SelfReference.java
new file mode 100644
index 0000000..93bed9e
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/SelfReference.java
@@ -0,0 +1,18 @@
+class SelfReference{
+
+    SelfReference selfReference;
+
+    int testMethod1() {
+        return this.testMethod2();
+    }
+
+    int testMethod2() {
+        return 1;
+    }
+
+    int testMethod3(){
+        SelfReference selfReference1 = new SelfReference();
+        return selfReference1.selfReference.testMethod1();
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/ThisDot.java b/src/test/resources/input/singleFeatureTests/ThisDot.java
new file mode 100644
index 0000000..4d3a41e
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/ThisDot.java
@@ -0,0 +1,8 @@
+class ThisDot {
+
+    public int a;
+
+    public ThisDot() {
+        this.a = 1;
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/VariableCalculation.java b/src/test/resources/input/singleFeatureTests/VariableCalculation.java
new file mode 100644
index 0000000..847b1a6
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/VariableCalculation.java
@@ -0,0 +1,34 @@
+class VariableCalculation{
+
+    int aPlusB(int a, int b){
+        return a + b;
+    }
+
+    int aMinusB(int a, int b){
+        return a - b;
+    }
+
+    int aTimeB(int a, int b){
+        return a * b;
+    }
+
+    int aDivB(int a, int b){
+        return a / b;
+    }
+
+    int complexCalc (int a, int b){
+        return a * b / 1 * 3;
+    }
+
+    boolean aSmallerB (int a, int b){
+        return a < b;
+    }
+
+    boolean aGreaterB (int a, int b){
+        return a > b;
+    }
+
+    boolean aEqualsB (int a, int b){
+        return a == b;
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/VariableCompare.java b/src/test/resources/input/singleFeatureTests/VariableCompare.java
new file mode 100644
index 0000000..70f2a39
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/VariableCompare.java
@@ -0,0 +1,30 @@
+class VariableCompare{
+
+    boolean trueMethod() {
+        return true;
+    }
+
+    boolean falseMethod(){
+        return false;
+    }
+
+    boolean trueAndTrueMethod(){
+        return true && true;
+    }
+
+    boolean trueAndFalseMethod(){
+        return true && false;
+    }
+
+    boolean falseAndFalseMethod(){
+        return false && false;
+    }
+
+    boolean trueOrTrueMethod(){
+        return true || true;
+    }
+
+    boolean falseOrFalseMethod(){
+        return false || false;
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/VoidMethod.java b/src/test/resources/input/singleFeatureTests/VoidMethod.java
new file mode 100644
index 0000000..0d45373
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/VoidMethod.java
@@ -0,0 +1,3 @@
+class VoidMethod{
+    void test(){}
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/While.java b/src/test/resources/input/singleFeatureTests/While.java
new file mode 100644
index 0000000..01dc5fc
--- /dev/null
+++ b/src/test/resources/input/singleFeatureTests/While.java
@@ -0,0 +1,10 @@
+class While{
+
+    public While(){
+        int i = 10;
+
+        while ( i > 0){
+            i--;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/input/singleFeatureTests/CallMethodFromObjekt.java b/src/test/resources/input/typedAstFeatureTests/CallMethodFromObjekt.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/CallMethodFromObjekt.java
rename to src/test/resources/input/typedAstFeatureTests/CallMethodFromObjekt.java
diff --git a/src/test/resources/input/singleFeatureTests/ChainedMethods.java b/src/test/resources/input/typedAstFeatureTests/ChainedMethods.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/ChainedMethods.java
rename to src/test/resources/input/typedAstFeatureTests/ChainedMethods.java
diff --git a/src/test/resources/input/singleFeatureTests/CorrectMemberAccess.java b/src/test/resources/input/typedAstFeatureTests/CorrectMemberAccess.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/CorrectMemberAccess.java
rename to src/test/resources/input/typedAstFeatureTests/CorrectMemberAccess.java
diff --git a/src/test/resources/input/singleFeatureTests/CorrectMethodParameter.java b/src/test/resources/input/typedAstFeatureTests/CorrectMethodParameter.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/CorrectMethodParameter.java
rename to src/test/resources/input/typedAstFeatureTests/CorrectMethodParameter.java
diff --git a/src/test/resources/input/singleFeatureTests/CorrectNonCalcTest.java b/src/test/resources/input/typedAstFeatureTests/CorrectNonCalcTest.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/CorrectNonCalcTest.java
rename to src/test/resources/input/typedAstFeatureTests/CorrectNonCalcTest.java
diff --git a/src/test/resources/input/singleFeatureTests/CorrectReturnType.java b/src/test/resources/input/typedAstFeatureTests/CorrectReturnType.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/CorrectReturnType.java
rename to src/test/resources/input/typedAstFeatureTests/CorrectReturnType.java
diff --git a/src/test/resources/input/singleFeatureTests/CorrectTest.java b/src/test/resources/input/typedAstFeatureTests/CorrectTest.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/CorrectTest.java
rename to src/test/resources/input/typedAstFeatureTests/CorrectTest.java
diff --git a/src/test/resources/input/singleFeatureTests/FullTest.java b/src/test/resources/input/typedAstFeatureTests/FullTest.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/FullTest.java
rename to src/test/resources/input/typedAstFeatureTests/FullTest.java
diff --git a/src/test/resources/input/singleFeatureTests/IfExpressionBoolean.java b/src/test/resources/input/typedAstFeatureTests/IfExpressionBoolean.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/IfExpressionBoolean.java
rename to src/test/resources/input/typedAstFeatureTests/IfExpressionBoolean.java
diff --git a/src/test/resources/input/singleFeatureTests/IfReturn.java b/src/test/resources/input/typedAstFeatureTests/IfReturn.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/IfReturn.java
rename to src/test/resources/input/typedAstFeatureTests/IfReturn.java
diff --git a/src/test/resources/input/singleFeatureTests/SelectRightOverloadedMethod.java b/src/test/resources/input/typedAstFeatureTests/SelectRightOverloadedMethod.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/SelectRightOverloadedMethod.java
rename to src/test/resources/input/typedAstFeatureTests/SelectRightOverloadedMethod.java
diff --git a/src/test/resources/input/singleFeatureTests/ThisDotMethod.java b/src/test/resources/input/typedAstFeatureTests/ThisDotMethod.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/ThisDotMethod.java
rename to src/test/resources/input/typedAstFeatureTests/ThisDotMethod.java
diff --git a/src/test/resources/input/singleFeatureTests/VoidReturnTypeIF.java b/src/test/resources/input/typedAstFeatureTests/VoidReturnTypeIF.java
similarity index 100%
rename from src/test/resources/input/singleFeatureTests/VoidReturnTypeIF.java
rename to src/test/resources/input/typedAstFeatureTests/VoidReturnTypeIF.java