diff --git a/src/test/java/targetast/ASTToTypedTargetAST.java b/src/test/java/targetast/ASTToTypedTargetAST.java
index a4fa2ff0..3c4c7fed 100644
--- a/src/test/java/targetast/ASTToTypedTargetAST.java
+++ b/src/test/java/targetast/ASTToTypedTargetAST.java
@@ -57,7 +57,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Tph2.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var tphAndGenerics = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
@@ -68,7 +68,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Cycle.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var cycle = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
@@ -79,7 +79,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Infimum.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var infimum = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
@@ -90,7 +90,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Gen.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var generics = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
@@ -124,7 +124,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Generics2.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var generics2 = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());
@@ -140,7 +140,7 @@ public class ASTToTypedTargetAST {
         var file = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Generics3.jav").toFile();
         var compiler = new JavaTXCompiler(file);
         var resultSet = compiler.typeInference(file);
-        var converter = new ASTToTargetAST(resultSet);
+        var converter = new ASTToTargetAST(compiler, resultSet);
         var classes = compiler.sourceFiles.get(file).getClasses();
 
         var generics3 = TestCodegen.generateClass(converter.convert(classes.get(0)), new ByteArrayClassLoader());