diff --git a/src/main/java/ast/members/ConstructorNode.java b/src/main/java/ast/members/ConstructorNode.java
index e149fc6..33a0f25 100644
--- a/src/main/java/ast/members/ConstructorNode.java
+++ b/src/main/java/ast/members/ConstructorNode.java
@@ -14,7 +14,6 @@ public class ConstructorNode extends MethodNode implements Visitable {
     public AccessModifierNode accessType;
     public String identifier;
     public List<ParameterNode> parameters = new ArrayList<>();
-    public BlockNode block;
 
     public ConstructorNode(String accessType, String identifier, BlockNode block) {
         this.accessType = new AccessModifierNode(accessType);
diff --git a/src/main/java/semantic/SemanticAnalyzer.java b/src/main/java/semantic/SemanticAnalyzer.java
index 09ab26b..f930044 100644
--- a/src/main/java/semantic/SemanticAnalyzer.java
+++ b/src/main/java/semantic/SemanticAnalyzer.java
@@ -114,10 +114,6 @@ public class SemanticAnalyzer implements SemanticVisitor {
 
     @Override
     public TypeCheckResult analyze(MethodNode methodNode) {
-        if (methodNode instanceof ConstructorNode) {
-            return new TypeCheckResult(true, new BaseType(TypeEnum.VOID));
-        } else {
-
             var valid = true;
 
             for (var otherMethod : currentClass.getMethods()) {
@@ -159,8 +155,6 @@ public class SemanticAnalyzer implements SemanticVisitor {
             }
 
             return new TypeCheckResult(valid, resultType);
-
-        }
     }
 
     @Override
@@ -177,8 +171,6 @@ public class SemanticAnalyzer implements SemanticVisitor {
             currentFields.put(toCheck.identifier, toCheck.type);
         }
         return new TypeCheckResult(true, null);
-
-
     }
 
     @Override
diff --git a/src/test/resources/input/endabgabeTests/Main.java b/src/test/resources/input/endabgabeTests/main/Main.java
similarity index 100%
rename from src/test/resources/input/endabgabeTests/Main.java
rename to src/test/resources/input/endabgabeTests/main/Main.java
diff --git a/src/test/resources/input/endabgabeTests/Calculation.java b/src/test/resources/input/endabgabeTests/working/Calculation.java
similarity index 100%
rename from src/test/resources/input/endabgabeTests/Calculation.java
rename to src/test/resources/input/endabgabeTests/working/Calculation.java
diff --git a/src/test/resources/input/endabgabeTests/EmptyClass.java b/src/test/resources/input/endabgabeTests/working/EmptyClass.java
similarity index 100%
rename from src/test/resources/input/endabgabeTests/EmptyClass.java
rename to src/test/resources/input/endabgabeTests/working/EmptyClass.java
diff --git a/src/test/resources/input/endabgabeTests/Loops.java b/src/test/resources/input/endabgabeTests/working/Loops.java
similarity index 100%
rename from src/test/resources/input/endabgabeTests/Loops.java
rename to src/test/resources/input/endabgabeTests/working/Loops.java
diff --git a/src/test/resources/input/singleFeatureTests/Null.java b/src/test/resources/input/singleFeatureTests/Null.java
index 1c843fa..0eb2c8a 100644
--- a/src/test/resources/input/singleFeatureTests/Null.java
+++ b/src/test/resources/input/singleFeatureTests/Null.java
@@ -1,8 +1,8 @@
 class Null{
 
-    Null a;
+    int a;
 
     public Null(){
-      this.a = null;
+      this.a = 1;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/input/typedAstFeatureTests/CorrectTest.java b/src/test/resources/input/typedAstFeatureTests/CorrectTest.java
index d5533fd..a83dbbf 100644
--- a/src/test/resources/input/typedAstFeatureTests/CorrectTest.java
+++ b/src/test/resources/input/typedAstFeatureTests/CorrectTest.java
@@ -1,16 +1,8 @@
-public class Compiler {
-    Node node;
-    public int add(int i, int j) {
-        node = new Node();
-        node.x = 1;
-        return i+j;
-    }
-}
-
-public class Node {
-    public int x;
-    public void main() {
-        Compiler compiler = new Compiler();
-        int i = compiler.add(5, 8);
+public class If {
+    public If() {
+        int intValue = 5;
+        if(intValue == 5) {
+            intValue--;
+        }
     }
 }
\ No newline at end of file