diff --git a/ets2panda/bindings/test/expected/getSemanticDiagnostics.json b/ets2panda/bindings/test/expected/getSemanticDiagnostics.json
index d2faf74bd4f52ea42694f860a42ab494cea35faf..23cb7c2138b869ba1a223b8234a8f5309f5aafde 100644
--- a/ets2panda/bindings/test/expected/getSemanticDiagnostics.json
+++ b/ets2panda/bindings/test/expected/getSemanticDiagnostics.json
@@ -5,20 +5,20 @@
   "2": {
     "diagnostics": [
       {
-        "message": "Type '\"1\"' is not compatible with type 'Double' at index 1",
+        "message": "Type '\"hello\"' cannot be assigned to type 'Double'",
         "range": {
           "start": {
-            "line": 20,
-            "character": 5
+            "line": 16,
+            "character": 19
           },
           "end": {
-            "line": 20,
-            "character": 8
+            "line": 16,
+            "character": 26
           }
         },
         "tags": [],
         "relatedInfo": [],
-        "code": 2046,
+        "code": 2318,
         "data": 0,
         "severity": 1,
         "codeDescription": {
@@ -47,20 +47,20 @@
         }
       },
       {
-        "message": "Type '\"hello\"' cannot be assigned to type 'Double'",
+        "message": "Type '\"1\"' is not compatible with type 'Double' at index 1",
         "range": {
           "start": {
-            "line": 16,
-            "character": 19
+            "line": 20,
+            "character": 5
           },
           "end": {
-            "line": 16,
-            "character": 26
+            "line": 20,
+            "character": 8
           }
         },
         "tags": [],
         "relatedInfo": [],
-        "code": 2318,
+        "code": 2046,
         "data": 0,
         "severity": 1,
         "codeDescription": {
@@ -72,20 +72,20 @@
   "3": {
     "diagnostics": [
       {
-        "message": "Type '\"123\"' is not compatible with type 'Double' at index 1",
+        "message": "No matching call signature for push(\"123\")",
         "range": {
           "start": {
             "line": 19,
-            "character": 10
+            "character": 1
           },
           "end": {
             "line": 19,
-            "character": 15
+            "character": 4
           }
         },
         "tags": [],
         "relatedInfo": [],
-        "code": 2046,
+        "code": 2127,
         "data": 0,
         "severity": 1,
         "codeDescription": {
@@ -93,20 +93,20 @@
         }
       },
       {
-        "message": "No matching call signature for push(\"123\")",
+        "message": "Type '\"123\"' is not compatible with type 'Double' at index 1",
         "range": {
           "start": {
             "line": 19,
-            "character": 1
+            "character": 10
           },
           "end": {
             "line": 19,
-            "character": 4
+            "character": 15
           }
         },
         "tags": [],
         "relatedInfo": [],
-        "code": 2127,
+        "code": 2046,
         "data": 0,
         "severity": 1,
         "codeDescription": {
diff --git a/ets2panda/bindings/test/expected/getSyntacticDiagnostics.json b/ets2panda/bindings/test/expected/getSyntacticDiagnostics.json
index 2abdaa1016c19e827e076454b74a493e12bf45b1..35db949abb1453cd553ad8e8f27248ee3857b96d 100644
--- a/ets2panda/bindings/test/expected/getSyntacticDiagnostics.json
+++ b/ets2panda/bindings/test/expected/getSyntacticDiagnostics.json
@@ -67,27 +67,6 @@
           "href": "test code description"
         }
       },
-      {
-        "message": "Unexpected token ':'.",
-        "range": {
-          "start": {
-            "line": 16,
-            "character": 14
-          },
-          "end": {
-            "line": 16,
-            "character": 15
-          }
-        },
-        "tags": [],
-        "relatedInfo": [],
-        "code": 1227,
-        "data": 0,
-        "severity": 1,
-        "codeDescription": {
-          "href": "test code description"
-        }
-      },
       {
         "message": "Unexpected token 'number'.",
         "range": {
@@ -130,27 +109,6 @@
           "href": "test code description"
         }
       },
-      {
-        "message": "Unexpected token ','.",
-        "range": {
-          "start": {
-            "line": 16,
-            "character": 22
-          },
-          "end": {
-            "line": 16,
-            "character": 23
-          }
-        },
-        "tags": [],
-        "relatedInfo": [],
-        "code": 1227,
-        "data": 0,
-        "severity": 1,
-        "codeDescription": {
-          "href": "test code description"
-        }
-      },
       {
         "message": "Unexpected token 'b'.",
         "range": {
@@ -214,27 +172,6 @@
           "href": "test code description"
         }
       },
-      {
-        "message": "Unexpected token ')'.",
-        "range": {
-          "start": {
-            "line": 16,
-            "character": 33
-          },
-          "end": {
-            "line": 16,
-            "character": 34
-          }
-        },
-        "tags": [],
-        "relatedInfo": [],
-        "code": 1227,
-        "data": 0,
-        "severity": 1,
-        "codeDescription": {
-          "href": "test code description"
-        }
-      },
       {
         "message": "Unexpected token '{'.",
         "range": {
diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp
index 3d35de95c8842c222be046d61817ba5050400402..9af93405a21175a9610ce64decd8a3b6ba206b65 100644
--- a/ets2panda/checker/ETSAnalyzer.cpp
+++ b/ets2panda/checker/ETSAnalyzer.cpp
@@ -166,6 +166,11 @@ checker::Type *ETSAnalyzer::Check(ir::ClassStaticBlock *st) const
     } else {
         st->SetTsType(checker->BuildMethodType(func));
     }
+
+    if (!func->HasBody() || (func->IsExternal() && !func->IsExternalOverload())) {
+        return st->TsType();
+    }
+
     checker::ScopeContext scopeCtx(checker, func->Scope());
     checker::SavedCheckerContext savedContext(checker, checker->Context().Status(),
                                               checker->Context().ContainingClass());
@@ -1258,6 +1263,8 @@ checker::Type *ETSAnalyzer::Check(ir::AssignmentExpression *const expr) const
         checker->ValidateUnaryOperatorOperand(expr->target_, expr);
     }
 
+    checker->InferLambdaInAssignmentExpression(expr);
+
     if (auto setterType = GetSetterType(expr->target_, checker); setterType != nullptr) {
         leftType = setterType;
         expr->Left()->SetTsType(leftType);
diff --git a/ets2panda/checker/ETSchecker.h b/ets2panda/checker/ETSchecker.h
index ad880280ae0c4b304992e79cdc3bea9a312e2420..490d90f351f1c7cf69cd199ee779b4e9b0d080ee 100644
--- a/ets2panda/checker/ETSchecker.h
+++ b/ets2panda/checker/ETSchecker.h
@@ -640,6 +640,7 @@ public:
     void CheckSinglePropertyAnnotation(ir::AnnotationUsage *st, ir::AnnotationDeclaration *annoDecl);
     void CheckMultiplePropertiesAnnotation(ir::AnnotationUsage *st, util::StringView const &baseName,
                                            ArenaUnorderedMap<util::StringView, ir::ClassProperty *> &fieldMap);
+    void InferLambdaInAssignmentExpression(ir::AssignmentExpression *const expr);
     void InferAliasLambdaType(ir::TypeNode *localTypeAnnotation, ir::ArrowFunctionExpression *init);
     checker::Type *ApplyConditionalOperatorPromotion(checker::ETSChecker *checker, checker::Type *unboxedL,
                                                      checker::Type *unboxedR);
diff --git a/ets2panda/checker/ets/helpers.cpp b/ets2panda/checker/ets/helpers.cpp
index 9661099a4790f009e1b7b97a9b7465a44a1b6ce1..618cc3ab61c714e36dc7400783393c21a7222a61 100644
--- a/ets2panda/checker/ets/helpers.cpp
+++ b/ets2panda/checker/ets/helpers.cpp
@@ -595,6 +595,63 @@ checker::Type *ETSChecker::CheckArrayElements(ir::ArrayExpression *init)
     return CreateETSResizableArrayType(elementType);
 }
 
+static void SetTypeforLambdaParamWithoutTypeAnnotation(ir::ETSParameterExpression *param, Type *type)
+{
+    auto *const lambdaParam = param->Ident();
+    if (lambdaParam->TypeAnnotation() != nullptr) {
+        return;
+    }
+    if (lambdaParam->Variable() != nullptr) {
+        lambdaParam->Variable()->SetTsType(type);
+    }
+    lambdaParam->SetTsType(type);
+}
+
+void ETSChecker::InferLambdaInAssignmentExpression(ir::AssignmentExpression *const expr)
+{
+    auto *left = expr->Left();
+    auto *right = expr->Right();
+
+    if (!right->IsArrowFunctionExpression()) {
+        return;
+    }
+
+    if (left->TsType() == nullptr || !left->TsType()->IsETSFunctionType() ||
+        left->TsType()->AsETSFunctionType()->CallSignaturesOfMethodOrArrow().empty()) {
+        return;
+    }
+
+    ArenaVector<ir::Expression *> lambdaParams = right->AsArrowFunctionExpression()->Function()->Params();
+    Signature *sig = left->TsType()->AsETSFunctionType()->CallSignaturesOfMethodOrArrow()[0];
+
+    size_t paramCount = sig->Params().size();
+    if (sig->RestVar() != nullptr) {
+        paramCount++;
+    }
+
+    if (paramCount != lambdaParams.size()) {
+        return;
+    }
+
+    if (std::any_of(lambdaParams.begin(), lambdaParams.end(),
+                    [](auto &param) { return !param->IsETSParameterExpression(); })) {
+        return;
+    }
+
+    if (sig->RestVar() != nullptr) {
+        if (!lambdaParams.back()->AsETSParameterExpression()->IsRestParameter()) {
+            return;
+        }
+        SetTypeforLambdaParamWithoutTypeAnnotation(lambdaParams.back()->AsETSParameterExpression(),
+                                                   sig->RestVar()->TsType());
+        paramCount--;
+    }
+    for (size_t i = 0; i < paramCount; i++) {
+        auto *inferredType = sig->Params()[i]->TsType();
+        SetTypeforLambdaParamWithoutTypeAnnotation(lambdaParams[i]->AsETSParameterExpression(), inferredType);
+    }
+}
+
 void ETSChecker::InferAliasLambdaType(ir::TypeNode *localTypeAnnotation, ir::ArrowFunctionExpression *init)
 {
     ES2PANDA_ASSERT(localTypeAnnotation != nullptr);
diff --git a/ets2panda/compiler/core/ETSfunction.cpp b/ets2panda/compiler/core/ETSfunction.cpp
index 672f29e5f6d859490a0ed258dfe6b640d5853390..2daa3e0167a08288caac9c806532fc80aa377684 100644
--- a/ets2panda/compiler/core/ETSfunction.cpp
+++ b/ets2panda/compiler/core/ETSfunction.cpp
@@ -111,18 +111,9 @@ void ETSFunction::CompileAsStaticBlock(ETSGen *etsg)
 {
     const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition();
 
-    auto const checkInitializer = [](ArenaVector<ir::AstNode *> const &nodes) -> bool {
-        for (auto const *const node : nodes) {
-            if (node->IsMethodDefinition() && node->AsClassElement()->Key()->IsIdentifier() &&
-                node->AsClassElement()->Id()->Name() == compiler::Signatures::INIT_METHOD) {
-                return false;
-            }
-        }
-        return true;
-    };
-
-    // Check if it is the Global class static constructor and the special '_$init$_" method exists
-    bool const compileInitializer = classDef->IsGlobal() ? checkInitializer(classDef->Body()) : true;
+    if (classDef->IsGlobal() && classDef->IsInitInCctor()) {
+        return;
+    }
 
     for (const auto *prop : classDef->Body()) {
         if (!prop->IsClassProperty() || !prop->IsStatic()) {
@@ -131,8 +122,8 @@ void ETSFunction::CompileAsStaticBlock(ETSGen *etsg)
 
         // Don't compile variable initializers if they present in '_$init$_" method
         auto *const item = prop->AsClassProperty();
-        if (item->Value() != nullptr &&
-            (compileInitializer || item->IsConst() || item->Value()->IsArrowFunctionExpression())) {
+
+        if (item->Value() != nullptr) {
             item->Compile(etsg);
         }
     }
diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp
index 88a4c1ab28c97163a0cbfac3cb8f5ec7499b8fbe..d8c68fb76d773b4e536779daa39b3b284e468c5f 100644
--- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp
+++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp
@@ -225,12 +225,7 @@ void GlobalClassHandler::SetupGlobalMethods(ArenaVector<ir::Statement *> &&initS
         return;
     }
 
-    ir::MethodDefinition *initMethod = CreateGlobalMethod(compiler::Signatures::INIT_METHOD, std::move(initStatements));
-    InsertInGlobal(globalClass, initMethod);
-    ES2PANDA_ASSERT(initMethod->Function());
-    if (!initMethod->Function()->Body()->AsBlockStatement()->Statements().empty()) {
-        AddInitCallToStaticBlock(globalClass, initMethod);
-    }
+    AddInitStatementsToStaticBlock(globalClass, std::move(initStatements));
 }
 
 void GlobalClassHandler::MergeNamespace(ArenaVector<ir::ETSModule *> &namespaces, parser::Program *program)
@@ -425,6 +420,26 @@ void GlobalClassHandler::SetupGlobalClass(const ArenaVector<parser::Program *> &
     SetupInitializerBlock(std::move(initializerBlockStmts), globalClass);
 }
 
+static std::pair<lexer::SourcePosition, lexer::SourcePosition> GetBoundInBody(parser::Program *program,
+                                                                              ir::BlockStatement *body)
+{
+    auto minBound = lexer::SourcePosition(program);
+    auto maxBound = lexer::SourcePosition(program);
+    if (!body->Statements().empty()) {
+        minBound = body->Statements().front()->Start();
+        maxBound = body->Statements().front()->End();
+        for (const auto &stmt : body->Statements()) {
+            if (stmt->Start().index < minBound.index) {
+                minBound = stmt->Start();
+            }
+            if (stmt->End().index > maxBound.index) {
+                maxBound = stmt->End();
+            }
+        }
+    }
+    return std::make_pair(minBound, maxBound);
+}
+
 ir::MethodDefinition *GlobalClassHandler::CreateGlobalMethod(const std::string_view name,
                                                              ArenaVector<ir::Statement *> &&statements)
 {
@@ -450,24 +465,13 @@ ir::MethodDefinition *GlobalClassHandler::CreateGlobalMethod(const std::string_v
                                                                  identClone->AsExpression(), funcExpr,
                                                                  functionModifiers, allocator_, false);
     ES2PANDA_ASSERT(methodDef != nullptr);
-    auto minBound = lexer::SourcePosition(globalProgram_);
-    auto maxBound = lexer::SourcePosition(globalProgram_);
-    if (!body->Statements().empty()) {
-        minBound = body->Statements().front()->Start();
-        maxBound = body->Statements().front()->End();
-        for (const auto &stmt : body->Statements()) {
-            if (stmt->Start().index < minBound.index) {
-                minBound = stmt->Start();
-            }
-            if (stmt->End().index > maxBound.index) {
-                maxBound = stmt->End();
-            }
-        }
-    }
+
+    auto [minBound, maxBound] = GetBoundInBody(globalProgram_, body);
     body->SetRange({minBound, maxBound});
     func->SetRange({minBound, maxBound});
     funcExpr->SetRange({minBound, maxBound});
     methodDef->SetRange({minBound, maxBound});
+
     return methodDef;
 }
 
@@ -511,6 +515,30 @@ void GlobalClassHandler::AddInitCallToStaticBlock(ir::ClassDefinition *globalCla
     blockBody->AddStatement(exprStmt);
 }
 
+void GlobalClassHandler::AddInitStatementsToStaticBlock(ir::ClassDefinition *globalClass,
+                                                        ArenaVector<ir::Statement *> &&initStatements)
+{
+    auto &globalBody = globalClass->Body();
+    auto maybeStaticBlock = std::find_if(globalBody.begin(), globalBody.end(),
+                                         [](ir::AstNode *node) { return node->IsClassStaticBlock(); });
+    ES2PANDA_ASSERT(maybeStaticBlock != globalBody.end());
+
+    auto *staticBlock = (*maybeStaticBlock)->AsClassStaticBlock();
+
+    auto *blockBody = staticBlock->Function()->Body()->AsBlockStatement();
+    for (auto &stmt : initStatements) {
+        blockBody->AddStatement(stmt);
+    }
+
+    auto [minBound, maxBound] = GetBoundInBody(globalProgram_, blockBody);
+    blockBody->SetRange({minBound, maxBound});
+    staticBlock->Function()->SetRange({minBound, maxBound});
+    staticBlock->Value()->SetRange({minBound, maxBound});
+    staticBlock->SetRange({minBound, maxBound});
+
+    globalClass->SetInitInCctor();
+}
+
 ir::Identifier *GlobalClassHandler::RefIdent(const util::StringView &name)
 {
     auto *const callee = NodeAllocator::Alloc<ir::Identifier>(allocator_, name, allocator_);
diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.h b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.h
index 7f28e2a01aaf5d96286b24f17be9c3ce810a4264..2addd00448aa1debb1aa59bba17ee33f9f4c0143 100644
--- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.h
+++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.h
@@ -91,6 +91,8 @@ private:
     ir::ClassDeclaration *CreateGlobalClass(const parser::Program *globalProgram);
     ir::ClassStaticBlock *CreateStaticBlock(ir::ClassDefinition *classDef);
     ir::MethodDefinition *CreateGlobalMethod(std::string_view name, ArenaVector<ir::Statement *> &&statements);
+    void AddInitStatementsToStaticBlock(ir::ClassDefinition *globalClass,
+                                        ArenaVector<ir::Statement *> &&initStatements);
     void AddInitCallToStaticBlock(ir::ClassDefinition *globalClass, ir::MethodDefinition *initMethod);
     void AddInitializerBlockToStaticBlock(ir::ClassDefinition *globalClass,
                                           ArenaVector<ir::Statement *> &&initializerBlocks);
diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.cpp b/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.cpp
index 9b66d0c095350becfbf42d379b229affad5d7266..3805e93bbbc66845c518ef4ba758d746e6c9fc23 100644
--- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.cpp
+++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h"
+#include "compiler/lowering/util.h"
 
 namespace ark::es2panda::compiler {
 
@@ -172,15 +173,9 @@ ir::Identifier *GlobalDeclTransformer::RefIdent(const util::StringView &name)
     return callee;
 }
 
-ir::ExpressionStatement *GlobalDeclTransformer::InitTopLevelProperty(ir::ClassProperty *classProperty)
+ir::ExpressionStatement *GlobalDeclTransformer::CreateAssignmentStatement(ir::ClassProperty *classProperty,
+                                                                          ir::Expression *initializer)
 {
-    const auto initializer = classProperty->Value();
-    ES2PANDA_ASSERT(classProperty->Id() != nullptr);
-    if (classProperty->IsConst() || initializer == nullptr) {
-        classProperty->SetStart(classProperty->Id()->Start());
-        return nullptr;
-    }
-
     auto const ident = RefIdent(classProperty->Id()->Name());
     ES2PANDA_ASSERT(ident != nullptr);
     ident->SetRange(classProperty->Id()->Range());
@@ -195,16 +190,30 @@ ir::ExpressionStatement *GlobalDeclTransformer::InitTopLevelProperty(ir::ClassPr
     auto expressionStatement = util::NodeAllocator::Alloc<ir::ExpressionStatement>(allocator_, assignmentExpression);
     ES2PANDA_ASSERT(expressionStatement != nullptr);
     expressionStatement->SetRange(classProperty->Range());
+    assignmentExpression->SetIgnoreConstAssign();
+
+    return expressionStatement;
+}
 
-    classProperty->SetRange({ident->Start(), initializer->End()});
+ir::ExpressionStatement *GlobalDeclTransformer::InitTopLevelProperty(ir::ClassProperty *classProperty)
+{
+    ES2PANDA_ASSERT(classProperty->Id() != nullptr);
+    if (classProperty->Value() == nullptr) {
+        classProperty->SetStart(classProperty->Id()->Start());
+        return nullptr;
+    }
 
-    if (classProperty->TypeAnnotation() != nullptr) {
+    ir::Expression *initializer = nullptr;
+    if (classProperty->TypeAnnotation() != nullptr && !classProperty->IsConst()) {
+        initializer = classProperty->Value();
+        classProperty->SetEnd(classProperty->Value()->Start());
         classProperty->SetValue(nullptr);
-    } else {
-        // Code will be ignored, but checker is going to deduce the type.
-        classProperty->SetValue(initializer->Clone(allocator_, classProperty)->AsExpression());
+        return CreateAssignmentStatement(classProperty, initializer);
     }
-    return expressionStatement;
+
+    // Code will be ignored, but checker is going to deduce the type.
+    initializer = classProperty->Value()->Clone(allocator_, classProperty)->AsExpression();
+    return CreateAssignmentStatement(classProperty, initializer);
 }
 
 void GlobalDeclTransformer::HandleNode(ir::AstNode *node)
diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h b/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h
index e8631b95a2925065875d1e988889b2affb4f497a..affa47d495b1a0a89dd4f2fc3e9715c3ab92df0f 100644
--- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h
+++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h
@@ -89,6 +89,7 @@ public:
 
     ir::Identifier *RefIdent(const util::StringView &name);
 
+    ir::ExpressionStatement *CreateAssignmentStatement(ir::ClassProperty *classProperty, ir::Expression *initializer);
     ir::ExpressionStatement *InitTopLevelProperty(ir::ClassProperty *classProperty);
 
     [[nodiscard]] bool IsMultiInitializer() const
diff --git a/ets2panda/ir/base/classDefinition.h b/ets2panda/ir/base/classDefinition.h
index 869939f869b6296f3b52f8f3a93f4b4948e0a657..b1df4a83c3d87e41adca6f6a0de08a2001097695 100644
--- a/ets2panda/ir/base/classDefinition.h
+++ b/ets2panda/ir/base/classDefinition.h
@@ -59,6 +59,7 @@ enum class ClassDefinitionModifiers : uint32_t {
     FROM_STRUCT = 1U << 16U,
     FUNCTIONAL_REFERENCE = 1U << 17U,
     LAZY_IMPORT_OBJECT_CLASS = 1U << 18U,
+    INIT_IN_CCTOR = 1U << 19U,
     DECLARATION_ID_REQUIRED = DECLARATION | ID_REQUIRED,
     ETS_MODULE = NAMESPACE_TRANSFORMED | GLOBAL
 };
@@ -281,6 +282,11 @@ public:
         return (Modifiers() & ClassDefinitionModifiers::FROM_STRUCT) != 0;
     }
 
+    [[nodiscard]] bool IsInitInCctor() const noexcept
+    {
+        return (Modifiers() & ClassDefinitionModifiers::INIT_IN_CCTOR) != 0;
+    }
+
     [[nodiscard]] bool IsModule() const noexcept
     {
         return IsGlobal() || IsNamespaceTransformed();
@@ -326,6 +332,11 @@ public:
         AddClassModifiers(ClassDefinitionModifiers::FROM_STRUCT);
     }
 
+    void SetInitInCctor()
+    {
+        AddClassModifiers(ClassDefinitionModifiers::INIT_IN_CCTOR);
+    }
+
     [[nodiscard]] ClassDefinitionModifiers Modifiers() const noexcept
     {
         return GetHistoryNodeAs<ClassDefinition>()->modifiers_;
diff --git a/ets2panda/ir/statements/ifStatement.cpp b/ets2panda/ir/statements/ifStatement.cpp
index fb33121bbc7eb508de10a1d66ab3ee5a869a0941..9b50804416cb282c0d6936ae812cba59b0a9ac60 100644
--- a/ets2panda/ir/statements/ifStatement.cpp
+++ b/ets2panda/ir/statements/ifStatement.cpp
@@ -106,7 +106,7 @@ IfStatement *IfStatement::Clone(ArenaAllocator *const allocator, AstNode *const
 {
     auto *const test = test_->Clone(allocator, nullptr)->AsExpression();
     auto *const consequent = consequent_->Clone(allocator, nullptr)->AsStatement();
-    auto *const alternate = alternate_ != nullptr ? consequent_->Clone(allocator, nullptr)->AsStatement() : nullptr;
+    auto *const alternate = alternate_ != nullptr ? alternate_->Clone(allocator, nullptr)->AsStatement() : nullptr;
     auto *const clone = allocator->New<IfStatement>(test, consequent, alternate);
 
     if (parent != nullptr) {
diff --git a/ets2panda/ir/statements/switchCaseStatement.cpp b/ets2panda/ir/statements/switchCaseStatement.cpp
index 848a7159844cd5647a02b450dde44cd46213ae45..07d1b0d3af4807667dd2e7a6ddbb09ea57b7d4c6 100644
--- a/ets2panda/ir/statements/switchCaseStatement.cpp
+++ b/ets2panda/ir/statements/switchCaseStatement.cpp
@@ -148,7 +148,7 @@ SwitchCaseStatement *SwitchCaseStatement::Clone(ArenaAllocator *const allocator,
 {
     Expression *test = nullptr;
     if (test_ != nullptr) {
-        test = test_->Clone(allocator, nullptr)->AsExpression();
+        test = test_ == nullptr ? nullptr : test_->Clone(allocator, nullptr)->AsExpression();
     }
     ArenaVector<Statement *> consequent(allocator->Adapter());
 
diff --git a/ets2panda/lsp/src/api.cpp b/ets2panda/lsp/src/api.cpp
index 129747640c2e1bb602be2ebb85ce7a70e9e30f09..35a191faa1e541308693995541ea5b1d31aa6ca0 100644
--- a/ets2panda/lsp/src/api.cpp
+++ b/ets2panda/lsp/src/api.cpp
@@ -211,6 +211,7 @@ DiagnosticReferences GetSemanticDiagnostics(es2panda_Context *context)
 {
     DiagnosticReferences result {};
     auto ctx = reinterpret_cast<public_lib::Context *>(context);
+    ctx->diagnosticEngine->CleanDuplicateLog(util::DiagnosticType::SEMANTIC);
     SetPhaseManager(ctx->phaseManager);
     const auto &diagnostics = ctx->diagnosticEngine->GetDiagnosticStorage(util::DiagnosticType::SEMANTIC);
     for (const auto &diagnostic : diagnostics) {
@@ -223,6 +224,7 @@ DiagnosticReferences GetSyntacticDiagnostics(es2panda_Context *context)
 {
     DiagnosticReferences result {};
     auto ctx = reinterpret_cast<public_lib::Context *>(context);
+    ctx->diagnosticEngine->CleanDuplicateLog(util::DiagnosticType::SYNTAX);
     SetPhaseManager(ctx->phaseManager);
     const auto &diagnostics = ctx->diagnosticEngine->GetDiagnosticStorage(util::DiagnosticType::SYNTAX);
     const auto &diagnosticsPluginError =
diff --git a/ets2panda/lsp/src/completions.cpp b/ets2panda/lsp/src/completions.cpp
index 8b1961ff2f652bc15af599ad21d3e00b04e04ef3..58d7cefe24e7b336b49474c4661d26680dc7bb8f 100644
--- a/ets2panda/lsp/src/completions.cpp
+++ b/ets2panda/lsp/src/completions.cpp
@@ -687,19 +687,19 @@ CompletionEntry InitEntry(const ir::AstNode *decl)
     } else if (IsConstVar(decl)) {
         kind = CompletionEntryKind::CONSTANT;
     } else if (IsGlobalVar(decl)) {
-        auto globalDefiniton = decl->Parent()->AsClassDefinition();
-        auto initMethod = globalDefiniton->FindChild([](ir::AstNode *child) {
-            return child->IsMethodDefinition() &&
-                   child->AsMethodDefinition()->Key()->AsIdentifier()->Name() == compiler::Signatures::INIT_METHOD;
+        auto globalDefinition = decl->Parent()->AsClassDefinition();
+        auto cctor = globalDefinition->FindChild([&globalDefinition](ir::AstNode *child) {
+            return child->IsClassStaticBlock() && child->Parent()->IsClassDefinition() &&
+                   child->Parent()->AsClassDefinition() == globalDefinition;
         });
-        if (initMethod == nullptr) {
+        if (cctor == nullptr) {
             return CompletionEntry(name, CompletionEntryKind::CONSTANT, std::string(sortText));
         }
-        auto found = initMethod->FindChild([&name](ir::AstNode *child) {
+        auto found = cctor->FindChild([&name](ir::AstNode *child) {
             return child->IsAssignmentExpression() && child->AsAssignmentExpression()->Left()->IsIdentifier() &&
                    child->AsAssignmentExpression()->Left()->AsIdentifier()->ToString() == name;
         });
-        if (found != nullptr) {
+        if (found != nullptr && !decl->AsClassProperty()->IsConst()) {
             // let variable in global definition need to be assigned in _$init$_ method
             kind = CompletionEntryKind::VARIABLE;
         } else {
diff --git a/ets2panda/parser/ETSparserExpressions.cpp b/ets2panda/parser/ETSparserExpressions.cpp
index f04dc2765fd8929ef26533db314bb3cae7f8120d..725c7709e7797ec75843e18d42d9f68ff94186a0 100644
--- a/ets2panda/parser/ETSparserExpressions.cpp
+++ b/ets2panda/parser/ETSparserExpressions.cpp
@@ -673,7 +673,8 @@ ir::Expression *ETSParser::ParsePotentialAsExpression(ir::Expression *primaryExp
 
     auto *asExpression = AllocNode<ir::TSAsExpression>(primaryExpr, type, false);
     ES2PANDA_ASSERT(asExpression != nullptr);
-    asExpression->SetRange(primaryExpr->Range());
+    asExpression->SetStart(primaryExpr->Start());
+    asExpression->SetEnd(type->End());
     return asExpression;
 }
 
diff --git a/ets2panda/test/ast/compiler/ets/DeclareCheckAssign.ets b/ets2panda/test/ast/compiler/ets/DeclareCheckAssign.ets
index 9e0ebf92e4e1820783350f9a63ae47494cff941a..fd4f2eb8a5bd57a6116a51d868dcc05a6328ea66 100644
--- a/ets2panda/test/ast/compiler/ets/DeclareCheckAssign.ets
+++ b/ets2panda/test/ast/compiler/ets/DeclareCheckAssign.ets
@@ -43,23 +43,25 @@ declare const x31 = 0x5
 declare const x41 = 0b101
 declare const x51 = "abc"
 
-/* @@? 16:37 Error TypeError: Initializers are not allowed in ambient contexts: byte_1  */
-/* @@? 16:66 Error TypeError: Initializers are not allowed in ambient contexts: byte_2  */
-/* @@? 17:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_12  */
-/* @@? 17:64 Error TypeError: Initializers are not allowed in ambient contexts: byte_22  */
-/* @@? 18:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_13  */
-/* @@? 18:70 Error TypeError: Initializers are not allowed in ambient contexts: byte_23  */
-/* @@? 19:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_14  */
-/* @@? 22:31 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: int_12  */
-/* @@? 24:36 Error TypeError: Initializers are not allowed in ambient contexts: int_16  */
-/* @@? 26:39 Error TypeError: Initializers are not allowed in ambient contexts: int_18  */
-/* @@? 27:25 Error TypeError: Initializers are not allowed in ambient contexts: x1  */
-/* @@? 28:25 Error TypeError: Initializers are not allowed in ambient contexts: x2  */
-/* @@? 29:27 Error TypeError: Initializers are not allowed in ambient contexts: y1  */
-/* @@? 30:28 Error TypeError: Initializers are not allowed in ambient contexts: y2  */
-/* @@? 31:25 Error TypeError: Initializers are not allowed in ambient contexts: x3  */
-/* @@? 32:25 Error TypeError: Initializers are not allowed in ambient contexts: x4  */
-/* @@? 33:28 Error TypeError: Initializers are not allowed in ambient contexts: x5  */
-/* @@? 34:27 Error TypeError: Initializers are not allowed in ambient contexts: x6  */
-/* @@? 35:20 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: x7  */
-/* @@? 36:20 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: x8  */
+/* @@? 16:37 Error TypeError: Initializers are not allowed in ambient contexts: byte_1 */
+/* @@? 16:66 Error TypeError: Initializers are not allowed in ambient contexts: byte_2 */
+/* @@? 17:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_12 */
+/* @@? 17:38 Error TypeError: Type 'Int' cannot be assigned to type 'Byte' */
+/* @@? 17:64 Error TypeError: Initializers are not allowed in ambient contexts: byte_22 */
+/* @@? 17:64 Error TypeError: Type 'Int' cannot be assigned to type 'Byte' */
+/* @@? 18:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_13 */
+/* @@? 18:70 Error TypeError: Initializers are not allowed in ambient contexts: byte_23 */
+/* @@? 19:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_14 */
+/* @@? 22:31 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: int_12 */
+/* @@? 24:36 Error TypeError: Initializers are not allowed in ambient contexts: int_16 */
+/* @@? 26:39 Error TypeError: Initializers are not allowed in ambient contexts: int_18 */
+/* @@? 27:25 Error TypeError: Initializers are not allowed in ambient contexts: x1 */
+/* @@? 28:25 Error TypeError: Initializers are not allowed in ambient contexts: x2 */
+/* @@? 29:27 Error TypeError: Initializers are not allowed in ambient contexts: y1 */
+/* @@? 30:28 Error TypeError: Initializers are not allowed in ambient contexts: y2 */
+/* @@? 31:25 Error TypeError: Initializers are not allowed in ambient contexts: x3 */
+/* @@? 32:25 Error TypeError: Initializers are not allowed in ambient contexts: x4 */
+/* @@? 33:28 Error TypeError: Initializers are not allowed in ambient contexts: x5 */
+/* @@? 34:27 Error TypeError: Initializers are not allowed in ambient contexts: x6 */
+/* @@? 35:20 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: x7 */
+/* @@? 36:20 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: x8 */
diff --git a/ets2panda/test/ast/compiler/ets/FixedArray/unresolved_reference.ets b/ets2panda/test/ast/compiler/ets/FixedArray/unresolved_reference.ets
index 3213a83ac10b83029e0ce7f1d4bfad9d552fa97a..eef306e686bcfd4523e7ecaae7ba1d023ba732c3 100644
--- a/ets2panda/test/ast/compiler/ets/FixedArray/unresolved_reference.ets
+++ b/ets2panda/test/ast/compiler/ets/FixedArray/unresolved_reference.ets
@@ -37,5 +37,5 @@ function main() {
     let a = (new A).b
 }
 
-/* @@? 28:13 Error TypeError: Unresolved reference b */
+/* @@? 16:13 Error TypeError: Unresolved reference b */
 /* @@? 37:21 Error TypeError: Property 'b' does not exist on type 'A' */
diff --git a/ets2panda/test/ast/compiler/ets/annotation_tests/annotationUsage_duplicate_on_extension_lambda.ets b/ets2panda/test/ast/compiler/ets/annotation_tests/annotationUsage_duplicate_on_extension_lambda.ets
index 025b88d8e8e040134856aa20c860271ac76c64c1..7dcd2ce4b267fd5e268e10ea7a88f77503795c0a 100644
--- a/ets2panda/test/ast/compiler/ets/annotation_tests/annotationUsage_duplicate_on_extension_lambda.ets
+++ b/ets2panda/test/ast/compiler/ets/annotation_tests/annotationUsage_duplicate_on_extension_lambda.ets
@@ -21,4 +21,4 @@ let a = new A();
 let show = @Anno()@/* @@ label */Anno(this: A): string => {
     return "Hello," + this.name;
 }
-/* @@@ label Error TypeError: Duplicate annotations are not allowed. The annotation 'Anno' has already been applied to this element.  */
+/* @@? 21:34 Error TypeError: Duplicate annotations are not allowed. The annotation 'Anno' has already been applied to this element. */
diff --git a/ets2panda/test/ast/compiler/ets/circular_variable_init.ets b/ets2panda/test/ast/compiler/ets/circular_variable_init.ets
index fc6881da7f2ee8bf16964c5c552197dffa291df7..f5bf4a22488b860ba739a9905b730df19654a181 100644
--- a/ets2panda/test/ast/compiler/ets/circular_variable_init.ets
+++ b/ets2panda/test/ast/compiler/ets/circular_variable_init.ets
@@ -46,7 +46,7 @@ function main() {
 /* @@? 18:12 Error TypeError: Circular dependency detected for identifier: b */
 /* @@? 23:19 Error TypeError: Circular dependency detected for identifier: b */
 /* @@? 31:15 Error TypeError: Unresolved reference globalb */
-/* @@? 33:5 Error TypeError: Circular dependency detected for identifier: globalc */
+/* @@? 34:5 Error TypeError: Circular dependency detected for identifier: globald */
 /* @@? 36:7 Error TypeError: Circular dependency detected for identifier: consta */
 /* @@? 40:17 Error TypeError: Unresolved reference mainb */
 /* @@? 42:17 Error TypeError: Variable 'maind' is accessed before it's initialization. */
diff --git a/ets2panda/test/ast/compiler/ets/class_cyclic_constructor.ets b/ets2panda/test/ast/compiler/ets/class_cyclic_constructor.ets
index 14dfc9d81c85028a2ccc841b18404c18f727f3c7..a9dc55d05aab00763ce64ea298e84fdb79a1863f 100644
--- a/ets2panda/test/ast/compiler/ets/class_cyclic_constructor.ets
+++ b/ets2panda/test/ast/compiler/ets/class_cyclic_constructor.ets
@@ -49,6 +49,6 @@ class A {
 /* @@? 26:31 Error TypeError: Property 'bar' does not exist on type 'A' */
 /* @@? 27:5 Error SyntaxError: Unexpected token ')'. */
 /* @@? 27:7 Error SyntaxError: Unexpected token '{'. */
-/* @@? 28:9 Error TypeError: Cannot reference 'this' in this context. */
-/* @@? 28:14 Error TypeError: Property 'x' does not exist on type 'Error' */
+/* @@? 28:9 Error TypeError: 'this' cannot be referenced from a static context */
+/* @@? 28:14 Error TypeError: Property 'x' does not exist on type 'ETSGLOBAL' */
 /* @@? 30:1 Error SyntaxError: Unexpected token '}'. */
diff --git a/ets2panda/test/ast/compiler/ets/getType.ets b/ets2panda/test/ast/compiler/ets/getType.ets
index aee120c32a1fefaf602b94ac1517d558c1505785..beeb87771d0ba08a2148838851a2bbb4bcd54c39 100644
--- a/ets2panda/test/ast/compiler/ets/getType.ets
+++ b/ets2panda/test/ast/compiler/ets/getType.ets
@@ -19,9 +19,9 @@ declare type type_tuple_union = [string, boolean, number] | (this.mnum === other
 /* @@? 15:66 Error SyntaxError: Unexpected token, expected ')'. */
 /* @@? 15:67 Error TypeError: Unresolved reference mnum */
 /* @@? 15:76 Error TypeError: Unresolved reference other */
-/* @@? 15:90 Error TypeError: Cannot reference 'this' in this context. */
-/* @@? 15:95 Error TypeError: Property 'mden' does not exist on type 'Error' */
+/* @@? 15:90 Error TypeError: 'this' cannot be referenced from a static context */
+/* @@? 15:95 Error TypeError: Property 'mden' does not exist on type 'ETSGLOBAL' */
 /* @@? 16:1 Error SyntaxError: Unexpected token ')'. */
 /* @@? 16:1 Error TypeError: Indexed access is not supported for such expression type. */
 /* @@? 16:3 Error SyntaxError: Unexpected token ']'. */
-/* @@? 27:67 Error SyntaxError: Unexpected token, expected ']'. */
\ No newline at end of file
+/* @@? 28:1 Error SyntaxError: Unexpected token, expected ']'. */
diff --git a/ets2panda/test/ast/compiler/ets/import_export/eitest_import_all_4_ne.ets b/ets2panda/test/ast/compiler/ets/import_export/eitest_import_all_4_ne.ets
index 57e068b6d1bbbefc29e614a1e875dd9c75349b0c..22fc4900fc5427570af2a78e3533a0056a1839cf 100644
--- a/ets2panda/test/ast/compiler/ets/import_export/eitest_import_all_4_ne.ets
+++ b/ets2panda/test/ast/compiler/ets/import_export/eitest_import_all_4_ne.ets
@@ -16,4 +16,5 @@
 import * as ns from "./eitest_import_all_5_ne"
 const t: ns.B = new ns.B()
 
-/* @@? eitest_import_all_4_ne.ets:17:13 Error TypeError: 'B' type does not exist. */
\ No newline at end of file
+/* @@? eitest_import_all_4_ne.ets:17:13 Error TypeError: 'B' type does not exist. */
+/* @@? eitest_import_all_4_ne.ets:17:24 Error TypeError: 'B' type does not exist. */
diff --git a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/import_in_package_with_error.ets b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/import_in_package_with_error.ets
index d7c0b1872b7a96393b889dbfdddff465126ce207..417776eca0f51ca7b33f730512d41d0df9dfddd1 100644
--- a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/import_in_package_with_error.ets
+++ b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/import_in_package_with_error.ets
@@ -20,13 +20,9 @@ import { notInit, importantInfo } from "./inner_package_with_errors"
 function bar(x: notInit) { (=_=) }
 
 /* @@? distant_package.ets:22:22 Error SyntaxError: Variable must be initialized or it's type must be declared. */
-
 /* @@? package_with_errors_1.ets:19:32 Error TypeError: Cannot cast type 'String' to 'Double' */
-
-/* @@? package_with_errors_2.ets:19:16 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
 /* @@? package_with_errors_2.ets:19:16 Error TypeError: Unresolved reference foo */
 /* @@? package_with_errors_2.ets:19:16 Error TypeError: This expression is not callable. */
-
 /* @@? import_in_package_with_error.ets:20:17 Error TypeError: Cannot find type 'notInit'. */
 /* @@? import_in_package_with_error.ets:20:29 Error SyntaxError: Unexpected token '='. */
 /* @@? import_in_package_with_error.ets:20:30 Error SyntaxError: Unexpected token, expected ')'. */
diff --git a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_1.ets b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_1.ets
index 8ea80e1135ed035aadbbf61f772d09e686fee779..cb95afc31ae8eefb69bf155351d49e1c6f400200 100644
--- a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_1.ets
+++ b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_1.ets
@@ -22,11 +22,7 @@ export let moreImportantInfo = importantInfo as number;
 /* @@? import_in_package_with_error.ets:20:29 Error SyntaxError: Unexpected token '='. */
 /* @@? import_in_package_with_error.ets:20:30 Error SyntaxError: Unexpected token, expected ')'. */
 /* @@? import_in_package_with_error.ets:20:32 Error SyntaxError: Unexpected token ')'. */
-
 /* @@? distant_package.ets:22:22 Error SyntaxError: Variable must be initialized or it's type must be declared. */
-
-/* @@? package_with_errors_2.ets:19:16 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
 /* @@? package_with_errors_2.ets:19:16 Error TypeError: Unresolved reference foo */
 /* @@? package_with_errors_2.ets:19:16 Error TypeError: This expression is not callable. */
-
 /* @@? package_with_errors_1.ets:19:32 Error TypeError: Cannot cast type 'String' to 'Double' */
diff --git a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_2.ets b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_2.ets
index bd2e68d9233625dc5b18d7ac203e4c9a56c404f4..58ca5496f158e7f60cf2fed3ec0ccbd14da31485 100644
--- a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_2.ets
+++ b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_2.ets
@@ -24,11 +24,7 @@ export notInit
 /* @@? import_in_package_with_error.ets:20:29 Error SyntaxError: Unexpected token '='. */
 /* @@? import_in_package_with_error.ets:20:30 Error SyntaxError: Unexpected token, expected ')'. */
 /* @@? import_in_package_with_error.ets:20:32 Error SyntaxError: Unexpected token ')'. */
-
 /* @@? distant_package.ets:22:22 Error SyntaxError: Variable must be initialized or it's type must be declared. */
-
 /* @@? package_with_errors_1.ets:19:32 Error TypeError: Cannot cast type 'String' to 'Double' */
-
-/* @@? package_with_errors_2.ets:19:16 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
 /* @@? package_with_errors_2.ets:19:16 Error TypeError: Unresolved reference foo */
 /* @@? package_with_errors_2.ets:19:16 Error TypeError: This expression is not callable. */
diff --git a/ets2panda/test/ast/compiler/ets/package_invalid_initializer/P3/P3.ets b/ets2panda/test/ast/compiler/ets/package_invalid_initializer/P3/P3.ets
index 3609cbb822433097e51adf6a68531a869e015874..718607481dfea2a938287f5603cbfea11ea028c2 100644
--- a/ets2panda/test/ast/compiler/ets/package_invalid_initializer/P3/P3.ets
+++ b/ets2panda/test/ast/compiler/ets/package_invalid_initializer/P3/P3.ets
@@ -42,13 +42,10 @@ static {
     var_tobe_shadowed = 2;
 }
 
-/* @@? P3.ets:26:25 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
-/* @@? P3.ets:27:23 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
 /* @@? P3.ets:29:14 Error SyntaxError: Missing initialization for const package property */
 /* @@? P3.ets:29:18 Error SyntaxError: Variable must be initialized or it's type must be declared. */
 /* @@? P3.ets:30:30 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
 /* @@? P3.ets:31:14 Error TypeError: Cannot reassign constant c_nn2 */
-/* @@? P3.ets:32:6 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
 /* @@? P3.ets:33:1 Error SyntaxError: Invalid package toplevel statement */
 /* @@? P3.ets:34:1 Error SyntaxError: Invalid package toplevel statement */
 /* @@? P3.ets:39:14 Error SyntaxError: Missing initialization for const package property */
diff --git a/ets2panda/test/ast/compiler/ets/package_invalid_initializer/main_test.ets b/ets2panda/test/ast/compiler/ets/package_invalid_initializer/main_test.ets
index 241151b6461a23c0f6494d44460e212e3cb73052..442220438fe10d11a0f8c504528ccee1db498f8c 100644
--- a/ets2panda/test/ast/compiler/ets/package_invalid_initializer/main_test.ets
+++ b/ets2panda/test/ast/compiler/ets/package_invalid_initializer/main_test.ets
@@ -15,10 +15,7 @@
 
 import {nn, nn1, nn2} from "./P3"
 
-/* @@? P3.ets:26:25 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
-/* @@? P3.ets:27:23 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
 /* @@? P3.ets:29:18 Error SyntaxError: Variable must be initialized or it's type must be declared. */
 /* @@? P3.ets:30:30 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
-/* @@? P3.ets:32:6 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */
 /* @@? P3.ets:33:1 Error SyntaxError: Invalid package toplevel statement */
 /* @@? P3.ets:34:1 Error SyntaxError: Invalid package toplevel statement */
diff --git a/ets2panda/test/ast/compiler/ets/type_error_processing/var_without_def.ets b/ets2panda/test/ast/compiler/ets/type_error_processing/var_without_def.ets
index 39be4eb79ae1de0b0bfcc5da375cd306abe800a6..799e9d1a8063e84e303b53ecf815ade00a1d014c 100644
--- a/ets2panda/test/ast/compiler/ets/type_error_processing/var_without_def.ets
+++ b/ets2panda/test/ast/compiler/ets/type_error_processing/var_without_def.ets
@@ -24,7 +24,7 @@ function foo() {
     void = [([...asyncGenerator])]
 }
 
-/* @@? 16:1 Error TypeError: Unresolved reference a */
-/* @@? 20:1 Error TypeError: Unresolved reference c */
+/* @@? 21:9 Error TypeError: Unresolved reference a */
+/* @@? 21:17 Error TypeError: Unresolved reference c */
 /* @@? 24:5 Error SyntaxError: Unexpected token 'void'. */
 /* @@? 24:18 Error TypeError: Unresolved reference asyncGenerator */
diff --git a/ets2panda/test/ast/compiler/ets/unresolved_reference.ets b/ets2panda/test/ast/compiler/ets/unresolved_reference.ets
index f2dff3a5f03ca1c9f2220cca228ded133516c56c..9478fc0e84d5c05b9fa08f7c6f6f748fe0426ea5 100644
--- a/ets2panda/test/ast/compiler/ets/unresolved_reference.ets
+++ b/ets2panda/test/ast/compiler/ets/unresolved_reference.ets
@@ -37,5 +37,5 @@ function main() {
     let a = (new A).b
 }
 
-/* @@? 28:13 Error TypeError: Unresolved reference b */
+/* @@? 16:13 Error TypeError: Unresolved reference b */
 /* @@? 37:21 Error TypeError: Property 'b' does not exist on type 'A' */
diff --git a/ets2panda/test/ast/parser/ets/FixedArray/MultipleParserErrors.ets b/ets2panda/test/ast/parser/ets/FixedArray/MultipleParserErrors.ets
index 0875a7c7305720d2a61078f0bcbc62b3afe093e6..a97e3450fc1f571d6ce4b5ee4f690eb2bc8d458a 100644
--- a/ets2panda/test/ast/parser/ets/FixedArray/MultipleParserErrors.ets
+++ b/ets2panda/test/ast/parser/ets/FixedArray/MultipleParserErrors.ets
@@ -189,7 +189,7 @@ function main(): void {
 /* @@? 43:11 Error SyntaxError: Invalid left-hand side in assignment expression. */
 /* @@? 43:13 Error SyntaxError: Unexpected token 'byte'. */
 /* @@? 45:6 Error SyntaxError: Unexpected token 'this'. */
-/* @@? 45:6 Error TypeError: Cannot reference 'this' in this context. */
+/* @@? 45:6 Error TypeError: 'this' cannot be referenced from a static context */
 /* @@? 45:6 Error TypeError: Invalid left-hand side of assignment expression */
 /* @@? 45:11 Error SyntaxError: Invalid left-hand side in assignment expression. */
 /* @@? 47:8 Error SyntaxError: Variable must be initialized or it's type must be declared. */
@@ -226,10 +226,10 @@ function main(): void {
 /* @@? 92:7 Error TypeError: Variable 'A' has already been declared. */
 /* @@? 92:7 Error TypeError: Merging declarations is not supported, please keep all definitions of classes, interfaces and enums compact in the codebase! */
 /* @@? 93:3 Error SyntaxError: Unexpected token. A constructor, method, accessor, or property was expected. */
-/* @@? 115:26 Error SyntaxError: Unexpected token 'case'. */
-/* @@? 115:26 Error SyntaxError: Unexpected token, expected ',' or ')'. */
-/* @@? 115:26 Error SyntaxError: Parameter declaration should have an explicit type annotation. */
 /* @@? 115:26 Error SyntaxError: Unexpected token, expected an identifier. */
+/* @@? 115:26 Error SyntaxError: Parameter declaration should have an explicit type annotation. */
+/* @@? 115:26 Error SyntaxError: Unexpected token, expected ',' or ')'. */
+/* @@? 115:26 Error SyntaxError: Unexpected token 'case'. */
 /* @@? 115:30 Error SyntaxError: Unexpected token ':'. */
 /* @@? 115:32 Error SyntaxError: Unexpected token 'U'. */
 /* @@? 115:32 Error TypeError: Unresolved reference U */
@@ -240,10 +240,10 @@ function main(): void {
 /* @@? 115:38 Error SyntaxError: Unexpected token '{'. */
 /* @@? 116:5 Error SyntaxError: return keyword should be used in function body. */
 /* @@? 116:12 Error TypeError: All return statements in the function should be empty or have a value. */
-/* @@? 119:26 Error SyntaxError: Unexpected token 'case'. */
+/* @@? 119:26 Error SyntaxError: Unexpected token, expected an identifier. */
 /* @@? 119:26 Error SyntaxError: Parameter declaration should have an explicit type annotation. */
 /* @@? 119:26 Error SyntaxError: Unexpected token, expected ',' or ')'. */
-/* @@? 119:26 Error SyntaxError: Unexpected token, expected an identifier. */
+/* @@? 119:26 Error SyntaxError: Unexpected token 'case'. */
 /* @@? 119:30 Error SyntaxError: Unexpected token ':'. */
 /* @@? 119:32 Error SyntaxError: Unexpected token 'U'. */
 /* @@? 119:33 Error SyntaxError: Unexpected token ')'. */
@@ -253,15 +253,16 @@ function main(): void {
 /* @@? 120:5 Error SyntaxError: return keyword should be used in function body. */
 /* @@? 120:12 Error TypeError: All return statements in the function should be empty or have a value. */
 /* @@? 123:5 Error SyntaxError: Identifier expected, got ','. */
+/* @@? 123:6 Error SyntaxError: Variable must be initialized or it's type must be declared. */
 /* @@? 123:6 Error SyntaxError: Unexpected token 'abc'. */
 /* @@? 123:6 Error SyntaxError: Variable must be initialized or it's type must be declared. */
 /* @@? 123:6 Error TypeError: Unresolved reference abc */
 /* @@? 127:1 Error SyntaxError: The modifier async cannot be used in an ambient context. */
 /* @@? 132:14 Error SyntaxError: Unexpected token, expected an identifier. */
-/* @@? 137:16 Error SyntaxError: Unexpected token '='. */
-/* @@? 137:16 Error SyntaxError: Expected '{', got '='. */
-/* @@? 137:16 Error SyntaxError: Expected ')', got '='. */
 /* @@? 137:16 Error SyntaxError: Catch clause variable cannot have an initializer. */
+/* @@? 137:16 Error SyntaxError: Expected ')', got '='. */
+/* @@? 137:16 Error SyntaxError: Expected '{', got '='. */
+/* @@? 137:16 Error SyntaxError: Unexpected token '='. */
 /* @@? 137:18 Error SyntaxError: Unexpected token '0'. */
 /* @@? 137:19 Error SyntaxError: Unexpected token ')'. */
 /* @@? 137:21 Error SyntaxError: Unexpected token '{'. */
@@ -276,12 +277,12 @@ function main(): void {
 /* @@? 158:26 Error TypeError: Property 'getInner' does not exist on type 'A' */
 /* @@? 161:9 Error SyntaxError: Identifier expected, got 'let'. */
 /* @@? 161:9 Error SyntaxError: Hard keyword 'let' cannot be used as identifier */
-/* @@? 162:9 Error SyntaxError: Hard keyword 'const' cannot be used as identifier */
 /* @@? 162:9 Error SyntaxError: Identifier expected, got 'const'. */
+/* @@? 162:9 Error SyntaxError: Hard keyword 'const' cannot be used as identifier */
 /* @@? 163:9 Error SyntaxError: Hard keyword 'new' cannot be used as identifier */
 /* @@? 163:9 Error SyntaxError: Identifier expected, got 'new'. */
 /* @@? 164:5 Error TypeError: This expression is not callable. */
 /* @@? 165:5 Error TypeError: This expression is not callable. */
-/* @@? 166:5 Error TypeError: Expected 1 arguments, got 0. */
 /* @@? 166:5 Error TypeError: No matching call signature */
-/* @@? 288:1 Error SyntaxError: Expected '}', got 'end of stream'. */
+/* @@? 166:5 Error TypeError: Expected 1 arguments, got 0. */
+/* @@? 289:1 Error SyntaxError: Expected '}', got 'end of stream'. */
diff --git a/ets2panda/test/ast/parser/ets/MultipleParserErrors.ets b/ets2panda/test/ast/parser/ets/MultipleParserErrors.ets
index 134fd0804fc8e36b16d4e607ab019596474b96ac..363f226b3fef6b5b50c219ceb625a2ff05ad1117 100644
--- a/ets2panda/test/ast/parser/ets/MultipleParserErrors.ets
+++ b/ets2panda/test/ast/parser/ets/MultipleParserErrors.ets
@@ -189,7 +189,7 @@ function main(): void {
 /* @@? 43:11 Error SyntaxError: Invalid left-hand side in assignment expression. */
 /* @@? 43:13 Error SyntaxError: Unexpected token 'byte'. */
 /* @@? 45:6 Error SyntaxError: Unexpected token 'this'. */
-/* @@? 45:6 Error TypeError: Cannot reference 'this' in this context. */
+/* @@? 45:6 Error TypeError: 'this' cannot be referenced from a static context */
 /* @@? 45:6 Error TypeError: Invalid left-hand side of assignment expression */
 /* @@? 45:11 Error SyntaxError: Invalid left-hand side in assignment expression. */
 /* @@? 47:8 Error SyntaxError: Variable must be initialized or it's type must be declared. */
@@ -251,15 +251,15 @@ function main(): void {
 /* @@? 120:5 Error SyntaxError: return keyword should be used in function body. */
 /* @@? 120:12 Error TypeError: All return statements in the function should be empty or have a value. */
 /* @@? 123:5 Error SyntaxError: Identifier expected, got ','. */
-/* @@? 123:6 Error SyntaxError: Unexpected token 'abc'. */
 /* @@? 123:6 Error SyntaxError: Variable must be initialized or it's type must be declared. */
+/* @@? 123:6 Error SyntaxError: Unexpected token 'abc'. */
 /* @@? 123:6 Error TypeError: Unresolved reference abc */
 /* @@? 127:1 Error SyntaxError: The modifier async cannot be used in an ambient context. */
 /* @@? 132:14 Error SyntaxError: Unexpected token, expected an identifier. */
-/* @@? 137:16 Error SyntaxError: Unexpected token '='. */
-/* @@? 137:16 Error SyntaxError: Expected '{', got '='. */
-/* @@? 137:16 Error SyntaxError: Expected ')', got '='. */
 /* @@? 137:16 Error SyntaxError: Catch clause variable cannot have an initializer. */
+/* @@? 137:16 Error SyntaxError: Expected ')', got '='. */
+/* @@? 137:16 Error SyntaxError: Expected '{', got '='. */
+/* @@? 137:16 Error SyntaxError: Unexpected token '='. */
 /* @@? 137:18 Error SyntaxError: Unexpected token '0'. */
 /* @@? 137:19 Error SyntaxError: Unexpected token ')'. */
 /* @@? 137:21 Error SyntaxError: Unexpected token '{'. */
@@ -272,14 +272,14 @@ function main(): void {
 /* @@? 151:29 Error TypeError: Cannot find type 'D0'. */
 /* @@? 157:16 Error TypeError: A is abstract therefore cannot be instantiated. */
 /* @@? 158:26 Error TypeError: Property 'getInner' does not exist on type 'A' */
-/* @@? 161:9 Error SyntaxError: Identifier expected, got 'let'. */
 /* @@? 161:9 Error SyntaxError: Hard keyword 'let' cannot be used as identifier */
-/* @@? 162:9 Error SyntaxError: Hard keyword 'const' cannot be used as identifier */
+/* @@? 161:9 Error SyntaxError: Identifier expected, got 'let'. */
 /* @@? 162:9 Error SyntaxError: Identifier expected, got 'const'. */
-/* @@? 163:9 Error SyntaxError: Hard keyword 'new' cannot be used as identifier */
+/* @@? 162:9 Error SyntaxError: Hard keyword 'const' cannot be used as identifier */
 /* @@? 163:9 Error SyntaxError: Identifier expected, got 'new'. */
+/* @@? 163:9 Error SyntaxError: Hard keyword 'new' cannot be used as identifier */
 /* @@? 164:5 Error TypeError: This expression is not callable. */
 /* @@? 165:5 Error TypeError: This expression is not callable. */
-/* @@? 166:5 Error TypeError: Expected 1 arguments, got 0. */
 /* @@? 166:5 Error TypeError: No matching call signature */
+/* @@? 166:5 Error TypeError: Expected 1 arguments, got 0. */
 /* @@? 286:1 Error SyntaxError: Expected '}', got 'end of stream'. */
diff --git a/ets2panda/test/ast/parser/ets/extension_function_tests/extension_function_error2.ets b/ets2panda/test/ast/parser/ets/extension_function_tests/extension_function_error2.ets
index 752a06d4cceb6598bb28c56cf9d6fa2f6c135ed4..569109a6ae232c927b768b1b0ad0503b1a014a6a 100644
--- a/ets2panda/test/ast/parser/ets/extension_function_tests/extension_function_error2.ets
+++ b/ets2panda/test/ast/parser/ets/extension_function_tests/extension_function_error2.ets
@@ -17,17 +17,15 @@ let a = (this: TextAttribute, this { this.width(width); return this;
 }
 
 /* @@? 16:9 Error TypeError: 'this' cannot be referenced from a static context */
-/* @@? 16:9 Error TypeError: Cannot reference 'this' in this context. */
-/* @@? 16:9 Error TypeError: Type 'Error' cannot be assigned to type 'ETSGLOBAL' */
 /* @@? 16:14 Error SyntaxError: Unexpected token, expected ')'. */
 /* @@? 16:16 Error SyntaxError: Unexpected token 'TextAttribute'. */
 /* @@? 16:16 Error TypeError: Unresolved reference TextAttribute */
 /* @@? 16:29 Error SyntaxError: Unexpected token ','. */
 /* @@? 16:31 Error SyntaxError: Unexpected token 'this'. */
-/* @@? 16:31 Error TypeError: Cannot reference 'this' in this context. */
+/* @@? 16:31 Error TypeError: 'this' cannot be referenced from a static context */
 /* @@? 16:36 Error SyntaxError: Unexpected token '{'. */
-/* @@? 16:38 Error TypeError: Cannot reference 'this' in this context. */
-/* @@? 16:43 Error TypeError: Property 'width' does not exist on type 'Error' */
+/* @@? 16:38 Error TypeError: 'this' cannot be referenced from a static context */
+/* @@? 16:43 Error TypeError: Property 'width' does not exist on type 'ETSGLOBAL' */
 /* @@? 16:57 Error SyntaxError: return keyword should be used in function body. */
-/* @@? 16:64 Error TypeError: Cannot reference 'this' in this context. */
+/* @@? 16:64 Error TypeError: 'this' cannot be referenced from a static context */
 /* @@? 16:64 Error TypeError: All return statements in the function should be empty or have a value. */
diff --git a/ets2panda/test/ast/parser/ets/for_await_of_loop.ets b/ets2panda/test/ast/parser/ets/for_await_of_loop.ets
index 3b41c8b661529fd31f678ee9eb1cfd5dc49e8d88..9ec9ec14aeb8d130d70cef40cceb0aa686ff19b0 100644
--- a/ets2panda/test/ast/parser/ets/for_await_of_loop.ets
+++ b/ets2panda/test/ast/parser/ets/for_await_of_loop.ets
@@ -17,8 +17,8 @@ for await (let k: int /* @@ label1 */= 0; /* @@ label2 */k < d.length; k++) {
     this.$_set_unsafe(k + 1, d[k])
 }
 
-/* @@@ label1 Error SyntaxError: for-await-of loop variable declaration may not have an initializer. */
-/* @@@ label2 Error SyntaxError: Unexpected token 'k'. */
+/* @@? 16:38 Error SyntaxError: for-await-of loop variable declaration may not have an initializer. */
+/* @@? 16:58 Error SyntaxError: Unexpected token 'k'. */
 /* @@? 16:62 Error TypeError: Unresolved reference d */
-/* @@? 17:5 Error TypeError: Cannot reference 'this' in this context. */
-/* @@? 17:10 Error TypeError: Property '$_set_unsafe' does not exist on type 'Error' */
+/* @@? 17:5 Error TypeError: 'this' cannot be referenced from a static context */
+/* @@? 17:10 Error TypeError: Property '$_set_unsafe' does not exist on type 'ETSGLOBAL' */
diff --git a/ets2panda/test/ast/parser/ets/invalid_object_expression.ets b/ets2panda/test/ast/parser/ets/invalid_object_expression.ets
index a7b52b85583f9176c23844e417e8b969944357cc..16850eb68271070dc0fd7ae73e2865ee262847c3 100644
--- a/ets2panda/test/ast/parser/ets/invalid_object_expression.ets
+++ b/ets2panda/test/ast/parser/ets/invalid_object_expression.ets
@@ -20,8 +20,8 @@ let obj: Record<string, number> = {
 
 /* @@? 18:5 Error SyntaxError: Unexpected token. */
 /* @@? 18:6 Error SyntaxError: Unexpected token. */
-/* @@? 18:6 Error TypeError: Cannot reference 'this' in this context. */
-/* @@? 18:11 Error TypeError: Property 'viewModel' does not exist on type 'Error' */
+/* @@? 18:6 Error TypeError: 'this' cannot be referenced from a static context */
+/* @@? 18:11 Error TypeError: Property 'viewModel' does not exist on type 'ETSGLOBAL' */
 /* @@? 18:24 Error SyntaxError: Unexpected token. */
 /* @@? 18:26 Error SyntaxError: Unexpected token ':'. */
 /* @@? 18:28 Error SyntaxError: Unexpected token '123'. */
diff --git a/ets2panda/test/ast/parser/ets/unexpected_token_63.ets b/ets2panda/test/ast/parser/ets/unexpected_token_63.ets
index 40a8346dc0839833ce2ffd16fadac6498fa6510a..2cc94b998aaf2f7ba42a98f43c6e4fc8792aa8c6 100644
--- a/ets2panda/test/ast/parser/ets/unexpected_token_63.ets
+++ b/ets2panda/test/ast/parser/ets/unexpected_token_63.ets
@@ -26,6 +26,7 @@ class A {
 	}
 }
 
+
 /* @@? 17:7 Error TypeError: Only abstract or native methods can't have body. */
 /* @@? 17:23 Error SyntaxError: Parameter declaration should have an explicit type annotation. */
 /* @@? 17:23 Error SyntaxError: Unexpected token, expected ',' or ')'. */
@@ -36,10 +37,10 @@ class A {
 /* @@? 17:39 Error SyntaxError: Unexpected token '{'. */
 /* @@? 18:3 Error SyntaxError: Unexpected token 'while'. */
 /* @@? 18:8 Error SyntaxError: Call signatures in object types are not supported. Use '$_invoke' method instead. */
-/* @@? 18:9 Error SyntaxError: Parameter declaration should have an explicit type annotation. */
+/* @@? 18:9 Error SyntaxError: Unexpected token, expected an identifier. */
 /* @@? 18:9 Error SyntaxError: Unexpected token 'true'. */
 /* @@? 18:9 Error SyntaxError: Unexpected token, expected ',' or ')'. */
-/* @@? 18:9 Error SyntaxError: Unexpected token, expected an identifier. */
+/* @@? 18:9 Error SyntaxError: Parameter declaration should have an explicit type annotation. */
 /* @@? 18:13 Error SyntaxError: Unexpected token ')'. */
 /* @@? 18:15 Error SyntaxError: Unexpected token '{'. */
 /* @@? 19:4 Error SyntaxError: Unexpected token 'if'. */
@@ -53,10 +54,9 @@ class A {
 /* @@? 20:5 Error SyntaxError: Unexpected token 'break'. */
 /* @@? 21:6 Error SyntaxError: Unexpected token 'else'. */
 /* @@? 21:11 Error SyntaxError: Unexpected token '{'. */
-/* @@? 23:5 Error TypeError: Cannot reference 'this' in this context. */
-/* @@? 23:10 Error TypeError: Property 'func' does not exist on type 'Error' */
+/* @@? 23:5 Error TypeError: 'this' cannot be referenced from a static context */
+/* @@? 23:10 Error TypeError: Property 'func' does not exist on type 'ETSGLOBAL' */
 /* @@? 23:21 Error SyntaxError: Unexpected token 'final'. */
 /* @@? 25:3 Error SyntaxError: Unexpected token '}'. */
 /* @@? 26:2 Error SyntaxError: Unexpected token '}'. */
 /* @@? 27:1 Error SyntaxError: Unexpected token '}'. */
-
diff --git a/ets2panda/test/ast/parser/ets/update_funcscope_error.ets b/ets2panda/test/ast/parser/ets/update_funcscope_error.ets
index 7ca3f8b98c016452f86634a9eb2894793e19aff9..3216a64552f5fe0a0b59cbe694ccbddc1df5aa4f 100644
--- a/ets2panda/test/ast/parser/ets/update_funcscope_error.ets
+++ b/ets2panda/test/ast/parser/ets/update_funcscope_error.ets
@@ -34,8 +34,8 @@ export const updateIfChanged = (t: Record<string, Object>) => {
   };
 };
 
-/* @@? 21:19 Error TypeError: Unresolved reference u */
 /* @@? 21:19 Error TypeError: Indexed access is not supported for such expression type. */
+/* @@? 21:19 Error TypeError: Unresolved reference u */
 /* @@? 24:7 Error TypeError: Type '(v: Record<String,Object>) => Boolean' is not compatible with type '(previousValue: Boolean, currentValue: Boolean, index: Double, array: FixedArray<Boolean>) => Boolean' at index 2 */
 /* @@? 27:11 Error TypeError: Invalid record property */
 /* @@? 28:11 Error SyntaxError: Unexpected token. */
@@ -46,6 +46,8 @@ export const updateIfChanged = (t: Record<string, Object>) => {
 /* @@? 28:18 Error SyntaxError: Unexpected token 'v'. */
 /* @@? 29:10 Error SyntaxError: Unexpected token, expected ',' or ')'. */
 /* @@? 30:16 Error TypeError: Unresolved reference update */
+/* @@? 30:16 Error TypeError: This expression is not callable. */
 /* @@? 32:5 Error SyntaxError: Unexpected token ')'. */
 /* @@? 33:12 Error TypeError: Unresolved reference reduceResult */
+/* @@? 33:12 Error TypeError: Unexpected return value, enclosing method return type is void. */
 /* @@? 35:1 Error SyntaxError: Unexpected token '}'. */
diff --git a/ets2panda/test/compiler/ets/116100-expected.txt b/ets2panda/test/compiler/ets/116100-expected.txt
index 3c49933eabc702efb3462de85c272f995e3894e7..5834754e75d59592d56855b7a8d9cea77a0976ae 100644
--- a/ets2panda/test/compiler/ets/116100-expected.txt
+++ b/ets2panda/test/compiler/ets/116100-expected.txt
@@ -130,227 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "fp",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "116100.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 7,
-                              "program": "116100.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrowFunctionExpression",
-                          "function": {
-                            "type": "ScriptFunction",
-                            "id": null,
-                            "generator": false,
-                            "async": false,
-                            "expression": false,
-                            "params": [],
-                            "returnType": {
-                              "type": "ETSPrimitiveType",
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 33,
-                                  "program": "116100.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 37,
-                                  "program": "116100.ets"
-                                }
-                              }
-                            },
-                            "body": {
-                              "type": "BlockStatement",
-                              "statements": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 41,
-                                  "program": "116100.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 43,
-                                  "program": "116100.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 29,
-                                "program": "116100.ets"
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 43,
-                                "program": "116100.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 29,
-                              "program": "116100.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 43,
-                              "program": "116100.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "116100.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 43,
-                            "program": "116100.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "116100.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 43,
-                          "program": "116100.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "116100.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 43,
-                      "program": "116100.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "116100.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 43,
-                    "program": "116100.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "116100.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 43,
-                  "program": "116100.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "116100.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 43,
-                "program": "116100.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -449,7 +228,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 43,
+                "column": 29,
                 "program": "116100.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/ConditionalExpressionCallVoidNeg-expected.txt b/ets2panda/test/compiler/ets/ConditionalExpressionCallVoidNeg-expected.txt
index 95df6340cd6bcfe40e37d41553ac08b869831b42..2f8d14c14ea4249d181a13d2f52f95570ca192fc 100644
--- a/ets2panda/test/compiler/ets/ConditionalExpressionCallVoidNeg-expected.txt
+++ b/ets2panda/test/compiler/ets/ConditionalExpressionCallVoidNeg-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ConditionalExpressionCallVoidNeg.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ConditionalExpressionCallVoidNeg.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ConditionalExpressionCallVoidNeg.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ConditionalExpressionCallVoidNeg.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ConditionalExpressionCallVoidNeg.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ConditionalExpressionCallVoidNeg.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ConditionalExpressionCallVoidNeg.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ConditionalExpressionCallVoidNeg.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/FunctionType2-expected.txt b/ets2panda/test/compiler/ets/FunctionType2-expected.txt
index 47773f7ec7aad33a6e5524ec45349def9478a460..b535f2bd1f84a6f31dba7c93da3fafc16221fea0 100644
--- a/ets2panda/test/compiler/ets/FunctionType2-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType2-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "FunctionType2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "FunctionType2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "FunctionType2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "FunctionType2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "FunctionType2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "FunctionType2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "FunctionType2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "FunctionType2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/compiler/ets/FunctionType4-expected.txt b/ets2panda/test/compiler/ets/FunctionType4-expected.txt
index e9f5618679dbff4436a3c4ba13e9a6cc16034c14..9ce6db1e636ab194290ebf802463a8d8aa98c53a 100644
--- a/ets2panda/test/compiler/ets/FunctionType4-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType4-expected.txt
@@ -24,178 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "cb",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "FunctionType4.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 7,
-                              "program": "FunctionType4.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "bar",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 21,
-                              "program": "FunctionType4.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 24,
-                              "program": "FunctionType4.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "FunctionType4.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 24,
-                            "program": "FunctionType4.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "FunctionType4.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 24,
-                          "program": "FunctionType4.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 20,
-                      "column": 5,
-                      "program": "FunctionType4.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 24,
-                      "program": "FunctionType4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 20,
-                    "column": 5,
-                    "program": "FunctionType4.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 24,
-                    "program": "FunctionType4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 20,
-                  "column": 5,
-                  "program": "FunctionType4.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 24,
-                  "program": "FunctionType4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 20,
-                "column": 5,
-                "program": "FunctionType4.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 24,
-                "program": "FunctionType4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -432,7 +260,7 @@
               },
               "end": {
                 "line": 20,
-                "column": 24,
+                "column": 21,
                 "program": "FunctionType4.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt
index c150765e8668980e4420af6a034440dd0e5c0d4c..8e54aa8c3580e2b9889818ab40daa10b4fa001b6 100644
--- a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt
+++ b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt
@@ -3131,112 +3131,6 @@
                 "program": "abstractMethodDeclaredInParentClass.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "abstractMethodDeclaredInParentClass.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "abstractMethodDeclaredInParentClass.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "abstractMethodDeclaredInParentClass.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "abstractMethodDeclaredInParentClass.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "abstractMethodDeclaredInParentClass.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "abstractMethodDeclaredInParentClass.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "abstractMethodDeclaredInParentClass.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "abstractMethodDeclaredInParentClass.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt
index 02f1678229415ea64945e0eceb4ac444e0e1d5ec..5319fddcd13e92d7dcf4c7ba2372f48665111020 100644
--- a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt
+++ b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt
@@ -970,287 +970,6 @@
                 "program": "abstractNewClassInstanceExpression.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "EmptyStatement",
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 11,
-                          "program": "abstractNewClassInstanceExpression.ets"
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 12,
-                          "program": "abstractNewClassInstanceExpression.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "H",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 32,
-                              "column": 11,
-                              "program": "abstractNewClassInstanceExpression.ets"
-                            },
-                            "end": {
-                              "line": 32,
-                              "column": 12,
-                              "program": "abstractNewClassInstanceExpression.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "H",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 32,
-                                    "column": 19,
-                                    "program": "abstractNewClassInstanceExpression.ets"
-                                  },
-                                  "end": {
-                                    "line": 32,
-                                    "column": 20,
-                                    "program": "abstractNewClassInstanceExpression.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 32,
-                                  "column": 19,
-                                  "program": "abstractNewClassInstanceExpression.ets"
-                                },
-                                "end": {
-                                  "line": 32,
-                                  "column": 21,
-                                  "program": "abstractNewClassInstanceExpression.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 32,
-                                "column": 19,
-                                "program": "abstractNewClassInstanceExpression.ets"
-                              },
-                              "end": {
-                                "line": 32,
-                                "column": 21,
-                                "program": "abstractNewClassInstanceExpression.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 32,
-                              "column": 15,
-                              "program": "abstractNewClassInstanceExpression.ets"
-                            },
-                            "end": {
-                              "line": 32,
-                              "column": 24,
-                              "program": "abstractNewClassInstanceExpression.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 32,
-                            "column": 11,
-                            "program": "abstractNewClassInstanceExpression.ets"
-                          },
-                          "end": {
-                            "line": 32,
-                            "column": 24,
-                            "program": "abstractNewClassInstanceExpression.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 11,
-                          "program": "abstractNewClassInstanceExpression.ets"
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 24,
-                          "program": "abstractNewClassInstanceExpression.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "BlockStatement",
-                      "statements": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 23,
-                          "program": "abstractNewClassInstanceExpression.ets"
-                        },
-                        "end": {
-                          "line": 34,
-                          "column": 6,
-                          "program": "abstractNewClassInstanceExpression.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "Identifier",
-                        "name": "*ERROR_LITERAL*",
-                        "decorators": [],
-                        "loc": {
-                          "start": {
-                            "line": 35,
-                            "column": 1,
-                            "program": "abstractNewClassInstanceExpression.ets"
-                          },
-                          "end": {
-                            "line": 35,
-                            "column": 2,
-                            "program": "abstractNewClassInstanceExpression.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 35,
-                          "column": 1,
-                          "program": "abstractNewClassInstanceExpression.ets"
-                        },
-                        "end": {
-                          "line": 35,
-                          "column": 2,
-                          "program": "abstractNewClassInstanceExpression.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 32,
-                      "column": 11,
-                      "program": "abstractNewClassInstanceExpression.ets"
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 2,
-                      "program": "abstractNewClassInstanceExpression.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 32,
-                    "column": 11,
-                    "program": "abstractNewClassInstanceExpression.ets"
-                  },
-                  "end": {
-                    "line": 35,
-                    "column": 2,
-                    "program": "abstractNewClassInstanceExpression.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 32,
-                  "column": 11,
-                  "program": "abstractNewClassInstanceExpression.ets"
-                },
-                "end": {
-                  "line": 35,
-                  "column": 2,
-                  "program": "abstractNewClassInstanceExpression.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 32,
-                "column": 11,
-                "program": "abstractNewClassInstanceExpression.ets"
-              },
-              "end": {
-                "line": 35,
-                "column": 2,
-                "program": "abstractNewClassInstanceExpression.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt
index fdab2a6c855669b5b8714a37dc7acc551f7322ce..304eb5b01285f4d2cf1e66084b63ebd8c53cbd7f 100644
--- a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt
+++ b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_declaration.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_declaration.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_declaration.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_declaration.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_declaration.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_declaration.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_declaration.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_declaration.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/array_indexing_without_chaining_non_nullish-expected.txt b/ets2panda/test/compiler/ets/array_indexing_without_chaining_non_nullish-expected.txt
index d260612eff4fa71b109b2e959f7dd89d642d30e5..63ca4b0ab353fc4e805cb44546381769d2eb519e 100644
--- a/ets2panda/test/compiler/ets/array_indexing_without_chaining_non_nullish-expected.txt
+++ b/ets2panda/test/compiler/ets/array_indexing_without_chaining_non_nullish-expected.txt
@@ -285,402 +285,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "arr",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "array_indexing_without_chaining_non_nullish.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 8,
-                              "program": "array_indexing_without_chaining_non_nullish.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "ETSNewClassInstanceExpression",
-                              "typeReference": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "Object",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 18,
-                                        "column": 27,
-                                        "program": "array_indexing_without_chaining_non_nullish.ets"
-                                      },
-                                      "end": {
-                                        "line": 18,
-                                        "column": 33,
-                                        "program": "array_indexing_without_chaining_non_nullish.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 18,
-                                      "column": 27,
-                                      "program": "array_indexing_without_chaining_non_nullish.ets"
-                                    },
-                                    "end": {
-                                      "line": 18,
-                                      "column": 34,
-                                      "program": "array_indexing_without_chaining_non_nullish.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 27,
-                                    "program": "array_indexing_without_chaining_non_nullish.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 34,
-                                    "program": "array_indexing_without_chaining_non_nullish.ets"
-                                  }
-                                }
-                              },
-                              "arguments": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 23,
-                                  "program": "array_indexing_without_chaining_non_nullish.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 36,
-                                  "program": "array_indexing_without_chaining_non_nullish.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "ETSNewClassInstanceExpression",
-                              "typeReference": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "A",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 18,
-                                        "column": 41,
-                                        "program": "array_indexing_without_chaining_non_nullish.ets"
-                                      },
-                                      "end": {
-                                        "line": 18,
-                                        "column": 42,
-                                        "program": "array_indexing_without_chaining_non_nullish.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 18,
-                                      "column": 41,
-                                      "program": "array_indexing_without_chaining_non_nullish.ets"
-                                    },
-                                    "end": {
-                                      "line": 18,
-                                      "column": 43,
-                                      "program": "array_indexing_without_chaining_non_nullish.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 41,
-                                    "program": "array_indexing_without_chaining_non_nullish.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 43,
-                                    "program": "array_indexing_without_chaining_non_nullish.ets"
-                                  }
-                                }
-                              },
-                              "arguments": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 37,
-                                  "program": "array_indexing_without_chaining_non_nullish.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 45,
-                                  "program": "array_indexing_without_chaining_non_nullish.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 22,
-                              "program": "array_indexing_without_chaining_non_nullish.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 45,
-                              "program": "array_indexing_without_chaining_non_nullish.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "array_indexing_without_chaining_non_nullish.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 45,
-                            "program": "array_indexing_without_chaining_non_nullish.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "array_indexing_without_chaining_non_nullish.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 45,
-                          "program": "array_indexing_without_chaining_non_nullish.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "elem",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "array_indexing_without_chaining_non_nullish.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "array_indexing_without_chaining_non_nullish.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "arr",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 21,
-                                "program": "array_indexing_without_chaining_non_nullish.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 24,
-                                "program": "array_indexing_without_chaining_non_nullish.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "NumberLiteral",
-                            "value": 0,
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 25,
-                                "program": "array_indexing_without_chaining_non_nullish.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 26,
-                                "program": "array_indexing_without_chaining_non_nullish.ets"
-                              }
-                            }
-                          },
-                          "computed": true,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 21,
-                              "program": "array_indexing_without_chaining_non_nullish.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 27,
-                              "program": "array_indexing_without_chaining_non_nullish.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "array_indexing_without_chaining_non_nullish.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 27,
-                            "program": "array_indexing_without_chaining_non_nullish.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "array_indexing_without_chaining_non_nullish.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 27,
-                          "program": "array_indexing_without_chaining_non_nullish.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "array_indexing_without_chaining_non_nullish.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 27,
-                      "program": "array_indexing_without_chaining_non_nullish.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "array_indexing_without_chaining_non_nullish.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 27,
-                    "program": "array_indexing_without_chaining_non_nullish.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "array_indexing_without_chaining_non_nullish.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 27,
-                  "program": "array_indexing_without_chaining_non_nullish.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "array_indexing_without_chaining_non_nullish.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 27,
-                "program": "array_indexing_without_chaining_non_nullish.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -827,7 +431,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 45,
+                "column": 22,
                 "program": "array_indexing_without_chaining_non_nullish.ets"
               }
             }
@@ -914,7 +518,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 27,
+                "column": 21,
                 "program": "array_indexing_without_chaining_non_nullish.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/array_with_null_type-expected.txt b/ets2panda/test/compiler/ets/array_with_null_type-expected.txt
index 61aea179dabc9b7851e7cede71fbf283c8810bc6..5ec20d87dd4dd913da76dda26539ba61e06e9c15 100644
--- a/ets2panda/test/compiler/ets/array_with_null_type-expected.txt
+++ b/ets2panda/test/compiler/ets/array_with_null_type-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_with_null_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_with_null_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_with_null_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_with_null_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_with_null_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_with_null_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "array_with_null_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "array_with_null_type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/array_with_undefined_type-expected.txt b/ets2panda/test/compiler/ets/array_with_undefined_type-expected.txt
index 316fa937e77455243548aa902fb1724a1ffd5405..ec88c911fd8e4c45b1f5f652efefacc3e765ca60 100644
--- a/ets2panda/test/compiler/ets/array_with_undefined_type-expected.txt
+++ b/ets2panda/test/compiler/ets/array_with_undefined_type-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_with_undefined_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_with_undefined_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_with_undefined_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_with_undefined_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_with_undefined_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_with_undefined_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "array_with_undefined_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "array_with_undefined_type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt b/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt
index d1bf564e8d30e8d63e8ca69f7ab5ba063bda3096..01c1a13b826b40222bbce9471d781973eeaa1b00 100644
--- a/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt
+++ b/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt
@@ -1030,112 +1030,6 @@
                 "program": "arrowFunctionCapture.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "arrowFunctionCapture.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "arrowFunctionCapture.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "arrowFunctionCapture.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "arrowFunctionCapture.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "arrowFunctionCapture.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "arrowFunctionCapture.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "arrowFunctionCapture.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "arrowFunctionCapture.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/boxingConversion10-expected.txt b/ets2panda/test/compiler/ets/boxingConversion10-expected.txt
index 9026b11d3c40c9e9254cd9b400da91ad750eb39a..04540938f3a36257bf4f1e9833828d8eb0471e43 100644
--- a/ets2panda/test/compiler/ets/boxingConversion10-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion10-expected.txt
@@ -130,242 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "boxingConversion10.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "boxingConversion10.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 0,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "boxingConversion10.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 17,
-                              "program": "boxingConversion10.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "boxingConversion10.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 17,
-                            "program": "boxingConversion10.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "boxingConversion10.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 17,
-                          "program": "boxingConversion10.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "boxingConversion10.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "boxingConversion10.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 17,
-                              "program": "boxingConversion10.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 18,
-                              "program": "boxingConversion10.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "boxingConversion10.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 18,
-                            "program": "boxingConversion10.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "boxingConversion10.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 18,
-                          "program": "boxingConversion10.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "boxingConversion10.ets"
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 18,
-                      "program": "boxingConversion10.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "boxingConversion10.ets"
-                  },
-                  "end": {
-                    "line": 17,
-                    "column": 18,
-                    "program": "boxingConversion10.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "boxingConversion10.ets"
-                },
-                "end": {
-                  "line": 17,
-                  "column": 18,
-                  "program": "boxingConversion10.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "boxingConversion10.ets"
-              },
-              "end": {
-                "line": 17,
-                "column": 18,
-                "program": "boxingConversion10.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -416,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 17,
+                "column": 16,
                 "program": "boxingConversion10.ets"
               }
             }
@@ -503,7 +267,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 18,
+                "column": 17,
                 "program": "boxingConversion10.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt
index 4d8cddd98af613568366249df176972578bddb0e..5d7c60df93a9123e18a57a2311e9e2b7da1a7a26 100644
--- a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boxingConversion2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boxingConversion2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boxingConversion2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boxingConversion2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boxingConversion2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boxingConversion2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "boxingConversion2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "boxingConversion2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt
index 620399e675d5fb9be0f00cbe210dcedbbe7dae66..715fdc39666edbb79dd9597e3f77a0f90e764b26 100644
--- a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boxingConversion3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boxingConversion3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boxingConversion3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boxingConversion3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boxingConversion3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boxingConversion3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "boxingConversion3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "boxingConversion3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/boxingConversion5-expected.txt b/ets2panda/test/compiler/ets/boxingConversion5-expected.txt
index 6217fc4519b80c27788c481fc1662916822ee2f0..2e101642674225cf6fdf037027f36109b55dccf5 100644
--- a/ets2panda/test/compiler/ets/boxingConversion5-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion5-expected.txt
@@ -130,372 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "boxingConversion5.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "boxingConversion5.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 14,
-                              "program": "boxingConversion5.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "boxingConversion5.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "boxingConversion5.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 15,
-                            "program": "boxingConversion5.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "boxingConversion5.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 15,
-                          "program": "boxingConversion5.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "boxingConversion5.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "boxingConversion5.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "i",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 15,
-                              "program": "boxingConversion5.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 16,
-                              "program": "boxingConversion5.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "boxingConversion5.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 16,
-                            "program": "boxingConversion5.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "boxingConversion5.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16,
-                          "program": "boxingConversion5.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "boxingConversion5.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "boxingConversion5.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "i",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 16,
-                              "program": "boxingConversion5.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 17,
-                              "program": "boxingConversion5.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "boxingConversion5.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 17,
-                            "program": "boxingConversion5.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "boxingConversion5.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 17,
-                          "program": "boxingConversion5.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "boxingConversion5.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "boxingConversion5.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "i",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 17,
-                              "program": "boxingConversion5.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 18,
-                              "program": "boxingConversion5.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "boxingConversion5.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 18,
-                            "program": "boxingConversion5.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "boxingConversion5.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 18,
-                          "program": "boxingConversion5.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "boxingConversion5.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 18,
-                      "program": "boxingConversion5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "boxingConversion5.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 18,
-                    "program": "boxingConversion5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "boxingConversion5.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 18,
-                  "program": "boxingConversion5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "boxingConversion5.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 18,
-                "program": "boxingConversion5.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -546,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 15,
+                "column": 14,
                 "program": "boxingConversion5.ets"
               }
             }
@@ -633,7 +267,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 16,
+                "column": 15,
                 "program": "boxingConversion5.ets"
               }
             }
@@ -720,7 +354,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 17,
+                "column": 16,
                 "program": "boxingConversion5.ets"
               }
             }
@@ -807,7 +441,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 18,
+                "column": 17,
                 "program": "boxingConversion5.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/boxingConversion6-expected.txt b/ets2panda/test/compiler/ets/boxingConversion6-expected.txt
index 7b5063ec58f0be5274a0160f771b8c7a32157959..e9b6a253a1ec264d8d06c30e57bf3421f8ff3135 100644
--- a/ets2panda/test/compiler/ets/boxingConversion6-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion6-expected.txt
@@ -130,567 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 0,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "boxingConversion6.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 16,
-                            "program": "boxingConversion6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "boxingConversion6.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 16,
-                          "program": "boxingConversion6.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 16,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 17,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "boxingConversion6.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 17,
-                            "program": "boxingConversion6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "boxingConversion6.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 17,
-                          "program": "boxingConversion6.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 14,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 15,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "boxingConversion6.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 15,
-                            "program": "boxingConversion6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "boxingConversion6.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 15,
-                          "program": "boxingConversion6.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "l",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 15,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 16,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "boxingConversion6.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 16,
-                            "program": "boxingConversion6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "boxingConversion6.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 16,
-                          "program": "boxingConversion6.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 16,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 17,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "boxingConversion6.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 17,
-                            "program": "boxingConversion6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "boxingConversion6.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 17,
-                          "program": "boxingConversion6.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 17,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 18,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "boxingConversion6.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 18,
-                            "program": "boxingConversion6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "boxingConversion6.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 18,
-                          "program": "boxingConversion6.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 6,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 15,
-                              "program": "boxingConversion6.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 16,
-                              "program": "boxingConversion6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "boxingConversion6.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 16,
-                            "program": "boxingConversion6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "boxingConversion6.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 16,
-                          "program": "boxingConversion6.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "boxingConversion6.ets"
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 16,
-                      "program": "boxingConversion6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "boxingConversion6.ets"
-                  },
-                  "end": {
-                    "line": 22,
-                    "column": 16,
-                    "program": "boxingConversion6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "boxingConversion6.ets"
-                },
-                "end": {
-                  "line": 22,
-                  "column": 16,
-                  "program": "boxingConversion6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "boxingConversion6.ets"
-              },
-              "end": {
-                "line": 22,
-                "column": 16,
-                "program": "boxingConversion6.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -741,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 16,
+                "column": 15,
                 "program": "boxingConversion6.ets"
               }
             }
@@ -828,7 +267,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 17,
+                "column": 16,
                 "program": "boxingConversion6.ets"
               }
             }
@@ -915,7 +354,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 15,
+                "column": 14,
                 "program": "boxingConversion6.ets"
               }
             }
@@ -1002,7 +441,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 16,
+                "column": 15,
                 "program": "boxingConversion6.ets"
               }
             }
@@ -1089,7 +528,7 @@
               },
               "end": {
                 "line": 20,
-                "column": 17,
+                "column": 16,
                 "program": "boxingConversion6.ets"
               }
             }
@@ -1176,7 +615,7 @@
               },
               "end": {
                 "line": 21,
-                "column": 18,
+                "column": 17,
                 "program": "boxingConversion6.ets"
               }
             }
@@ -1263,7 +702,7 @@
               },
               "end": {
                 "line": 22,
-                "column": 16,
+                "column": 15,
                 "program": "boxingConversion6.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/boxingConversion7-expected.txt b/ets2panda/test/compiler/ets/boxingConversion7-expected.txt
index ed0f15234f56f150f1275b359f3365f478cef4ce..9a73eadd8ca589909e2fc370f537b891ca2a5609 100644
--- a/ets2panda/test/compiler/ets/boxingConversion7-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion7-expected.txt
@@ -130,437 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CharLiteral",
-                          "value": "a",
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 19,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "boxingConversion7.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 19,
-                            "program": "boxingConversion7.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "boxingConversion7.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 19,
-                          "program": "boxingConversion7.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 14,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 15,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "boxingConversion7.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 15,
-                            "program": "boxingConversion7.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "boxingConversion7.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 15,
-                          "program": "boxingConversion7.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "l",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 15,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 16,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "boxingConversion7.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 16,
-                            "program": "boxingConversion7.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "boxingConversion7.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 16,
-                          "program": "boxingConversion7.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 16,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 17,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "boxingConversion7.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 17,
-                            "program": "boxingConversion7.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "boxingConversion7.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 17,
-                          "program": "boxingConversion7.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 17,
-                              "program": "boxingConversion7.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 18,
-                              "program": "boxingConversion7.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "boxingConversion7.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 18,
-                            "program": "boxingConversion7.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "boxingConversion7.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 18,
-                          "program": "boxingConversion7.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "boxingConversion7.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 18,
-                      "program": "boxingConversion7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "boxingConversion7.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 18,
-                    "program": "boxingConversion7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "boxingConversion7.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 18,
-                  "program": "boxingConversion7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "boxingConversion7.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 18,
-                "program": "boxingConversion7.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -611,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 19,
+                "column": 15,
                 "program": "boxingConversion7.ets"
               }
             }
@@ -698,7 +267,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 15,
+                "column": 14,
                 "program": "boxingConversion7.ets"
               }
             }
@@ -785,7 +354,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 16,
+                "column": 15,
                 "program": "boxingConversion7.ets"
               }
             }
@@ -872,7 +441,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 17,
+                "column": 16,
                 "program": "boxingConversion7.ets"
               }
             }
@@ -959,7 +528,7 @@
               },
               "end": {
                 "line": 20,
-                "column": 18,
+                "column": 17,
                 "program": "boxingConversion7.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/boxingConversion8-expected.txt b/ets2panda/test/compiler/ets/boxingConversion8-expected.txt
index cb1abb58a608bb3af3e3d1163c22d082612b841a..e09e11ae663d1fcbc65b75bdeda303c23eacbc3b 100644
--- a/ets2panda/test/compiler/ets/boxingConversion8-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion8-expected.txt
@@ -130,437 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 2,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 17,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "boxingConversion8.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 17,
-                            "program": "boxingConversion8.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "boxingConversion8.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 17,
-                          "program": "boxingConversion8.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 14,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 15,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "boxingConversion8.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 15,
-                            "program": "boxingConversion8.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "boxingConversion8.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 15,
-                          "program": "boxingConversion8.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "l",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 15,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 16,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "boxingConversion8.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 16,
-                            "program": "boxingConversion8.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "boxingConversion8.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 16,
-                          "program": "boxingConversion8.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 16,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 17,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "boxingConversion8.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 17,
-                            "program": "boxingConversion8.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "boxingConversion8.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 17,
-                          "program": "boxingConversion8.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 17,
-                              "program": "boxingConversion8.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 18,
-                              "program": "boxingConversion8.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "boxingConversion8.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 18,
-                            "program": "boxingConversion8.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "boxingConversion8.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 18,
-                          "program": "boxingConversion8.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "boxingConversion8.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 18,
-                      "program": "boxingConversion8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "boxingConversion8.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 18,
-                    "program": "boxingConversion8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "boxingConversion8.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 18,
-                  "program": "boxingConversion8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "boxingConversion8.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 18,
-                "program": "boxingConversion8.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -611,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 17,
+                "column": 16,
                 "program": "boxingConversion8.ets"
               }
             }
@@ -698,7 +267,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 15,
+                "column": 14,
                 "program": "boxingConversion8.ets"
               }
             }
@@ -785,7 +354,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 16,
+                "column": 15,
                 "program": "boxingConversion8.ets"
               }
             }
@@ -872,7 +441,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 17,
+                "column": 16,
                 "program": "boxingConversion8.ets"
               }
             }
@@ -959,7 +528,7 @@
               },
               "end": {
                 "line": 20,
-                "column": 18,
+                "column": 17,
                 "program": "boxingConversion8.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/boxingConversion9-expected.txt b/ets2panda/test/compiler/ets/boxingConversion9-expected.txt
index 6844c681fb7017a2b4c70c2b4e42174c1bd1d37f..0fd8110adb958fdd552bc58506639d063638643c 100644
--- a/ets2panda/test/compiler/ets/boxingConversion9-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion9-expected.txt
@@ -130,307 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "l",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "boxingConversion9.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "boxingConversion9.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 0,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "boxingConversion9.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "boxingConversion9.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "boxingConversion9.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 16,
-                            "program": "boxingConversion9.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "boxingConversion9.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 16,
-                          "program": "boxingConversion9.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "boxingConversion9.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "boxingConversion9.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "l",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 16,
-                              "program": "boxingConversion9.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 17,
-                              "program": "boxingConversion9.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "boxingConversion9.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 17,
-                            "program": "boxingConversion9.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "boxingConversion9.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 17,
-                          "program": "boxingConversion9.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "boxingConversion9.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "boxingConversion9.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "l",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 17,
-                              "program": "boxingConversion9.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 18,
-                              "program": "boxingConversion9.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "boxingConversion9.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 18,
-                            "program": "boxingConversion9.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "boxingConversion9.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 18,
-                          "program": "boxingConversion9.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "boxingConversion9.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 18,
-                      "program": "boxingConversion9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "boxingConversion9.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 18,
-                    "program": "boxingConversion9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "boxingConversion9.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 18,
-                  "program": "boxingConversion9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "boxingConversion9.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 18,
-                "program": "boxingConversion9.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -481,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 16,
+                "column": 15,
                 "program": "boxingConversion9.ets"
               }
             }
@@ -568,7 +267,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 17,
+                "column": 16,
                 "program": "boxingConversion9.ets"
               }
             }
@@ -655,7 +354,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 18,
+                "column": 17,
                 "program": "boxingConversion9.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt
index b3aab0e5db60492322109aabe9c6e54aa179ed97..d44824bd99d4baab1b480874ca1af948b55bc46f 100644
--- a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt
@@ -8467,112 +8467,6 @@
                 "program": "boxingUnboxingExpressions.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boxingUnboxingExpressions.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boxingUnboxingExpressions.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boxingUnboxingExpressions.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boxingUnboxingExpressions.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boxingUnboxingExpressions.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boxingUnboxingExpressions.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "boxingUnboxingExpressions.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "boxingUnboxingExpressions.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt
index 00b03aa72af595fe5a3c7186233ebeafafb76f48..df03639d962aa17b6fe0794bca6a8601090ba3f3 100644
--- a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt
+++ b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt
@@ -561,112 +561,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "catch-soft-keyword.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "catch-soft-keyword.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "catch-soft-keyword.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "catch-soft-keyword.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "catch-soft-keyword.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "catch-soft-keyword.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "catch-soft-keyword.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "catch-soft-keyword.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/catchParamScope-expected.txt b/ets2panda/test/compiler/ets/catchParamScope-expected.txt
index c2a99cefe1181218ee130e7875277c7f5dc9c22d..2bc168cbb76f55bf6d71545d3efbed912080a83b 100644
--- a/ets2panda/test/compiler/ets/catchParamScope-expected.txt
+++ b/ets2panda/test/compiler/ets/catchParamScope-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "catchParamScope.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "catchParamScope.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "catchParamScope.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "catchParamScope.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "catchParamScope.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "catchParamScope.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "catchParamScope.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "catchParamScope.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt b/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt
index f91e8982d6cc096efe515cba969c95acbe07713a..029ad2a7f17f59e40aec88b18521f2632e9fb7c7 100644
--- a/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt
+++ b/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt
@@ -1096,112 +1096,6 @@
                 "program": "class_def_varargs_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_def_varargs_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_def_varargs_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_def_varargs_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_def_varargs_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_def_varargs_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_def_varargs_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "class_def_varargs_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "class_def_varargs_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt b/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt
index e844b87ed248e291c1dd8aaeda8d0e6de03d6afe..6b1b83b44c86d6844eeb5ed657197816f76c1a94 100644
--- a/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt
+++ b/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt
@@ -339,112 +339,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_def_varargs_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_def_varargs_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_def_varargs_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_def_varargs_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_def_varargs_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_def_varargs_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "class_def_varargs_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "class_def_varargs_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt
index 22661874e6700b45ab2622d7b46e806dd22564e7..59025f5268cc453714ce53f4fa36ae0531adc601 100644
--- a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "conversion-w-ASExpr.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "conversion-w-ASExpr.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "conversion-w-ASExpr.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "conversion-w-ASExpr.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "conversion-w-ASExpr.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "conversion-w-ASExpr.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "conversion-w-ASExpr.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "conversion-w-ASExpr.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -307,7 +201,7 @@
                               },
                               "end": {
                                 "line": 17,
-                                "column": 25,
+                                "column": 33,
                                 "program": "conversion-w-ASExpr.ets"
                               }
                             }
@@ -320,7 +214,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 25,
+                              "column": 33,
                               "program": "conversion-w-ASExpr.ets"
                             }
                           }
@@ -450,7 +344,7 @@
                               },
                               "end": {
                                 "line": 18,
-                                "column": 27,
+                                "column": 36,
                                 "program": "conversion-w-ASExpr.ets"
                               }
                             }
@@ -463,7 +357,7 @@
                             },
                             "end": {
                               "line": 18,
-                              "column": 27,
+                              "column": 36,
                               "program": "conversion-w-ASExpr.ets"
                             }
                           }
@@ -593,7 +487,7 @@
                               },
                               "end": {
                                 "line": 19,
-                                "column": 25,
+                                "column": 32,
                                 "program": "conversion-w-ASExpr.ets"
                               }
                             }
@@ -606,7 +500,7 @@
                             },
                             "end": {
                               "line": 19,
-                              "column": 25,
+                              "column": 32,
                               "program": "conversion-w-ASExpr.ets"
                             }
                           }
@@ -736,7 +630,7 @@
                               },
                               "end": {
                                 "line": 20,
-                                "column": 24,
+                                "column": 32,
                                 "program": "conversion-w-ASExpr.ets"
                               }
                             }
@@ -749,7 +643,7 @@
                             },
                             "end": {
                               "line": 20,
-                              "column": 24,
+                              "column": 32,
                               "program": "conversion-w-ASExpr.ets"
                             }
                           }
@@ -879,7 +773,7 @@
                               },
                               "end": {
                                 "line": 21,
-                                "column": 31,
+                                "column": 40,
                                 "program": "conversion-w-ASExpr.ets"
                               }
                             }
@@ -892,7 +786,7 @@
                             },
                             "end": {
                               "line": 21,
-                              "column": 31,
+                              "column": 40,
                               "program": "conversion-w-ASExpr.ets"
                             }
                           }
@@ -1135,7 +1029,7 @@
                               },
                               "end": {
                                 "line": 23,
-                                "column": 27,
+                                "column": 37,
                                 "program": "conversion-w-ASExpr.ets"
                               }
                             }
@@ -1148,7 +1042,7 @@
                             },
                             "end": {
                               "line": 23,
-                              "column": 27,
+                              "column": 37,
                               "program": "conversion-w-ASExpr.ets"
                             }
                           }
@@ -1278,7 +1172,7 @@
                               },
                               "end": {
                                 "line": 24,
-                                "column": 37,
+                                "column": 47,
                                 "program": "conversion-w-ASExpr.ets"
                               }
                             }
@@ -1291,7 +1185,7 @@
                             },
                             "end": {
                               "line": 24,
-                              "column": 37,
+                              "column": 47,
                               "program": "conversion-w-ASExpr.ets"
                             }
                           }
@@ -1421,7 +1315,7 @@
                               },
                               "end": {
                                 "line": 25,
-                                "column": 31,
+                                "column": 39,
                                 "program": "conversion-w-ASExpr.ets"
                               }
                             }
@@ -1434,7 +1328,7 @@
                             },
                             "end": {
                               "line": 25,
-                              "column": 31,
+                              "column": 39,
                               "program": "conversion-w-ASExpr.ets"
                             }
                           }
diff --git a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt
index 35040cc0c84a29be8c43697fd964f88b18f5bf27..bb8fcb888300af18f7760d70bc1c1062907d3317 100644
--- a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "conversion_w_functions.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "conversion_w_functions.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "conversion_w_functions.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "conversion_w_functions.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "conversion_w_functions.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "conversion_w_functions.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "conversion_w_functions.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "conversion_w_functions.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt b/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt
index 29cda5aafe0c8c11a8229e3086f1e3e2be1de72a..9346001aec6b1fe005a1a8be12e37ca66c1ea694 100644
--- a/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt
+++ b/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt
@@ -472,112 +472,6 @@
                 "program": "delete-non-keyword.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "delete-non-keyword.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "delete-non-keyword.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "delete-non-keyword.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "delete-non-keyword.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "delete-non-keyword.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "delete-non-keyword.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "delete-non-keyword.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "delete-non-keyword.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt b/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt
index d7785640f8e0ee9ec3db282a23d7f349da241e00..c1a0d2cdaaa38691541222206ca0f22b419a3318 100644
--- a/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt
+++ b/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt
@@ -135,112 +135,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ensureNotNullArgNotNullable.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ensureNotNullArgNotNullable.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ensureNotNullArgNotNullable.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ensureNotNullArgNotNullable.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ensureNotNullArgNotNullable.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ensureNotNullArgNotNullable.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ensureNotNullArgNotNullable.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ensureNotNullArgNotNullable.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/ensureNotNullLocalNotNullable-expected.txt b/ets2panda/test/compiler/ets/ensureNotNullLocalNotNullable-expected.txt
index 780a6c73b8321f7d9bd7cb323c2c2269ef7178ae..b8891fd8203f6fff3ac196e5d79f7a0140f75076 100644
--- a/ets2panda/test/compiler/ets/ensureNotNullLocalNotNullable-expected.txt
+++ b/ets2panda/test/compiler/ets/ensureNotNullLocalNotNullable-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ensureNotNullLocalNotNullable.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ensureNotNullLocalNotNullable.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ensureNotNullLocalNotNullable.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ensureNotNullLocalNotNullable.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ensureNotNullLocalNotNullable.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ensureNotNullLocalNotNullable.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ensureNotNullLocalNotNullable.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ensureNotNullLocalNotNullable.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt b/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt
index 0d0389239ba3003ef9c3a9ea3956f7cb35d559e6..2ac02267fceb82f67d905ec78ea8240a52a92385 100644
--- a/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt
+++ b/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ensureNotNullReturnNotNullable.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ensureNotNullReturnNotNullable.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ensureNotNullReturnNotNullable.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ensureNotNullReturnNotNullable.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ensureNotNullReturnNotNullable.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ensureNotNullReturnNotNullable.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ensureNotNullReturnNotNullable.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ensureNotNullReturnNotNullable.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/enum_as_class_member_getValue_call-expected.txt b/ets2panda/test/compiler/ets/enum_as_class_member_getValue_call-expected.txt
index ee11a0655215d61e3ca9a9c73dc43e8b285349e1..9366754f0ee90f926160c3779b72dc741b3a4f35 100644
--- a/ets2panda/test/compiler/ets/enum_as_class_member_getValue_call-expected.txt
+++ b/ets2panda/test/compiler/ets/enum_as_class_member_getValue_call-expected.txt
@@ -11488,112 +11488,6 @@
                 "program": "enum_as_class_member_getValue_call.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "enum_as_class_member_getValue_call.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "enum_as_class_member_getValue_call.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "enum_as_class_member_getValue_call.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "enum_as_class_member_getValue_call.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "enum_as_class_member_getValue_call.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "enum_as_class_member_getValue_call.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "enum_as_class_member_getValue_call.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "enum_as_class_member_getValue_call.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/export_type-expected.txt b/ets2panda/test/compiler/ets/export_type-expected.txt
index 28f42dc57644beeddcf14ff40c162cb5c9c0ee0a..deb26e19ed06e8fee63f43b29d7869493929540d 100644
--- a/ets2panda/test/compiler/ets/export_type-expected.txt
+++ b/ets2panda/test/compiler/ets/export_type-expected.txt
@@ -643,112 +643,6 @@
                 "program": "export_type.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "export_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "export_type.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt
index 81df74579757434e875c75a5c04dea3924281dc8..bdc4657aa87d41266d39020c04cadf98fbdee651 100644
--- a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt
+++ b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "extended_conditional_expression_not.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "extended_conditional_expression_not.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "extended_conditional_expression_not.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "extended_conditional_expression_not.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "extended_conditional_expression_not.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "extended_conditional_expression_not.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "extended_conditional_expression_not.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "extended_conditional_expression_not.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/extended_conditional_expression_not_return_type-expected.txt b/ets2panda/test/compiler/ets/extended_conditional_expression_not_return_type-expected.txt
index 5625d266707db6c3ed357f4919a8f050cfba1406..5178e0203ad5f59fa82cc77e137e7a9066358a56 100644
--- a/ets2panda/test/compiler/ets/extended_conditional_expression_not_return_type-expected.txt
+++ b/ets2panda/test/compiler/ets/extended_conditional_expression_not_return_type-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "extended_conditional_expression_not_return_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "extended_conditional_expression_not_return_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "extended_conditional_expression_not_return_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "extended_conditional_expression_not_return_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "extended_conditional_expression_not_return_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "extended_conditional_expression_not_return_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "extended_conditional_expression_not_return_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "extended_conditional_expression_not_return_type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/forUpdate-expected.txt b/ets2panda/test/compiler/ets/forUpdate-expected.txt
index 3152e96841268f6a8e9aedf7aee8aa9c7679833d..3011466043971348d4f23e1435e565eaafb52ab2 100644
--- a/ets2panda/test/compiler/ets/forUpdate-expected.txt
+++ b/ets2panda/test/compiler/ets/forUpdate-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "forUpdate.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "forUpdate.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "forUpdate.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "forUpdate.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "forUpdate.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "forUpdate.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "forUpdate.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "forUpdate.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt
index a1126a66effbb716e2a52e6bc171b000156d82b8..1bf3b184574c68544fc99a3501f9c9612e465669 100644
--- a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt
+++ b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "forUpdateCharType.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "forUpdateCharType.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "forUpdateCharType.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "forUpdateCharType.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "forUpdateCharType.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "forUpdateCharType.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "forUpdateCharType.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "forUpdateCharType.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt
index 25fda0730c31d88a72498e32004885125ef07fe6..c883aac8cf2b141e3bc50e27be8b70df2d596276 100644
--- a/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt
+++ b/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt
@@ -575,112 +575,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "from-soft-keyword-0.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "from-soft-keyword-0.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "from-soft-keyword-0.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "from-soft-keyword-0.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "from-soft-keyword-0.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "from-soft-keyword-0.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "from-soft-keyword-0.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "from-soft-keyword-0.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt
index 1ac22e92289ebeaa08a0559cd16d8ded8fe603d6..60218751262efcaa630a3cba3b8bb109935bef57 100644
--- a/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt
+++ b/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "from-soft-keyword-1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "from-soft-keyword-1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "from-soft-keyword-1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "from-soft-keyword-1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "from-soft-keyword-1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "from-soft-keyword-1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "from-soft-keyword-1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "from-soft-keyword-1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt
index f154bc195c93f2be61e1cdac28f8d24e70553a81..a9ea41235f3c588575bd68dc5771ee507822dc24 100644
--- a/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt
+++ b/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt
@@ -292,112 +292,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "from-soft-keyword-2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "from-soft-keyword-2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "from-soft-keyword-2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "from-soft-keyword-2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "from-soft-keyword-2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "from-soft-keyword-2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "from-soft-keyword-2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "from-soft-keyword-2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/func-ref-private-expected.txt b/ets2panda/test/compiler/ets/func-ref-private-expected.txt
index 37bf0bf103df9b2ec73e9824e5328ccc91ede868..aa5f53994e0c14994f9300629cfd401fbffbd0ed 100644
--- a/ets2panda/test/compiler/ets/func-ref-private-expected.txt
+++ b/ets2panda/test/compiler/ets/func-ref-private-expected.txt
@@ -645,112 +645,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "func-ref-private.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "func-ref-private.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "func-ref-private.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "func-ref-private.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "func-ref-private.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "func-ref-private.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "func-ref-private.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "func-ref-private.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt
index 94b9bcf948fd171659f0d82838534c6d7f8516d6..d4c374142defd78e4043c5d112bc529b0d073e04 100644
--- a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt
+++ b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt
@@ -87,112 +87,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "functionPointerArray.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "functionPointerArray.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "functionPointerArray.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "functionPointerArray.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "functionPointerArray.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "functionPointerArray.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "functionPointerArray.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "functionPointerArray.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt
index a3009be51234070f331c9c2d5a838cf3b2c77d52..70ac6edea1de4856afc05e1b954a202dbe18659b 100644
--- a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt
+++ b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "functionTypeToObject.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "functionTypeToObject.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "functionTypeToObject.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "functionTypeToObject.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "functionTypeToObject.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "functionTypeToObject.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "functionTypeToObject.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "functionTypeToObject.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt b/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt
index bb165494d6334273a3addccf464ad5b15ae69ebc..ee4ffc176038833eab6590fb366bf6ad48a00145 100644
--- a/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt
+++ b/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt
@@ -380,112 +380,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_subtyping_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_subtyping_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_subtyping_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_subtyping_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_subtyping_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_subtyping_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "function_subtyping_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "function_subtyping_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt b/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt
index 062eb8492bb45228d472c070137916f911d406a3..ec8067cce8fa17fe419dbed4bc0886eb28ac981e 100644
--- a/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt
+++ b/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "functions_with_ambiguous_rest_parameter.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "functions_with_ambiguous_rest_parameter.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "functions_with_ambiguous_rest_parameter.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "functions_with_ambiguous_rest_parameter.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "functions_with_ambiguous_rest_parameter.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "functions_with_ambiguous_rest_parameter.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "functions_with_ambiguous_rest_parameter.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "functions_with_ambiguous_rest_parameter.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt
index 268dc8c9d3748c676c8952d239d504f09a2186ae..c0560fff55973d0052172f13a084fc4cfaf12a31 100644
--- a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt
@@ -9252,7 +9252,7 @@
                               },
                               "end": {
                                 "line": 94,
-                                "column": 34,
+                                "column": 40,
                                 "program": "generic_arrayaslist.ets"
                               }
                             }
@@ -9265,7 +9265,7 @@
                             },
                             "end": {
                               "line": 94,
-                              "column": 34,
+                              "column": 40,
                               "program": "generic_arrayaslist.ets"
                             }
                           }
@@ -11863,7 +11863,7 @@
                           },
                           "end": {
                             "line": 117,
-                            "column": 39,
+                            "column": 45,
                             "program": "generic_arrayaslist.ets"
                           }
                         }
@@ -12411,7 +12411,7 @@
                           },
                           "end": {
                             "line": 125,
-                            "column": 32,
+                            "column": 38,
                             "program": "generic_arrayaslist.ets"
                           }
                         }
@@ -14036,7 +14036,7 @@
                                       },
                                       "end": {
                                         "line": 143,
-                                        "column": 43,
+                                        "column": 49,
                                         "program": "generic_arrayaslist.ets"
                                       }
                                     }
@@ -15163,7 +15163,7 @@
                                         },
                                         "end": {
                                           "line": 151,
-                                          "column": 41,
+                                          "column": 47,
                                           "program": "generic_arrayaslist.ets"
                                         }
                                       }
@@ -15958,7 +15958,7 @@
                                     },
                                     "end": {
                                       "line": 158,
-                                      "column": 35,
+                                      "column": 41,
                                       "program": "generic_arrayaslist.ets"
                                     }
                                   }
@@ -15971,7 +15971,7 @@
                                   },
                                   "end": {
                                     "line": 158,
-                                    "column": 35,
+                                    "column": 41,
                                     "program": "generic_arrayaslist.ets"
                                   }
                                 }
@@ -16377,7 +16377,7 @@
                                             },
                                             "end": {
                                               "line": 160,
-                                              "column": 48,
+                                              "column": 54,
                                               "program": "generic_arrayaslist.ets"
                                             }
                                           }
@@ -17692,7 +17692,7 @@
                                       },
                                       "end": {
                                         "line": 173,
-                                        "column": 44,
+                                        "column": 50,
                                         "program": "generic_arrayaslist.ets"
                                       }
                                     }
@@ -18823,7 +18823,7 @@
                                       },
                                       "end": {
                                         "line": 182,
-                                        "column": 52,
+                                        "column": 58,
                                         "program": "generic_arrayaslist.ets"
                                       }
                                     }
@@ -25295,112 +25295,6 @@
                 "program": "generic_arrayaslist.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_arrayaslist.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_arrayaslist.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_arrayaslist.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_arrayaslist.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_arrayaslist.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_arrayaslist.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_arrayaslist.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_arrayaslist.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt
index a1392dbfafe7b7b5bfb22fa5d1738ce94601e0bf..b4120a084e6d42a9837e2e853460f9f56b6d7855 100644
--- a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt
@@ -600,112 +600,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_class_getter_setter.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_class_getter_setter.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_class_getter_setter.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_class_getter_setter.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_class_getter_setter.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_class_getter_setter.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_class_getter_setter.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_class_getter_setter.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt
index 7e0bce2638da76d990440fc620c4c2c25a58f3cf..6ace9eec1446982f960bbfb5c9dee3f6a746ffd4 100644
--- a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt
@@ -879,112 +879,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_deadlock.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_deadlock.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_deadlock.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_deadlock.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_deadlock.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_deadlock.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_deadlock.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_deadlock.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_func_rest_param_spread_infer-expected.txt b/ets2panda/test/compiler/ets/generic_func_rest_param_spread_infer-expected.txt
index 7df4fb223a6d11ae15ea2ac8eab69834339d85ca..81d3c18e16d463fd7e55e7d5d309e9563caa8b5e 100644
--- a/ets2panda/test/compiler/ets/generic_func_rest_param_spread_infer-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_func_rest_param_spread_infer-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_func_rest_param_spread_infer.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_func_rest_param_spread_infer.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_func_rest_param_spread_infer.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_func_rest_param_spread_infer.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_func_rest_param_spread_infer.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_func_rest_param_spread_infer.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_func_rest_param_spread_infer.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_func_rest_param_spread_infer.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt
index 9e5c24ccf86bc183badb8d55fec634bce6681320..3965dc0a5ad1a1a3dfe5033e2f5a0f4b4eced5e9 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt
@@ -179,112 +179,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt
index d0c98d2a9a5cc8ecb14e1c9820196c4f1867dc05..83e1c0c679dd7fd07114521ca33e600f9bd5c208 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt
@@ -380,112 +380,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt
index 4c26e04289a649d19824b884eaf03083163a83a3..e78a8ce1d18c77a39b85b353afe42bf7042df994 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt
@@ -383,112 +383,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt
index 51781bc0a389ca707acfa10936c6cacdbdb544b1..182fb5fd55ea0f05c29101867b246943f871966f 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt
@@ -693,112 +693,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_5.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt
index 074c3a749d6f68b1949bf7ae9669564cf90270ea..1febeaa437d20950867f5bc38d662e0cd2c6d8a5 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function_call_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function_call_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function_call_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function_call_7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_override_1-expected.txt b/ets2panda/test/compiler/ets/generic_override_1-expected.txt
index b1bdaa73c370f0c5d8298c9df4ba1d71c4e92848..ac20b79dc6896660cde57845d39fa6aa1fde8647 100644
--- a/ets2panda/test/compiler/ets/generic_override_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_override_1-expected.txt
@@ -2461,112 +2461,6 @@
                 "program": "generic_override_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_override_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_override_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_override_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_override_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_override_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_override_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_override_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_override_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generic_override_2-expected.txt b/ets2panda/test/compiler/ets/generic_override_2-expected.txt
index be247d543a6375a1209cacf1f340337004fc82aa..0e3f5fcae61269bbfe248ea031a64bd0180e46b0 100644
--- a/ets2panda/test/compiler/ets/generic_override_2-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_override_2-expected.txt
@@ -3086,112 +3086,6 @@
                 "program": "generic_override_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_override_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_override_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_override_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_override_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_override_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_override_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_override_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_override_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generic_override_3-expected.txt b/ets2panda/test/compiler/ets/generic_override_3-expected.txt
index 26dac385b9c0ac1ddc8bfda72df1fb1b3190c1ca..22bb7d71ff54df12c1a83b7b4bb62c3e56ec025a 100644
--- a/ets2panda/test/compiler/ets/generic_override_3-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_override_3-expected.txt
@@ -2370,112 +2370,6 @@
                 "program": "generic_override_3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_override_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_override_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_override_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_override_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_override_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_override_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_override_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_override_3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt
index a4235a75e58f557a53b9748f920567af915c15af..20d2f94bf5d8ccfc75d4bda678da822e6ca2ae0f 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt
@@ -627,112 +627,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt
index 3cb0c9580f0eedf93cad8de13cba92c9a263f871..8656c15a15baf7057feadde500ce984edab330dc 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt
@@ -531,112 +531,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_6.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt
index b67e9bdf21e15180dce0e877ceece5637f3b30bd..58c488236ef5d2e33611c395d2a103030f57e59c 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt
@@ -152,112 +152,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_7_neg.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_7_neg.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_7_neg.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_7_neg.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_7_neg.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_7_neg.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_7_neg.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_7_neg.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt
index 4f2a59a9b9a2fe97f83819206a879cbb3d512579..c546f3640554217cc93f8c0ee292e0c85f7425bf 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt
@@ -307,112 +307,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_8.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt
index 4192403c560d3122c3b3df1d278bfa0c4d407e3f..94f2a9f6b3edd31edcb893dc4452a7f16cb7f817 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt
@@ -216,112 +216,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_9.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generic_variance_1-expected.txt b/ets2panda/test/compiler/ets/generic_variance_1-expected.txt
index 4e142e0137ede1ce07ef76d690d75603267d3daf..d7fa078c12e4badd5d7f853cb141fabf1dd84167 100644
--- a/ets2panda/test/compiler/ets/generic_variance_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_variance_1-expected.txt
@@ -790,112 +790,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_variance_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_variance_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_variance_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_variance_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_variance_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_variance_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_variance_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_variance_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt b/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt
index bed3edfcb7b555d9707fa8ef584604541f5fab5d..f666d81949ea6ea5982244efe5107dc5d56de805 100644
--- a/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt
@@ -8375,112 +8375,6 @@
                 "program": "generics_class_recursive_type_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_class_recursive_type_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_class_recursive_type_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_class_recursive_type_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_class_recursive_type_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_class_recursive_type_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_class_recursive_type_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_class_recursive_type_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_class_recursive_type_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt
index ded34117695bcd8e51ff1a5b2110816c6283ad4b..a4ed70e586a195b8cd05eb3c687cfde8910b1eb4 100644
--- a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt
@@ -1233,112 +1233,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_implicit_lambda1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_implicit_lambda1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_implicit_lambda1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_implicit_lambda1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_implicit_lambda1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_implicit_lambda1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_implicit_lambda1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_implicit_lambda1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt
index 7613b8c848a0cf2d6cfc756c5bdc8967c5f98ee5..753834ff30be03a3791b3df3f770ab62687bcb38 100644
--- a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt
@@ -1226,7 +1226,7 @@
                               },
                               "end": {
                                 "line": 28,
-                                "column": 44,
+                                "column": 58,
                                 "program": "generics_instantiation_1.ets"
                               }
                             }
@@ -1239,7 +1239,7 @@
                             },
                             "end": {
                               "line": 28,
-                              "column": 44,
+                              "column": 58,
                               "program": "generics_instantiation_1.ets"
                             }
                           }
@@ -1701,7 +1701,7 @@
                               },
                               "end": {
                                 "line": 31,
-                                "column": 39,
+                                "column": 53,
                                 "program": "generics_instantiation_1.ets"
                               }
                             }
@@ -1714,7 +1714,7 @@
                             },
                             "end": {
                               "line": 31,
-                              "column": 39,
+                              "column": 53,
                               "program": "generics_instantiation_1.ets"
                             }
                           }
@@ -2413,112 +2413,6 @@
                 "program": "generics_instantiation_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_instantiation_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_instantiation_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_instantiation_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_instantiation_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_instantiation_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_instantiation_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_instantiation_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_instantiation_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt
index 86c5ee5895f6ce41480de51582eedd3a9f181639..ce1e61804c1448dcd4b9286257c8b494fac9b338 100644
--- a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt
@@ -1517,112 +1517,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_instantiation_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_instantiation_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_instantiation_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_instantiation_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_instantiation_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_instantiation_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_instantiation_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_instantiation_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt
index 7429ca1722ef70c3622fe7d62d2b90a4f2c19a73..a85d7011cdd68d0ef04f21a9a5a6db691c2f2641 100644
--- a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt
@@ -879,112 +879,6 @@
                 "program": "generics_instantiation_3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_instantiation_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_instantiation_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_instantiation_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_instantiation_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_instantiation_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_instantiation_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_instantiation_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_instantiation_3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt
index 11f31c14a432c453cd0352ac4a8fc10d4cccce76..91a614840239e2ab37b4b9f28515271af37ad0e9 100644
--- a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt
@@ -2554,112 +2554,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_instantiation_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_instantiation_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_instantiation_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_instantiation_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_instantiation_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_instantiation_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_instantiation_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_instantiation_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt b/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt
index d048f2362a83f0b649839e4da0292865dea8955b..9ab19baf035571f42521df4af36c2273b8a15fae 100644
--- a/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt
@@ -1262,112 +1262,6 @@
                 "program": "generics_interface_bounds_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_interface_bounds_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_interface_bounds_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_interface_bounds_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_interface_bounds_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_interface_bounds_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_interface_bounds_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_interface_bounds_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_interface_bounds_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt b/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt
index 59a5dffb4e5ab0e4b9c8917e78b494147a3fa538..1dcc36a8448ce97c7e37c0f4e1b5410c9ed2ee8e 100644
--- a/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt
@@ -434,112 +434,6 @@
                 "program": "generics_interface_bounds_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_interface_bounds_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_interface_bounds_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_interface_bounds_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_interface_bounds_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_interface_bounds_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_interface_bounds_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_interface_bounds_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_interface_bounds_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt b/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt
index ffa5c1097054a5ea00150ab0c2c14934d5813a9b..4504e35e32d0614c094246a7bf2322726074da90 100644
--- a/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt
@@ -492,112 +492,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_primitive_type_param_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_primitive_type_param_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_primitive_type_param_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_primitive_type_param_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_primitive_type_param_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_primitive_type_param_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_primitive_type_param_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_primitive_type_param_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/identifierReference14-expected.txt b/ets2panda/test/compiler/ets/identifierReference14-expected.txt
index e0f435c79bc6ca9988ee5cd9eed8f7a60d6717fd..19e5bb2de54449b27e57267218a44f662a2ee42b 100644
--- a/ets2panda/test/compiler/ets/identifierReference14-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference14-expected.txt
@@ -1011,112 +1011,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "identifierReference14.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "identifierReference14.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "identifierReference14.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "identifierReference14.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "identifierReference14.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "identifierReference14.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "identifierReference14.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "identifierReference14.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/identifierReference4-expected.txt b/ets2panda/test/compiler/ets/identifierReference4-expected.txt
index 4b321f925a4192275a4616e481651836bd81653e..368da983b4f5e5218a191c8cc5f35611161f138e 100644
--- a/ets2panda/test/compiler/ets/identifierReference4-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference4-expected.txt
@@ -775,177 +775,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "identifierReference4.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "identifierReference4.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "identifierReference4.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "identifierReference4.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "identifierReference4.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 16,
-                            "program": "identifierReference4.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "identifierReference4.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 16,
-                          "program": "identifierReference4.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "identifierReference4.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 16,
-                      "program": "identifierReference4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "identifierReference4.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 16,
-                    "program": "identifierReference4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "identifierReference4.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 16,
-                  "program": "identifierReference4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "identifierReference4.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 16,
-                "program": "identifierReference4.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -996,7 +825,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 16,
+                "column": 15,
                 "program": "identifierReference4.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt
index 65183ede7ddd18a2f12bcf40a9b70c7d92132c2f..2a47fff5d5983e514f9fe83e1f2580c0b7deca40 100644
--- a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt
+++ b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "implicit-conversion.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "implicit-conversion.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "implicit-conversion.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "implicit-conversion.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "implicit-conversion.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "implicit-conversion.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "implicit-conversion.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "implicit-conversion.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt
index 9088eefd25cec349a632a39b86615b34018328da..7b80338d51201d8a5852941111ef31f8844753d0 100644
--- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt
+++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt
@@ -396,307 +396,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "myvar1",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 1,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 7,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "myvar3",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 10,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 16,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 1,
-                            "program": "package_module_1.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 16,
-                            "program": "package_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 1,
-                          "program": "package_module_1.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 17,
-                          "program": "package_module_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "myvar2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 11,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 42,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 22,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 24,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "package_module_1.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 24,
-                            "program": "package_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "package_module_1.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 24,
-                          "program": "package_module_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "myvar3",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 25,
-                              "program": "package_module_2.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 25,
-                              "program": "package_module_2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "myvar2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 25,
-                              "program": "package_module_2.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 25,
-                              "program": "package_module_2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 25,
-                            "program": "package_module_2.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 25,
-                            "program": "package_module_2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 25,
-                          "program": "package_module_2.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 25,
-                          "program": "package_module_2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 1,
-                      "program": "package_module_2.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 25,
-                      "program": "package_module_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 1,
-                    "program": "package_module_2.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 25,
-                    "program": "package_module_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 1,
-                  "program": "package_module_2.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 25,
-                  "program": "package_module_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 1,
-                "program": "package_module_2.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 25,
-                "program": "package_module_2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -866,7 +565,7 @@
               },
               "end": {
                 "line": 20,
-                "column": 24,
+                "column": 22,
                 "program": "package_module_1.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt
index 4a7b7b6d6fb680381ad068f48ad10b0fcaf4ef4f..099e87979d46f2abe93bd305c11aca79e7efce8b 100644
--- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt
+++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt
@@ -396,307 +396,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "myvar3",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 1,
-                              "program": "package_module_2.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 7,
-                              "program": "package_module_2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "myvar2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 10,
-                              "program": "package_module_2.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 16,
-                              "program": "package_module_2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 1,
-                            "program": "package_module_2.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 16,
-                            "program": "package_module_2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 1,
-                          "program": "package_module_2.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 17,
-                          "program": "package_module_2.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "myvar1",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 20,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 20,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "myvar3",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 20,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 20,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 20,
-                            "program": "package_module_1.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 20,
-                            "program": "package_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 20,
-                          "program": "package_module_1.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 20,
-                          "program": "package_module_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "myvar2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 17,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 17,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 42,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 17,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 17,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 17,
-                            "program": "package_module_1.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 17,
-                            "program": "package_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 17,
-                          "program": "package_module_1.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 17,
-                          "program": "package_module_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 20,
-                      "program": "package_module_2.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 17,
-                      "program": "package_module_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 20,
-                    "program": "package_module_2.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 17,
-                    "program": "package_module_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 20,
-                  "program": "package_module_2.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 17,
-                  "program": "package_module_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 20,
-                "program": "package_module_2.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 17,
-                "program": "package_module_2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt
index ce069d891f562ee1bd65e8aeff9e23bad55b2949..064637dd3e098d7d95ada6d6941a6c8c7ff9a027 100644
--- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt
+++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "myexported",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "separate_module_1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 22,
-                              "program": "separate_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 8,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 33,
-                              "program": "separate_module_1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 34,
-                              "program": "separate_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "separate_module_1.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 34,
-                            "program": "separate_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "separate_module_1.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 34,
-                          "program": "separate_module_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "separate_module_1.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 34,
-                      "program": "separate_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "separate_module_1.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 34,
-                    "program": "separate_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "separate_module_1.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 34,
-                  "program": "separate_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "separate_module_1.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 34,
-                "program": "separate_module_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -383,7 +212,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 34,
+                "column": 33,
                 "program": "separate_module_1.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt
index 52cf463634a4b66b108fbe31bdce33a476a37db4..a87000c784afa18ca714bae09dcfeff2135bfe0e 100644
--- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt
+++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt
@@ -441,112 +441,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt
index 367988ae9567862713dbb2060ff940b129f663bc..570a27ab9a7ab80114769709ccea6b64a033eb62 100644
--- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt
+++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt
@@ -441,112 +441,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt
index e4917aa0975756ea4c63bde62ee7c335dac16a47..6da7af5dfdbcc0d4bf3c6194c7c3af2c95a57279 100644
--- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt
+++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "myvar",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "separate_module_1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 17,
-                              "program": "separate_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 4,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 28,
-                              "program": "separate_module_1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 29,
-                              "program": "separate_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "separate_module_1.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 29,
-                            "program": "separate_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "separate_module_1.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 29,
-                          "program": "separate_module_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "separate_module_1.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 29,
-                      "program": "separate_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "separate_module_1.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 29,
-                    "program": "separate_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "separate_module_1.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 29,
-                  "program": "separate_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "separate_module_1.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 29,
-                "program": "separate_module_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -383,7 +212,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 29,
+                "column": 28,
                 "program": "separate_module_1.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt
index 3c874f399f65f06deadcf8d53e753c6bf1be0cb4..1f920fd09e5c2e7c88810b6caebd5adffa386f0b 100644
--- a/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt
@@ -1554,112 +1554,6 @@
                 "program": "asyncfun_lambda_lib.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "asyncfun_lambda_lib.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "asyncfun_lambda_lib.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "asyncfun_lambda_lib.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "asyncfun_lambda_lib.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "asyncfun_lambda_lib.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "asyncfun_lambda_lib.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "asyncfun_lambda_lib.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "asyncfun_lambda_lib.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/import_tests/asyncfunc_lambda_main-expected.txt b/ets2panda/test/compiler/ets/import_tests/asyncfunc_lambda_main-expected.txt
index 0a3c93a371442f8bc093c36154acec3833dbbe58..fb00ef8f7cbad5d2c75b9efa1baf1c6262372070 100644
--- a/ets2panda/test/compiler/ets/import_tests/asyncfunc_lambda_main-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/asyncfunc_lambda_main-expected.txt
@@ -352,112 +352,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "asyncfunc_lambda_main.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "asyncfunc_lambda_main.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "asyncfunc_lambda_main.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "asyncfunc_lambda_main.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "asyncfunc_lambda_main.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "asyncfunc_lambda_main.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "asyncfunc_lambda_main.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "asyncfunc_lambda_main.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt b/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt
index b637e562e8c0001d098f5937ddf36c5749c31037..7970c243bdb053cd4ebf43b266172bce202cfa9d 100644
--- a/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt
@@ -12802,112 +12802,6 @@
                 "program": "enum_export.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "enum_export.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "enum_export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "enum_export.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "enum_export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "enum_export.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "enum_export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "enum_export.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "enum_export.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/import_tests/enum_import-expected.txt b/ets2panda/test/compiler/ets/import_tests/enum_import-expected.txt
index 6c36670b03e8169dba16afd14b3383dbe371cada..15d9210d7b559b0d721d45a48a5986e94d32083b 100644
--- a/ets2panda/test/compiler/ets/import_tests/enum_import-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/enum_import-expected.txt
@@ -204,112 +204,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "enum_import.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "enum_import.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "enum_import.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "enum_import.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "enum_import.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "enum_import.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "enum_import.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "enum_import.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/export_class_with_getters_setters-expected.txt b/ets2panda/test/compiler/ets/import_tests/export_class_with_getters_setters-expected.txt
index 7781a0d09bbd4d6fdd1856ac6b33cf89b0ef9553..335b4de882f82279447f6d80347c1e5751ae017d 100644
--- a/ets2panda/test/compiler/ets/import_tests/export_class_with_getters_setters-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/export_class_with_getters_setters-expected.txt
@@ -1010,112 +1010,6 @@
                 "program": "export_class_with_getters_setters.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_class_with_getters_setters.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_class_with_getters_setters.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_class_with_getters_setters.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_class_with_getters_setters.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_class_with_getters_setters.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_class_with_getters_setters.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "export_class_with_getters_setters.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "export_class_with_getters_setters.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt
index ee33dba847c4f6c7a9267db52dc24390b8eadf1c..e59d4e2b416893a2ff2a5aae42d49be642b7569f 100644
--- a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_func_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_func_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_func_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_func_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_func_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_func_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_func_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_func_type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt
index 6b6704bf2372c51b505dd82a96db1301f64e7915..d5a597c78ba27e82c386cf63a3d27489c8cd4806 100644
--- a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt
@@ -386,112 +386,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_func_type_lib.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_typealias_func_type_lib.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_func_type_lib.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_typealias_func_type_lib.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_func_type_lib.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_typealias_func_type_lib.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_func_type_lib.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_typealias_func_type_lib.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/import_class_with_getters_setters-expected.txt b/ets2panda/test/compiler/ets/import_tests/import_class_with_getters_setters-expected.txt
index 831bf3e6e7b47623f78ba6b3652849c848eb5505..5d5ba5c7d5060ae3fbe68569341a9aa5b946608b 100644
--- a/ets2panda/test/compiler/ets/import_tests/import_class_with_getters_setters-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/import_class_with_getters_setters-expected.txt
@@ -155,112 +155,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_class_with_getters_setters.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_class_with_getters_setters.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_class_with_getters_setters.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_class_with_getters_setters.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_class_with_getters_setters.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_class_with_getters_setters.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_class_with_getters_setters.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_class_with_getters_setters.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type-expected.txt b/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type-expected.txt
index fafbcca9302162fb4d8cad70fbdb7e7d7f535eb1..7738b70a3951deaac8e1351b569bbea2b6ea29bc 100644
--- a/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "infer_imported_function_return_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "infer_imported_function_return_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "infer_imported_function_return_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "infer_imported_function_return_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "infer_imported_function_return_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "infer_imported_function_return_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "infer_imported_function_return_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "infer_imported_function_return_type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type_lib-expected.txt
index b12761b7bd097eb2b5fadc463428a929f8230cc0..4bbf5ee9ffda7a5e31dffaf9f0b7a675016a283e 100644
--- a/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type_lib-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type_lib-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "infer_imported_function_return_type_lib.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "infer_imported_function_return_type_lib.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "infer_imported_function_return_type_lib.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "infer_imported_function_return_type_lib.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "infer_imported_function_return_type_lib.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "infer_imported_function_return_type_lib.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "infer_imported_function_return_type_lib.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "infer_imported_function_return_type_lib.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/export-expected.txt b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/export-expected.txt
index d7e4adcd2f8c375dc568a745915f8a63b118c27b..0a665acb0f81dac39407b1f806d0f8aca872d5b4 100644
--- a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/export-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/export-expected.txt
@@ -507,177 +507,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "test_var",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "export.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 20,
-                              "program": "export.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "Hello_world",
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 31,
-                              "program": "export.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 44,
-                              "program": "export.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "export.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 44,
-                            "program": "export.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "export.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 44,
-                          "program": "export.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "export.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 44,
-                      "program": "export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "export.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 44,
-                    "program": "export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "export.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 44,
-                  "program": "export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "export.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 44,
-                "program": "export.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -760,7 +589,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 44,
+                "column": 31,
                 "program": "export.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/import_aliased_re-export-expected.txt b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/import_aliased_re-export-expected.txt
index 06e3ee1472d9ac1dd9b4042e87a29c46d5b23472..bd9ce68dc1284c3566607f054a7f88e423f4fb6e 100644
--- a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/import_aliased_re-export-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/import_aliased_re-export-expected.txt
@@ -237,112 +237,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_aliased_re-export.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_aliased_re-export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_aliased_re-export.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_aliased_re-export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_aliased_re-export.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_aliased_re-export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_aliased_re-export.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_aliased_re-export.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/re-export_with_alias-expected.txt b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/re-export_with_alias-expected.txt
index 5e5ce9fc22d49b54c76168e16664d4f18c94f806..5fecf1f283226c736ce6ce72ca7c237bbab5a79e 100644
--- a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/re-export_with_alias-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/re-export_with_alias-expected.txt
@@ -372,112 +372,6 @@
                 "program": "re-export_with_alias.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re-export_with_alias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re-export_with_alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re-export_with_alias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re-export_with_alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re-export_with_alias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re-export_with_alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re-export_with_alias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re-export_with_alias.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_interface-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_interface-expected.txt
index dd90a1ec71509d7739ffe550e7fa2a95b99cf8a7..34e83519e6f32f045bcb7f87ad6614ad161aef6e 100644
--- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_interface-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_interface-expected.txt
@@ -696,112 +696,6 @@
                 "program": "import_interface.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_interface.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_interface.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_interface.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_interface.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_interface.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_interface.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_interface.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_interface.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_selective_exported-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_selective_exported-expected.txt
index ce1c79c1a8e67ab606d70be658e6ba35fe0f62e8..0b388f0b2d9649a158f7d96de4f3aa229e1079a1 100644
--- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_selective_exported-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_selective_exported-expected.txt
@@ -171,112 +171,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_selective_exported.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_selective_exported.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_selective_exported.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_selective_exported.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_selective_exported.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_selective_exported.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_selective_exported.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_selective_exported.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export-expected.txt
index 08cdb11de239bedf2ce781598539ddb8a9f45687..9a09f661e7a2e1f505847ff9fb414a62128db23d 100644
--- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export-expected.txt
@@ -918,241 +918,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "msg",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "selective_export.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 8,
-                              "program": "selective_export.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "hello",
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 11,
-                              "program": "selective_export.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 18,
-                              "program": "selective_export.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "selective_export.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 18,
-                            "program": "selective_export.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "selective_export.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 18,
-                          "program": "selective_export.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "aliasedMsg",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "selective_export.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 15,
-                              "program": "selective_export.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "goodbye",
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 18,
-                              "program": "selective_export.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 27,
-                              "program": "selective_export.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "selective_export.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 27,
-                            "program": "selective_export.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "selective_export.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 27,
-                          "program": "selective_export.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 5,
-                      "program": "selective_export.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 27,
-                      "program": "selective_export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 5,
-                    "program": "selective_export.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 27,
-                    "program": "selective_export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 5,
-                  "program": "selective_export.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 27,
-                  "program": "selective_export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 5,
-                "program": "selective_export.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 27,
-                "program": "selective_export.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_function-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_function-expected.txt
index 3d742e0bd529d36c81c3616a0543cf5268945ff4..da109613169617cbf7f078efa7c7a1c2b2d524cb 100644
--- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_function-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_function-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_function.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_function.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_function.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_function.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_function.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_function.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_function.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_function.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_interface-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_interface-expected.txt
index 986b4a3f83abe6dc6e103f10d3463966ad63ff8f..d879300a074f6e3ac0c2420f7bf62435ff564b8c 100644
--- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_interface-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_interface-expected.txt
@@ -227,112 +227,6 @@
                 "program": "selective_export_interface.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_interface.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_interface.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_interface.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_interface.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_interface.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_interface.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_interface.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_interface.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_with_alias-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_with_alias-expected.txt
index f00f4668bcc22eb1d465a31beb79259774367182..e97fbf30575236080552e45c3b4812f1c1576a28 100644
--- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_with_alias-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_with_alias-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "msg",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "selective_export_with_alias.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 8,
-                              "program": "selective_export_with_alias.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "hello",
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 11,
-                              "program": "selective_export_with_alias.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 18,
-                              "program": "selective_export_with_alias.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "selective_export_with_alias.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 18,
-                            "program": "selective_export_with_alias.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "selective_export_with_alias.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 18,
-                          "program": "selective_export_with_alias.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "selective_export_with_alias.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 18,
-                      "program": "selective_export_with_alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "selective_export_with_alias.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 18,
-                    "program": "selective_export_with_alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "selective_export_with_alias.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 18,
-                  "program": "selective_export_with_alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "selective_export_with_alias.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 18,
-                "program": "selective_export_with_alias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_1-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_1-expected.txt
index d2e7b53338026f289d1c9e05d454808b1ec4bf7f..ee54661f04c9e674e2765cb959b625b999da8d17 100644
--- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_1-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_1-expected.txt
@@ -429,112 +429,6 @@
                 "program": "selective_import_with_alias_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_import_with_alias_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_import_with_alias_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_import_with_alias_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_import_with_alias_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_import_with_alias_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_import_with_alias_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_import_with_alias_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_import_with_alias_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_2-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_2-expected.txt
index be43e25602f47ad945db28ae1ff6f8165c27bcd3..87fdf07a537bbfc4e686d1947876f58f5e86f334 100644
--- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_2-expected.txt
+++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_2-expected.txt
@@ -429,112 +429,6 @@
                 "program": "selective_import_with_alias_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_import_with_alias_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_import_with_alias_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_import_with_alias_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_import_with_alias_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_import_with_alias_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_import_with_alias_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_import_with_alias_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_import_with_alias_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/import_type-expected.txt b/ets2panda/test/compiler/ets/import_type-expected.txt
index a7d06b7c06d5abc362c814de63f8450520d29c15..52580d9cd787d6a13d6c6314326f8f31a47a5f34 100644
--- a/ets2panda/test/compiler/ets/import_type-expected.txt
+++ b/ets2panda/test/compiler/ets/import_type-expected.txt
@@ -528,446 +528,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "import_type.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "import_type.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "A",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 13,
-                                    "program": "import_type.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 14,
-                                    "program": "import_type.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 13,
-                                  "program": "import_type.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 15,
-                                  "program": "import_type.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 13,
-                                "program": "import_type.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 15,
-                                "program": "import_type.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "import_type.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 17,
-                              "program": "import_type.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "import_type.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 17,
-                            "program": "import_type.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "import_type.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 17,
-                          "program": "import_type.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "import_type.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "import_type.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "C",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 13,
-                                    "program": "import_type.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 14,
-                                    "program": "import_type.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "import_type.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 15,
-                                  "program": "import_type.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 13,
-                                "program": "import_type.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 15,
-                                "program": "import_type.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "import_type.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 4,
-                              "program": "import_type.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "import_type.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 4,
-                            "program": "import_type.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "import_type.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 4,
-                          "program": "import_type.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "import_type.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "import_type.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "D",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 13,
-                                    "program": "import_type.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 14,
-                                    "program": "import_type.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 13,
-                                  "program": "import_type.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 15,
-                                  "program": "import_type.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 13,
-                                "program": "import_type.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 15,
-                                "program": "import_type.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 9,
-                              "program": "import_type.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 1,
-                              "program": "import_type.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "import_type.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 1,
-                            "program": "import_type.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "import_type.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 1,
-                          "program": "import_type.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "import_type.ets"
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 1,
-                      "program": "import_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "import_type.ets"
-                  },
-                  "end": {
-                    "line": 22,
-                    "column": 1,
-                    "program": "import_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "import_type.ets"
-                },
-                "end": {
-                  "line": 22,
-                  "column": 1,
-                  "program": "import_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "import_type.ets"
-              },
-              "end": {
-                "line": 22,
-                "column": 1,
-                "program": "import_type.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt b/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt
index bd593cc9727b5938844e545ba9f392b89c48323d..6a404eede855587189fff8ec589557c5caab7463 100644
--- a/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt
+++ b/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt
@@ -130,1016 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 9,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 10,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 10,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 10,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 11,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 11,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 11,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "StringLiteral",
-                              "value": "a",
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 10,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 13,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 14,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 14,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 14,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 10,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 11,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 2,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 14,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 16,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 17,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 18,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 18,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 18,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "e",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 10,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 11,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 2.8,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 16,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 18,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 19,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "Identifier",
-                              "name": "a",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 21,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 22,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "ETSNewClassInstanceExpression",
-                              "typeReference": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "Int",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 28,
-                                        "program": "inferTypeOfArray.ets"
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 31,
-                                        "program": "inferTypeOfArray.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 28,
-                                      "program": "inferTypeOfArray.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 32,
-                                      "program": "inferTypeOfArray.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 28,
-                                    "program": "inferTypeOfArray.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 32,
-                                    "program": "inferTypeOfArray.ets"
-                                  }
-                                }
-                              },
-                              "arguments": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 24,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 34,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 34,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 34,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 34,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 9,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 11,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 11,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 11,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "g",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 6,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "+",
-                          "left": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "d",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 9,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 10,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "NumberLiteral",
-                              "value": 2,
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 11,
-                                  "program": "inferTypeOfArray.ets"
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 12,
-                                  "program": "inferTypeOfArray.ets"
-                                }
-                              }
-                            },
-                            "computed": true,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 9,
-                                "program": "inferTypeOfArray.ets"
-                              },
-                              "end": {
-                                "line": 22,
-                                "column": 13,
-                                "program": "inferTypeOfArray.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "NumberLiteral",
-                            "value": 1.2,
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 16,
-                                "program": "inferTypeOfArray.ets"
-                              },
-                              "end": {
-                                "line": 22,
-                                "column": 19,
-                                "program": "inferTypeOfArray.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 9,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 19,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 19,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 19,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "f",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 23,
-                                "column": 1,
-                                "program": "inferTypeOfArray.ets"
-                              },
-                              "end": {
-                                "line": 23,
-                                "column": 2,
-                                "program": "inferTypeOfArray.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "NumberLiteral",
-                            "value": 0,
-                            "loc": {
-                              "start": {
-                                "line": 23,
-                                "column": 3,
-                                "program": "inferTypeOfArray.ets"
-                              },
-                              "end": {
-                                "line": 23,
-                                "column": 4,
-                                "program": "inferTypeOfArray.ets"
-                              }
-                            }
-                          },
-                          "computed": true,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 23,
-                              "column": 1,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 23,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "1",
-                          "loc": {
-                            "start": {
-                              "line": 23,
-                              "column": 8,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 23,
-                              "column": 11,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 23,
-                            "column": 1,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 23,
-                            "column": 11,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 1,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 11,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "f",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 24,
-                                "column": 1,
-                                "program": "inferTypeOfArray.ets"
-                              },
-                              "end": {
-                                "line": 24,
-                                "column": 2,
-                                "program": "inferTypeOfArray.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "NumberLiteral",
-                            "value": 1,
-                            "loc": {
-                              "start": {
-                                "line": 24,
-                                "column": 3,
-                                "program": "inferTypeOfArray.ets"
-                              },
-                              "end": {
-                                "line": 24,
-                                "column": 4,
-                                "program": "inferTypeOfArray.ets"
-                              }
-                            }
-                          },
-                          "computed": true,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 24,
-                              "column": 1,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 24,
-                              "column": 5,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 24,
-                              "column": 8,
-                              "program": "inferTypeOfArray.ets"
-                            },
-                            "end": {
-                              "line": 24,
-                              "column": 9,
-                              "program": "inferTypeOfArray.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 24,
-                            "column": 1,
-                            "program": "inferTypeOfArray.ets"
-                          },
-                          "end": {
-                            "line": 24,
-                            "column": 9,
-                            "program": "inferTypeOfArray.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 1,
-                          "program": "inferTypeOfArray.ets"
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 9,
-                          "program": "inferTypeOfArray.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "inferTypeOfArray.ets"
-                    },
-                    "end": {
-                      "line": 24,
-                      "column": 9,
-                      "program": "inferTypeOfArray.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "inferTypeOfArray.ets"
-                  },
-                  "end": {
-                    "line": 24,
-                    "column": 9,
-                    "program": "inferTypeOfArray.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "inferTypeOfArray.ets"
-                },
-                "end": {
-                  "line": 24,
-                  "column": 9,
-                  "program": "inferTypeOfArray.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "inferTypeOfArray.ets"
-              },
-              "end": {
-                "line": 24,
-                "column": 9,
-                "program": "inferTypeOfArray.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt b/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt
index a93110f754debfe08fdc81ababcd8498c28cd89e..2acddf10f371f6f622482fce0cf26841d1370705 100644
--- a/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt
+++ b/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "instanceof_object_long.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "instanceof_object_long.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "instanceof_object_long.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "instanceof_object_long.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "instanceof_object_long.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "instanceof_object_long.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "instanceof_object_long.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "instanceof_object_long.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt b/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt
index 07eb0caf22736a56bc0fbc51ac99b740d6ae8e1e..672c65f9a0ca20c905525eb04a6014a19d369c05 100644
--- a/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt
+++ b/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt
@@ -430,112 +430,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interface_noreturn_type_function.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interface_noreturn_type_function.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interface_noreturn_type_function.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interface_noreturn_type_function.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interface_noreturn_type_function.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interface_noreturn_type_function.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "interface_noreturn_type_function.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "interface_noreturn_type_function.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt b/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt
index c182fe13322f03774c8a61227e71be56c5d49507..91d5ba9b92afc551e856511865ee969b2cd1fb0d 100644
--- a/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "invalidCallInstruction.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "invalidCallInstruction.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "invalidCallInstruction.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "invalidCallInstruction.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "invalidCallInstruction.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "invalidCallInstruction.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "invalidCallInstruction.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "invalidCallInstruction.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt
index 3e6c99e7bee3bbf28cf1d1c662c8b4fcde7cd010..f8846ffd196b6fdaf2017c9941065e32f12d3728 100644
--- a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt
@@ -885,112 +885,6 @@
                 "program": "invalidInheritance3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "invalidInheritance3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "invalidInheritance3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "invalidInheritance3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "invalidInheritance3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "invalidInheritance3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "invalidInheritance3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "invalidInheritance3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "invalidInheritance3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt
index 327c2296c5e534ba460bf42e7ee0401c01e5f9b6..f6d8f0571d44070aad3764ac9fd891a39f8dc81c 100644
--- a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt
+++ b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt
@@ -793,373 +793,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "lambdaFunction1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "lambdaFunction1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 14,
-                              "program": "lambdaFunction1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "lambdaFunction1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "lambdaFunction1.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 15,
-                            "program": "lambdaFunction1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "lambdaFunction1.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 15,
-                          "program": "lambdaFunction1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "lambda1",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "lambdaFunction1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "lambdaFunction1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrowFunctionExpression",
-                          "function": {
-                            "type": "ScriptFunction",
-                            "id": null,
-                            "generator": false,
-                            "async": false,
-                            "expression": false,
-                            "params": [],
-                            "returnType": {
-                              "type": "ETSPrimitiveType",
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 30,
-                                  "program": "lambdaFunction1.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 33,
-                                  "program": "lambdaFunction1.ets"
-                                }
-                              }
-                            },
-                            "body": {
-                              "type": "BlockStatement",
-                              "statements": [
-                                {
-                                  "type": "ExpressionStatement",
-                                  "expression": {
-                                    "type": "UpdateExpression",
-                                    "operator": "++",
-                                    "prefix": false,
-                                    "argument": {
-                                      "type": "Identifier",
-                                      "name": "a",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 19,
-                                          "column": 5,
-                                          "program": "lambdaFunction1.ets"
-                                        },
-                                        "end": {
-                                          "line": 19,
-                                          "column": 6,
-                                          "program": "lambdaFunction1.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 19,
-                                        "column": 5,
-                                        "program": "lambdaFunction1.ets"
-                                      },
-                                      "end": {
-                                        "line": 19,
-                                        "column": 8,
-                                        "program": "lambdaFunction1.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 5,
-                                      "program": "lambdaFunction1.ets"
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 9,
-                                      "program": "lambdaFunction1.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "ReturnStatement",
-                                  "argument": {
-                                    "type": "Identifier",
-                                    "name": "a",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 12,
-                                        "program": "lambdaFunction1.ets"
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 13,
-                                        "program": "lambdaFunction1.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 5,
-                                      "program": "lambdaFunction1.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 14,
-                                      "program": "lambdaFunction1.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 37,
-                                  "program": "lambdaFunction1.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 2,
-                                  "program": "lambdaFunction1.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 26,
-                                "program": "lambdaFunction1.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 2,
-                                "program": "lambdaFunction1.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 26,
-                              "program": "lambdaFunction1.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 2,
-                              "program": "lambdaFunction1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "lambdaFunction1.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 2,
-                            "program": "lambdaFunction1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "lambdaFunction1.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 2,
-                          "program": "lambdaFunction1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "lambdaFunction1.ets"
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 2,
-                      "program": "lambdaFunction1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "lambdaFunction1.ets"
-                  },
-                  "end": {
-                    "line": 21,
-                    "column": 2,
-                    "program": "lambdaFunction1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "lambdaFunction1.ets"
-                },
-                "end": {
-                  "line": 21,
-                  "column": 2,
-                  "program": "lambdaFunction1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "lambdaFunction1.ets"
-              },
-              "end": {
-                "line": 21,
-                "column": 2,
-                "program": "lambdaFunction1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -1210,7 +843,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 15,
+                "column": 14,
                 "program": "lambdaFunction1.ets"
               }
             }
@@ -1280,8 +913,8 @@
                 "program": "lambdaFunction1.ets"
               },
               "end": {
-                "line": 21,
-                "column": 2,
+                "line": 18,
+                "column": 26,
                 "program": "lambdaFunction1.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt b/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt
index d8d092b9db6287863a232a4051946bf7bf882bbb..c7b7a27931d24cb25c6a79382f937aeaf3a1de09 100644
--- a/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt
+++ b/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaFunctionArrayDeclaration.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaFunctionArrayDeclaration.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaFunctionArrayDeclaration.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaFunctionArrayDeclaration.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaFunctionArrayDeclaration.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaFunctionArrayDeclaration.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaFunctionArrayDeclaration.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaFunctionArrayDeclaration.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lambda_capturing-expected.txt b/ets2panda/test/compiler/ets/lambda_capturing-expected.txt
index 47376b0f3a3b3fffe9ff5e322957f29a3a610bfb..ac01523fc3e3700e282e8a45c5c3be005508e954 100644
--- a/ets2panda/test/compiler/ets/lambda_capturing-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_capturing-expected.txt
@@ -241,112 +241,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_capturing.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_capturing.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_capturing.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_capturing.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_capturing.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_capturing.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_capturing.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_capturing.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_narrowing-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_narrowing-expected.txt
index 7ee5a14864c4ca74b7827e57441b7f850457bc7c..01a94de2e35cc6f4b8921e02e76219769c1968eb 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_narrowing-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_narrowing-expected.txt
@@ -661,8 +661,8 @@
                                 "program": "lambda_cast_infer_type_narrowing.ets"
                               },
                               "end": {
-                                "line": 22,
-                                "column": 46,
+                                "line": 23,
+                                "column": 12,
                                 "program": "lambda_cast_infer_type_narrowing.ets"
                               }
                             }
@@ -674,8 +674,8 @@
                               "program": "lambda_cast_infer_type_narrowing.ets"
                             },
                             "end": {
-                              "line": 22,
-                              "column": 46,
+                              "line": 23,
+                              "column": 12,
                               "program": "lambda_cast_infer_type_narrowing.ets"
                             }
                           }
@@ -689,8 +689,8 @@
                           "program": "lambda_cast_infer_type_narrowing.ets"
                         },
                         "end": {
-                          "line": 22,
-                          "column": 46,
+                          "line": 23,
+                          "column": 12,
                           "program": "lambda_cast_infer_type_narrowing.ets"
                         }
                       }
@@ -1220,112 +1220,6 @@
                 "program": "lambda_cast_infer_type_narrowing.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_cast_infer_type_narrowing.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_cast_infer_type_narrowing.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_cast_infer_type_narrowing.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_cast_infer_type_narrowing.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_cast_infer_type_narrowing.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_cast_infer_type_narrowing.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_cast_infer_type_narrowing.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_cast_infer_type_narrowing.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_void-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_void-expected.txt
index a8931f6bfd896efdf649cd98f75886d081e72dfe..5bb79ee4b502cd2a928a4a61fb7dbcca0e3155af 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_void-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_void-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_cast_infer_type_void.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_cast_infer_type_void.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_cast_infer_type_void.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_cast_infer_type_void.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_cast_infer_type_void.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_cast_infer_type_void.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_cast_infer_type_void.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_cast_infer_type_void.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -296,7 +190,7 @@
                               },
                               "end": {
                                 "line": 17,
-                                "column": 21,
+                                "column": 34,
                                 "program": "lambda_cast_infer_type_void.ets"
                               }
                             }
@@ -309,7 +203,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 21,
+                              "column": 34,
                               "program": "lambda_cast_infer_type_void.ets"
                             }
                           }
@@ -324,7 +218,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 21,
+                          "column": 34,
                           "program": "lambda_cast_infer_type_void.ets"
                         }
                       }
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_widening-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_widening-expected.txt
index 39f4aa30bb6d8e33bca8108165494f633aeba79b..88fcc25c2c793ff522f86c48f437b4f0984ca18e 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_widening-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_widening-expected.txt
@@ -661,8 +661,8 @@
                                 "program": "lambda_cast_infer_type_widening.ets"
                               },
                               "end": {
-                                "line": 22,
-                                "column": 44,
+                                "line": 23,
+                                "column": 12,
                                 "program": "lambda_cast_infer_type_widening.ets"
                               }
                             }
@@ -674,8 +674,8 @@
                               "program": "lambda_cast_infer_type_widening.ets"
                             },
                             "end": {
-                              "line": 22,
-                              "column": 44,
+                              "line": 23,
+                              "column": 12,
                               "program": "lambda_cast_infer_type_widening.ets"
                             }
                           }
@@ -689,8 +689,8 @@
                           "program": "lambda_cast_infer_type_widening.ets"
                         },
                         "end": {
-                          "line": 22,
-                          "column": 44,
+                          "line": 23,
+                          "column": 12,
                           "program": "lambda_cast_infer_type_widening.ets"
                         }
                       }
@@ -1220,112 +1220,6 @@
                 "program": "lambda_cast_infer_type_widening.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_cast_infer_type_widening.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_cast_infer_type_widening.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_cast_infer_type_widening.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_cast_infer_type_widening.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_cast_infer_type_widening.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_cast_infer_type_widening.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_cast_infer_type_widening.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_cast_infer_type_widening.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_type_has_pramas-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_type_has_pramas-expected.txt
index 2785b4bdfcb3a0da81d47dbdce58f790c3e7aefe..e47cb51d899c2f3a0f55bea4334d313dbeb19f1a 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_type_has_pramas-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_type_has_pramas-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_cast_type_has_pramas.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_cast_type_has_pramas.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_cast_type_has_pramas.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_cast_type_has_pramas.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_cast_type_has_pramas.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_cast_type_has_pramas.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_cast_type_has_pramas.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_cast_type_has_pramas.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -519,8 +413,8 @@
                                 "program": "lambda_cast_type_has_pramas.ets"
                               },
                               "end": {
-                                "line": 17,
-                                "column": 38,
+                                "line": 18,
+                                "column": 8,
                                 "program": "lambda_cast_type_has_pramas.ets"
                               }
                             }
@@ -532,8 +426,8 @@
                               "program": "lambda_cast_type_has_pramas.ets"
                             },
                             "end": {
-                              "line": 17,
-                              "column": 38,
+                              "line": 18,
+                              "column": 8,
                               "program": "lambda_cast_type_has_pramas.ets"
                             }
                           }
@@ -547,8 +441,8 @@
                           "program": "lambda_cast_type_has_pramas.ets"
                         },
                         "end": {
-                          "line": 17,
-                          "column": 38,
+                          "line": 18,
+                          "column": 8,
                           "program": "lambda_cast_type_has_pramas.ets"
                         }
                       }
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt
index fc933990d6cc23abf9e780f51ce8fda3a6a0d40e..22383d5f18d5a7ce97e3a1185014407ea10c4ac6 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression-expected.txt
index dbed1e33e54c60e90672a2f21cd59ce34c3cd7f1..0427c1df9773de253e4b41f7623afd0ccbd6d78c 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression-expected.txt
@@ -701,112 +701,6 @@
                 "program": "lambda_infer_type_arrow_expression.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_arrow_expression.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_arrow_expression.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_arrow_expression.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_arrow_expression.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_arrow_expression.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_arrow_expression.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_arrow_expression.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_arrow_expression.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression_literal-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression_literal-expected.txt
index 3e4ac0374893e68f2c1516ffdcb1fb7c30ccf3fd..d02624e3e3c35531b2b40ead3afdc1fb39107bd1 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression_literal-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression_literal-expected.txt
@@ -654,112 +654,6 @@
                 "program": "lambda_infer_type_arrow_expression_literal.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_arrow_expression_literal.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_arrow_expression_literal.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_arrow_expression_literal.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_arrow_expression_literal.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_arrow_expression_literal.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_arrow_expression_literal.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_arrow_expression_literal.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_arrow_expression_literal.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_has_return-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_has_return-expected.txt
index 84661a995155d4c52d49b6c30fc49351af319275..71fb0fdae0c0cabcc5f48d345899d58a19f96d67 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_has_return-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_has_return-expected.txt
@@ -815,112 +815,6 @@
                 "program": "lambda_infer_type_has_return.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_has_return.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_has_return.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_has_return.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_has_return.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_has_return.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_has_return.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_has_return.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_has_return.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_param2-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_param2-expected.txt
index ab66a2e99d0d6a43eecbcc747bdf16fa08707705..417e44087bc77181ba4b082e356c32967c649949 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_param2-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_param2-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_param2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_param2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_param2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_param2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_param2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_param2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_param2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_param2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -371,7 +265,7 @@
                                         },
                                         "end": {
                                           "line": 17,
-                                          "column": 50,
+                                          "column": 59,
                                           "program": "lambda_infer_type_param2.ets"
                                         }
                                       }
@@ -411,7 +305,7 @@
                                 },
                                 "end": {
                                   "line": 17,
-                                  "column": 50,
+                                  "column": 59,
                                   "program": "lambda_infer_type_param2.ets"
                                 }
                               }
@@ -424,7 +318,7 @@
                               },
                               "end": {
                                 "line": 17,
-                                "column": 50,
+                                "column": 59,
                                 "program": "lambda_infer_type_param2.ets"
                               }
                             }
@@ -437,7 +331,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 50,
+                              "column": 59,
                               "program": "lambda_infer_type_param2.ets"
                             }
                           }
@@ -452,7 +346,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 50,
+                          "column": 59,
                           "program": "lambda_infer_type_param2.ets"
                         }
                       }
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt
index 962b451faba6d0c8a54559be31df771fce546c9d..6b644a248cdeb38894c2fb9043ee7b4726487331 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_array.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_array.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_array.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_array.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_array.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_array.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_array.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_array.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda-expected.txt
index 1b6f4822a16ab8c4fabd0743d8d2db62744cd8ca..8f23d75b1424cd2bbbb296629ef40d22b40d1a42 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_lambda.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_lambda.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_lambda.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_lambda.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_lambda.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_lambda.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_lambda.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_lambda.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt
index 221fc3e1d36ad899e7371c75d7302f9d8cbaadbd..f5942454a4bc9002ea07dd388d9b2a5f3e4c2705 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_lambda1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_lambda1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_lambda1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_lambda1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_lambda1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_lambda1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_lambda1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_lambda1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt
index 6aab64e5724760ba08b092509c046fb0b418193e..3dc212d27d94642da2515b590a89b73a249fe591 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt
@@ -130,195 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "expected",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 23,
-                              "column": 5,
-                              "program": "lambda_infer_type_return_lambda_expression.ets"
-                            },
-                            "end": {
-                              "line": 23,
-                              "column": 13,
-                              "program": "lambda_infer_type_return_lambda_expression.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "main1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 23,
-                                "column": 35,
-                                "program": "lambda_infer_type_return_lambda_expression.ets"
-                              },
-                              "end": {
-                                "line": 23,
-                                "column": 40,
-                                "program": "lambda_infer_type_return_lambda_expression.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 23,
-                              "column": 35,
-                              "program": "lambda_infer_type_return_lambda_expression.ets"
-                            },
-                            "end": {
-                              "line": 23,
-                              "column": 43,
-                              "program": "lambda_infer_type_return_lambda_expression.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 23,
-                            "column": 5,
-                            "program": "lambda_infer_type_return_lambda_expression.ets"
-                          },
-                          "end": {
-                            "line": 23,
-                            "column": 43,
-                            "program": "lambda_infer_type_return_lambda_expression.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 5,
-                          "program": "lambda_infer_type_return_lambda_expression.ets"
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 43,
-                          "program": "lambda_infer_type_return_lambda_expression.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 23,
-                      "column": 5,
-                      "program": "lambda_infer_type_return_lambda_expression.ets"
-                    },
-                    "end": {
-                      "line": 23,
-                      "column": 43,
-                      "program": "lambda_infer_type_return_lambda_expression.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 23,
-                    "column": 5,
-                    "program": "lambda_infer_type_return_lambda_expression.ets"
-                  },
-                  "end": {
-                    "line": 23,
-                    "column": 43,
-                    "program": "lambda_infer_type_return_lambda_expression.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 23,
-                  "column": 5,
-                  "program": "lambda_infer_type_return_lambda_expression.ets"
-                },
-                "end": {
-                  "line": 23,
-                  "column": 43,
-                  "program": "lambda_infer_type_return_lambda_expression.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 23,
-                "column": 5,
-                "program": "lambda_infer_type_return_lambda_expression.ets"
-              },
-              "end": {
-                "line": 23,
-                "column": 43,
-                "program": "lambda_infer_type_return_lambda_expression.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -641,7 +452,7 @@
               },
               "end": {
                 "line": 23,
-                "column": 43,
+                "column": 35,
                 "program": "lambda_infer_type_return_lambda_expression.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_literal-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_literal-expected.txt
index e52b2b93df82be19d0394a0c906fd04876dcc585..aafd0f45a0861614b03661ce53bbc9be445aea0d 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_literal-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_literal-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_literal.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_literal.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_literal.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_literal.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_literal.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_literal.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_literal.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_literal.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_union-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_union-expected.txt
index 15901d7ccce2625c9c7677fab434e34fd5c5aba9..c1488a59ad164a3f4107dac033cb411725d0b1ca 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_union-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_union-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_union.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_infer_type_return_union.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_union.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_infer_type_return_union.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_union.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_infer_type_return_union.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_union.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_infer_type_return_union.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_scope-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_scope-expected.txt
index 634c55dadecd78497e87c3b0dea4b837bd9a2d05..f26025f7fa12000d2222158a8552674c7a71c1c7 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_scope-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_scope-expected.txt
@@ -24,390 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "lambda_infer_type_scope.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "lambda_infer_type_scope.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 9,
-                              "program": "lambda_infer_type_scope.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 10,
-                              "program": "lambda_infer_type_scope.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "lambda_infer_type_scope.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 10,
-                            "program": "lambda_infer_type_scope.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "lambda_infer_type_scope.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 10,
-                          "program": "lambda_infer_type_scope.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "lambda_infer_type_scope.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "lambda_infer_type_scope.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrowFunctionExpression",
-                          "function": {
-                            "type": "ScriptFunction",
-                            "id": null,
-                            "generator": false,
-                            "async": false,
-                            "expression": true,
-                            "params": [
-                              {
-                                "type": "ETSParameterExpression",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "p",
-                                  "typeAnnotation": {
-                                    "type": "ETSPrimitiveType",
-                                    "loc": {
-                                      "start": {
-                                        "line": 17,
-                                        "column": 13,
-                                        "program": "lambda_infer_type_scope.ets"
-                                      },
-                                      "end": {
-                                        "line": 17,
-                                        "column": 19,
-                                        "program": "lambda_infer_type_scope.ets"
-                                      }
-                                    }
-                                  },
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 17,
-                                      "column": 10,
-                                      "program": "lambda_infer_type_scope.ets"
-                                    },
-                                    "end": {
-                                      "line": 17,
-                                      "column": 19,
-                                      "program": "lambda_infer_type_scope.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 17,
-                                    "column": 10,
-                                    "program": "lambda_infer_type_scope.ets"
-                                  },
-                                  "end": {
-                                    "line": 17,
-                                    "column": 19,
-                                    "program": "lambda_infer_type_scope.ets"
-                                  }
-                                }
-                              }
-                            ],
-                            "body": {
-                              "type": "BlockStatement",
-                              "statements": [
-                                {
-                                  "type": "ReturnStatement",
-                                  "argument": {
-                                    "type": "BinaryExpression",
-                                    "operator": "+",
-                                    "left": {
-                                      "type": "Identifier",
-                                      "name": "b",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 17,
-                                          "column": 24,
-                                          "program": "lambda_infer_type_scope.ets"
-                                        },
-                                        "end": {
-                                          "line": 17,
-                                          "column": 25,
-                                          "program": "lambda_infer_type_scope.ets"
-                                        }
-                                      }
-                                    },
-                                    "right": {
-                                      "type": "Identifier",
-                                      "name": "p",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 17,
-                                          "column": 28,
-                                          "program": "lambda_infer_type_scope.ets"
-                                        },
-                                        "end": {
-                                          "line": 17,
-                                          "column": 29,
-                                          "program": "lambda_infer_type_scope.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 17,
-                                        "column": 24,
-                                        "program": "lambda_infer_type_scope.ets"
-                                      },
-                                      "end": {
-                                        "line": 17,
-                                        "column": 29,
-                                        "program": "lambda_infer_type_scope.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 1,
-                                      "column": 1,
-                                      "program": null
-                                    },
-                                    "end": {
-                                      "line": 1,
-                                      "column": 1,
-                                      "program": null
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 1,
-                                  "column": 1,
-                                  "program": "lambda_infer_type_scope.ets"
-                                },
-                                "end": {
-                                  "line": 1,
-                                  "column": 1,
-                                  "program": "lambda_infer_type_scope.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 9,
-                                "program": "lambda_infer_type_scope.ets"
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 29,
-                                "program": "lambda_infer_type_scope.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "lambda_infer_type_scope.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 29,
-                              "program": "lambda_infer_type_scope.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "lambda_infer_type_scope.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 29,
-                            "program": "lambda_infer_type_scope.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "lambda_infer_type_scope.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 29,
-                          "program": "lambda_infer_type_scope.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "lambda_infer_type_scope.ets"
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 29,
-                      "program": "lambda_infer_type_scope.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "lambda_infer_type_scope.ets"
-                  },
-                  "end": {
-                    "line": 17,
-                    "column": 29,
-                    "program": "lambda_infer_type_scope.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "lambda_infer_type_scope.ets"
-                },
-                "end": {
-                  "line": 17,
-                  "column": 29,
-                  "program": "lambda_infer_type_scope.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "lambda_infer_type_scope.ets"
-              },
-              "end": {
-                "line": 17,
-                "column": 29,
-                "program": "lambda_infer_type_scope.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -624,13 +240,13 @@
                 },
                 "loc": {
                   "start": {
-                    "line": 1,
-                    "column": 1,
+                    "line": 17,
+                    "column": 9,
                     "program": "lambda_infer_type_scope.ets"
                   },
                   "end": {
-                    "line": 1,
-                    "column": 1,
+                    "line": 17,
+                    "column": 29,
                     "program": "lambda_infer_type_scope.ets"
                   }
                 }
diff --git a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt
index 384e306625d2f972769820c5ba5656727593f25a..118de5ce1f5999b11935d665a3f9e2d5fbad31d5 100644
--- a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt
@@ -742,112 +742,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_unresolved_ref_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_unresolved_ref_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_unresolved_ref_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_unresolved_ref_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_unresolved_ref_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_unresolved_ref_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_unresolved_ref_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_unresolved_ref_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/launch_expression-expected.txt b/ets2panda/test/compiler/ets/launch_expression-expected.txt
index 10c0205c50bba937497ad4f25665ab574f5ca32d..1938a2856704ef9534c4a6cd9865e7a446ada5c7 100644
--- a/ets2panda/test/compiler/ets/launch_expression-expected.txt
+++ b/ets2panda/test/compiler/ets/launch_expression-expected.txt
@@ -281,431 +281,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "count",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "launch_expression.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 10,
-                              "program": "launch_expression.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 2,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 13,
-                              "program": "launch_expression.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 14,
-                              "program": "launch_expression.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "launch_expression.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 14,
-                            "program": "launch_expression.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "launch_expression.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 14,
-                          "program": "launch_expression.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "n",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "launch_expression.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "launch_expression.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 9,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "launch_expression.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 10,
-                              "program": "launch_expression.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "launch_expression.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 10,
-                            "program": "launch_expression.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "launch_expression.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 10,
-                          "program": "launch_expression.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "launch_expression.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "launch_expression.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewArrayInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSPrimitiveType",
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 20,
-                                "program": "launch_expression.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 23,
-                                "program": "launch_expression.ets"
-                              }
-                            }
-                          },
-                          "dimension": {
-                            "type": "Identifier",
-                            "name": "count",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 24,
-                                "program": "launch_expression.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 29,
-                                "program": "launch_expression.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 16,
-                              "program": "launch_expression.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 30,
-                              "program": "launch_expression.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "launch_expression.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 30,
-                            "program": "launch_expression.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "launch_expression.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 30,
-                          "program": "launch_expression.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "v",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "launch_expression.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "launch_expression.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewArrayInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSPrimitiveType",
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 20,
-                                "program": "launch_expression.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 23,
-                                "program": "launch_expression.ets"
-                              }
-                            }
-                          },
-                          "dimension": {
-                            "type": "Identifier",
-                            "name": "count",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 24,
-                                "program": "launch_expression.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 29,
-                                "program": "launch_expression.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 16,
-                              "program": "launch_expression.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 30,
-                              "program": "launch_expression.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "launch_expression.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 30,
-                            "program": "launch_expression.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "launch_expression.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 30,
-                          "program": "launch_expression.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "launch_expression.ets"
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 30,
-                      "program": "launch_expression.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "launch_expression.ets"
-                  },
-                  "end": {
-                    "line": 21,
-                    "column": 30,
-                    "program": "launch_expression.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "launch_expression.ets"
-                },
-                "end": {
-                  "line": 21,
-                  "column": 30,
-                  "program": "launch_expression.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "launch_expression.ets"
-              },
-              "end": {
-                "line": 21,
-                "column": 30,
-                "program": "launch_expression.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -932,7 +507,7 @@
               },
               "end": {
                 "line": 20,
-                "column": 30,
+                "column": 16,
                 "program": "launch_expression.ets"
               }
             }
@@ -1051,7 +626,7 @@
               },
               "end": {
                 "line": 21,
-                "column": 30,
+                "column": 16,
                 "program": "launch_expression.ets"
               }
             }
@@ -5384,7 +4959,7 @@
                               },
                               "end": {
                                 "line": 62,
-                                "column": 24,
+                                "column": 31,
                                 "program": "launch_expression.ets"
                               }
                             }
diff --git a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt
index a281d834d864004f01d98fc2c7be01f8ad7fed7e..c8f3b97a9b3c9409eb43ef309dd36ef5f779dd4e 100644
--- a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt
+++ b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt
@@ -468,112 +468,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "loopWithinLambda.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "loopWithinLambda.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "loopWithinLambda.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "loopWithinLambda.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "loopWithinLambda.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "loopWithinLambda.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "loopWithinLambda.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "loopWithinLambda.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/compiler/ets/lowering-interaction-expected.txt b/ets2panda/test/compiler/ets/lowering-interaction-expected.txt
index de6ba9dbff6619f1c9bfb83cb34faea6a05f0074..af0ce4789f44c3138b23a2197e8b09d55dd2d311 100644
--- a/ets2panda/test/compiler/ets/lowering-interaction-expected.txt
+++ b/ets2panda/test/compiler/ets/lowering-interaction-expected.txt
@@ -1578,112 +1578,6 @@
                 "program": "lowering-interaction.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lowering-interaction.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lowering-interaction.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lowering-interaction.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lowering-interaction.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lowering-interaction.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lowering-interaction.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lowering-interaction.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lowering-interaction.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt
index c2c218dc375b318495455fc5733c2ef478569ed4..ba0ff138e9e0c3594c87f0effa3571007f8dcaef 100644
--- a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt
+++ b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt
@@ -35432,112 +35432,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "manyLocalsParamRegUsage.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "manyLocalsParamRegUsage.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "manyLocalsParamRegUsage.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "manyLocalsParamRegUsage.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "manyLocalsParamRegUsage.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "manyLocalsParamRegUsage.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "manyLocalsParamRegUsage.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "manyLocalsParamRegUsage.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt
index 4d8fc13a42788c7bae84e1ac1159554db91b0e53..b170f9c6b0f92fa50d7eeee25830536c1a41ebb1 100644
--- a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt
+++ b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt
@@ -193,112 +193,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "memberExprInLambda.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "memberExprInLambda.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "memberExprInLambda.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "memberExprInLambda.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "memberExprInLambda.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "memberExprInLambda.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "memberExprInLambda.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "memberExprInLambda.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt
index aa4becc7505ed859a78b5d938de9b707a9814ed6..068ee51522837f1a2a55304ca65df2618e3c62e5 100644
--- a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt
+++ b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt
@@ -3111,112 +3111,6 @@
                 "program": "memberExpressionFromStaticContext.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "memberExpressionFromStaticContext.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "memberExpressionFromStaticContext.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "memberExpressionFromStaticContext.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "memberExpressionFromStaticContext.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "memberExpressionFromStaticContext.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "memberExpressionFromStaticContext.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "memberExpressionFromStaticContext.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "memberExpressionFromStaticContext.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/method-resolution-class-and-interface-in-signatures_5-expected.txt b/ets2panda/test/compiler/ets/method-resolution-class-and-interface-in-signatures_5-expected.txt
index b70b285df181a5daebfc70f4cd65834f5a84dcb0..2ac1390e43f4bdea151ff7e4ed4104dc40aef2bc 100644
--- a/ets2panda/test/compiler/ets/method-resolution-class-and-interface-in-signatures_5-expected.txt
+++ b/ets2panda/test/compiler/ets/method-resolution-class-and-interface-in-signatures_5-expected.txt
@@ -804,112 +804,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "method-resolution-class-and-interface-in-signatures_5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "method-resolution-class-and-interface-in-signatures_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "method-resolution-class-and-interface-in-signatures_5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "method-resolution-class-and-interface-in-signatures_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "method-resolution-class-and-interface-in-signatures_5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "method-resolution-class-and-interface-in-signatures_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "method-resolution-class-and-interface-in-signatures_5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "method-resolution-class-and-interface-in-signatures_5.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt b/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt
index 206c21a66145dfee42c0bf2cd59bbef5999770fb..4e9ab56ba921405a113d78d6d3a478ccfe0bdbbe 100644
--- a/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt
+++ b/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt
@@ -1356,112 +1356,6 @@
                 "program": "methodOverrideAsyncMethod.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "methodOverrideAsyncMethod.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "methodOverrideAsyncMethod.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "methodOverrideAsyncMethod.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "methodOverrideAsyncMethod.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "methodOverrideAsyncMethod.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "methodOverrideAsyncMethod.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "methodOverrideAsyncMethod.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "methodOverrideAsyncMethod.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt
index f0848c04faf478b110ae7baa8a504a839731a11c..9ec8bf4f68ff8652dbdfa1e8712afdbe281591b9 100644
--- a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt
+++ b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt
@@ -2259,112 +2259,6 @@
                 "program": "methodOverrideCovariantReturnType.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "methodOverrideCovariantReturnType.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "methodOverrideCovariantReturnType.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "methodOverrideCovariantReturnType.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "methodOverrideCovariantReturnType.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "methodOverrideCovariantReturnType.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "methodOverrideCovariantReturnType.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "methodOverrideCovariantReturnType.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "methodOverrideCovariantReturnType.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt
index 5ff1567cc22b497fd6b6ee232643fed850d56718..310721278226b1954066690e63977863629f964e 100644
--- a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt
+++ b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt
@@ -1543,112 +1543,6 @@
                 "program": "methodOverrideDifferentSignature.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "methodOverrideDifferentSignature.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "methodOverrideDifferentSignature.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "methodOverrideDifferentSignature.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "methodOverrideDifferentSignature.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "methodOverrideDifferentSignature.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "methodOverrideDifferentSignature.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "methodOverrideDifferentSignature.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "methodOverrideDifferentSignature.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt
index b0e01bfbf17c390c2353ced75ecce30bf12f7c2a..ebe91f2142a52ef3198dba123e364579f3cbc0df 100644
--- a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt
+++ b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt
@@ -727,112 +727,6 @@
                 "program": "methodOverrideWithoutModifier.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "methodOverrideWithoutModifier.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "methodOverrideWithoutModifier.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "methodOverrideWithoutModifier.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "methodOverrideWithoutModifier.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "methodOverrideWithoutModifier.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "methodOverrideWithoutModifier.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "methodOverrideWithoutModifier.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "methodOverrideWithoutModifier.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt
index 89d9bd12269a401aa00ec6f8046cdbc796829849..6ca684d7aaaf8f8eab18ec02c2adaec098c9444a 100644
--- a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt
+++ b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt
@@ -1250,112 +1250,6 @@
                 "program": "multipleMethodOverride.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "multipleMethodOverride.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "multipleMethodOverride.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "multipleMethodOverride.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "multipleMethodOverride.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "multipleMethodOverride.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "multipleMethodOverride.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "multipleMethodOverride.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "multipleMethodOverride.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt
index 54d1502833e81a91d7314dd2307fde34807124ba..56d233eaf741a2508fc69bc703b5ec10253c52e1 100644
--- a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt
+++ b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "n_nullableTypeInArgNotRef.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "n_nullableTypeInArgNotRef.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "n_nullableTypeInArgNotRef.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "n_nullableTypeInArgNotRef.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "n_nullableTypeInArgNotRef.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "n_nullableTypeInArgNotRef.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "n_nullableTypeInArgNotRef.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "n_nullableTypeInArgNotRef.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt
index 0dfca43de8be54d0a7d8219b2cd5ff2f72643e89..9e86f6bce023772d9f16f62a72753712af37caab 100644
--- a/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt
+++ b/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "n_nullableTypeInReturnNotRef.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "n_nullableTypeInReturnNotRef.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "n_nullableTypeInReturnNotRef.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "n_nullableTypeInReturnNotRef.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "n_nullableTypeInReturnNotRef.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "n_nullableTypeInReturnNotRef.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "n_nullableTypeInReturnNotRef.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "n_nullableTypeInReturnNotRef.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt
index dc47fc9969c2bc9af28d89e24de0bfbbeb064ce7..0a7062e865b749164dc5156584b69e6d9b655300 100644
--- a/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt
+++ b/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "n_nullableTypeNotRef.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "n_nullableTypeNotRef.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "n_nullableTypeNotRef.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "n_nullableTypeNotRef.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "n_nullableTypeNotRef.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "n_nullableTypeNotRef.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "n_nullableTypeNotRef.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "n_nullableTypeNotRef.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/native_toplevel-expected.txt b/ets2panda/test/compiler/ets/native_toplevel-expected.txt
index 58147c8f0afc348e7c4961208edd330a10e74cf7..1ca89f9f348325b06b4f2d166fa004e5657bd895 100644
--- a/ets2panda/test/compiler/ets/native_toplevel-expected.txt
+++ b/ets2panda/test/compiler/ets/native_toplevel-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "native_toplevel.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "native_toplevel.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "native_toplevel.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "native_toplevel.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "native_toplevel.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "native_toplevel.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "native_toplevel.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "native_toplevel.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt b/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt
index 640f23ecb7c36b4968362041108366e2fc2ff911..b1582ef4bf8e69869992e0341cd7f1d5cce672f2 100644
--- a/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt
+++ b/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "non-const-lambda-with-scopes.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "non-const-lambda-with-scopes.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "non-const-lambda-with-scopes.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "non-const-lambda-with-scopes.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "non-const-lambda-with-scopes.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "non-const-lambda-with-scopes.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "non-const-lambda-with-scopes.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "non-const-lambda-with-scopes.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt b/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt
index c03de913a8c4d99593313313e31701477efa04fb..dcb9ac6288e97bf2931e7181f10ead663a5fd81f 100644
--- a/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt
+++ b/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt
@@ -285,112 +285,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "null_coalescing_generic_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "null_coalescing_generic_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "null_coalescing_generic_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "null_coalescing_generic_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "null_coalescing_generic_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "null_coalescing_generic_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "null_coalescing_generic_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "null_coalescing_generic_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/nullableTuple-expected.txt b/ets2panda/test/compiler/ets/nullableTuple-expected.txt
index b8e7ca99db58d69397c9dc39d699536398a8df5f..ba493026a535d26c25a93ea32072343f7bd286de 100644
--- a/ets2panda/test/compiler/ets/nullableTuple-expected.txt
+++ b/ets2panda/test/compiler/ets/nullableTuple-expected.txt
@@ -278,112 +278,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullableTuple.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullableTuple.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullableTuple.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullableTuple.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullableTuple.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullableTuple.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "nullableTuple.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "nullableTuple.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt
index 8ba128c655796205b0933d2b4cbf456b94bdc96f..1f93ecdb50110854417d7560ab7430f3a22a9148 100644
--- a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt
+++ b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullable_type_in_arithmeticdiv.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullable_type_in_arithmeticdiv.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullable_type_in_arithmeticdiv.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullable_type_in_arithmeticdiv.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullable_type_in_arithmeticdiv.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullable_type_in_arithmeticdiv.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "nullable_type_in_arithmeticdiv.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "nullable_type_in_arithmeticdiv.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt
index 44d8c319bc5713a56384c20423505df4d911d024..db390fc7a13b6a399eecc839426bb0387a5c5561 100644
--- a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt
+++ b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullable_type_in_arithmeticplus.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullable_type_in_arithmeticplus.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullable_type_in_arithmeticplus.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullable_type_in_arithmeticplus.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullable_type_in_arithmeticplus.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullable_type_in_arithmeticplus.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "nullable_type_in_arithmeticplus.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "nullable_type_in_arithmeticplus.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt b/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt
index f8825ab52efa3e2d0ae94c6df0cdfb4ba4a6d617..eaf4c5ab2e9ed2c311268368d6fdcdd2cb1a81a3 100644
--- a/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt
+++ b/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt
@@ -179,177 +179,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "objectLiteralInterface.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "objectLiteralInterface.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ObjectExpression",
-                          "properties": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "objectLiteralInterface.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 14,
-                              "program": "objectLiteralInterface.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "objectLiteralInterface.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 14,
-                            "program": "objectLiteralInterface.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "objectLiteralInterface.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 14,
-                          "program": "objectLiteralInterface.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "objectLiteralInterface.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 14,
-                      "program": "objectLiteralInterface.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "objectLiteralInterface.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 14,
-                    "program": "objectLiteralInterface.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "objectLiteralInterface.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 14,
-                  "program": "objectLiteralInterface.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "objectLiteralInterface.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 14,
-                "program": "objectLiteralInterface.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -432,7 +261,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 14,
+                "column": 12,
                 "program": "objectLiteralInterface.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt b/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt
index c6b01e8dda0efed4e8c3a6de37d34887bc6ce4f4..20a4ad85d37a4cf0df5feffa2ecdf47c7726cf00 100644
--- a/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt
+++ b/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt
@@ -340,230 +340,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "objectLiteralReadonlyKey.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "objectLiteralReadonlyKey.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ObjectExpression",
-                          "properties": [
-                            {
-                              "type": "Property",
-                              "method": false,
-                              "shorthand": false,
-                              "computed": false,
-                              "key": {
-                                "type": "Identifier",
-                                "name": "f",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 5,
-                                    "program": "objectLiteralReadonlyKey.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 6,
-                                    "program": "objectLiteralReadonlyKey.ets"
-                                  }
-                                }
-                              },
-                              "value": {
-                                "type": "NumberLiteral",
-                                "value": 44,
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 8,
-                                    "program": "objectLiteralReadonlyKey.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 10,
-                                    "program": "objectLiteralReadonlyKey.ets"
-                                  }
-                                }
-                              },
-                              "kind": "init",
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 5,
-                                  "program": "objectLiteralReadonlyKey.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 10,
-                                  "program": "objectLiteralReadonlyKey.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 12,
-                              "program": "objectLiteralReadonlyKey.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 2,
-                              "program": "objectLiteralReadonlyKey.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "objectLiteralReadonlyKey.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 2,
-                            "program": "objectLiteralReadonlyKey.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "objectLiteralReadonlyKey.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 2,
-                          "program": "objectLiteralReadonlyKey.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 20,
-                      "column": 5,
-                      "program": "objectLiteralReadonlyKey.ets"
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 2,
-                      "program": "objectLiteralReadonlyKey.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 20,
-                    "column": 5,
-                    "program": "objectLiteralReadonlyKey.ets"
-                  },
-                  "end": {
-                    "line": 22,
-                    "column": 2,
-                    "program": "objectLiteralReadonlyKey.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 20,
-                  "column": 5,
-                  "program": "objectLiteralReadonlyKey.ets"
-                },
-                "end": {
-                  "line": 22,
-                  "column": 2,
-                  "program": "objectLiteralReadonlyKey.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 20,
-                "column": 5,
-                "program": "objectLiteralReadonlyKey.ets"
-              },
-              "end": {
-                "line": 22,
-                "column": 2,
-                "program": "objectLiteralReadonlyKey.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -645,8 +421,8 @@
                 "program": "objectLiteralReadonlyKey.ets"
               },
               "end": {
-                "line": 22,
-                "column": 2,
+                "line": 20,
+                "column": 12,
                 "program": "objectLiteralReadonlyKey.ets"
               }
             }
diff --git a/ets2panda/test/compiler/ets/overload_with_generics-expected.txt b/ets2panda/test/compiler/ets/overload_with_generics-expected.txt
index d7052bb0488568412705c9079f24598ac0853916..ff02eee534b97fbf23b0b2fa9d3692cb9c25a75f 100644
--- a/ets2panda/test/compiler/ets/overload_with_generics-expected.txt
+++ b/ets2panda/test/compiler/ets/overload_with_generics-expected.txt
@@ -791,112 +791,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "overload_with_generics.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "overload_with_generics.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "overload_with_generics.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "overload_with_generics.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "overload_with_generics.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "overload_with_generics.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "overload_with_generics.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "overload_with_generics.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/override-expected.txt b/ets2panda/test/compiler/ets/override-expected.txt
index e10847ed61a37d7d20542ba4f32265b712f88507..97099609a1dc991250cc5fd00bf98c893757fc54 100644
--- a/ets2panda/test/compiler/ets/override-expected.txt
+++ b/ets2panda/test/compiler/ets/override-expected.txt
@@ -1902,112 +1902,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/override10-expected.txt b/ets2panda/test/compiler/ets/override10-expected.txt
index 9d7a82d6d2a8789e2bb082084af25106f9ebe9bc..833bb862316da9573cbd161605f83ee49e1252f7 100644
--- a/ets2panda/test/compiler/ets/override10-expected.txt
+++ b/ets2panda/test/compiler/ets/override10-expected.txt
@@ -1002,112 +1002,6 @@
                 "program": "override10.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override10.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override10.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override10.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override10.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override10.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override10.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override10.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override10.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override12-expected.txt b/ets2panda/test/compiler/ets/override12-expected.txt
index 35d00ec6c99a99c7bef3597f65754c15b1c25339..1f17557722bdd5ae309fbce63856d0ed02432f88 100644
--- a/ets2panda/test/compiler/ets/override12-expected.txt
+++ b/ets2panda/test/compiler/ets/override12-expected.txt
@@ -1713,112 +1713,6 @@
                 "program": "override12.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override12.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override12.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override12.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override12.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override12.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override12.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override12.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override12.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override13-expected.txt b/ets2panda/test/compiler/ets/override13-expected.txt
index f38d28582b64e2eb25c336f5710ef72459d64f47..78bd49d35bc5b37f5c7cfcaba195148399cab629 100644
--- a/ets2panda/test/compiler/ets/override13-expected.txt
+++ b/ets2panda/test/compiler/ets/override13-expected.txt
@@ -1115,112 +1115,6 @@
                 "program": "override13.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override13.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override13.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override13.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override13.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override13.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override13.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override13.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override13.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override16-expected.txt b/ets2panda/test/compiler/ets/override16-expected.txt
index cb2c09ed0f08bc6fe92220dcfcb6c5aa1ec2d788..f81ab311b22aa7c9270883ed692f9bb3f0de2659 100644
--- a/ets2panda/test/compiler/ets/override16-expected.txt
+++ b/ets2panda/test/compiler/ets/override16-expected.txt
@@ -860,112 +860,6 @@
                 "program": "override16.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override16.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override16.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override16.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override16.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override16.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override16.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override16.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override16.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override17-expected.txt b/ets2panda/test/compiler/ets/override17-expected.txt
index 004feec041d312139b76f971cf45f07a1a0b6061..7d9c6aa803ec7a27873cdcc7c82f65203a76dd16 100644
--- a/ets2panda/test/compiler/ets/override17-expected.txt
+++ b/ets2panda/test/compiler/ets/override17-expected.txt
@@ -860,112 +860,6 @@
                 "program": "override17.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override17.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override17.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override17.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override17.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override17.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override17.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override17.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override17.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override19-expected.txt b/ets2panda/test/compiler/ets/override19-expected.txt
index 41840f86e8559f22e4b48f3c4dce72e7de859364..56395f6207b20ac11e59e1e43fc1f5c44d02f5f5 100644
--- a/ets2panda/test/compiler/ets/override19-expected.txt
+++ b/ets2panda/test/compiler/ets/override19-expected.txt
@@ -718,112 +718,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override19.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override19.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override19.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override19.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override19.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override19.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override19.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override19.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/override2-expected.txt b/ets2panda/test/compiler/ets/override2-expected.txt
index fb39e96cddac7d3bdcc3cd15c58ab7429a2104ba..5bc28d15bd4addfbc83fc90ce1cb2562fddfe3e7 100644
--- a/ets2panda/test/compiler/ets/override2-expected.txt
+++ b/ets2panda/test/compiler/ets/override2-expected.txt
@@ -856,112 +856,6 @@
                 "program": "override2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override4-expected.txt b/ets2panda/test/compiler/ets/override4-expected.txt
index f967d535dd291aea0e4e6cafc1c1117f166a4279..c30d57d3e08e08d25b8139d9b070d03e570a1d76 100644
--- a/ets2panda/test/compiler/ets/override4-expected.txt
+++ b/ets2panda/test/compiler/ets/override4-expected.txt
@@ -904,112 +904,6 @@
                 "program": "override4.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override4.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override5-expected.txt b/ets2panda/test/compiler/ets/override5-expected.txt
index 144d24fdb4ae80617aa9d41d17b9f3343dec8497..311d2ea5346643deabf4d31f338aa4f5cd0e2e17 100644
--- a/ets2panda/test/compiler/ets/override5-expected.txt
+++ b/ets2panda/test/compiler/ets/override5-expected.txt
@@ -791,112 +791,6 @@
                 "program": "override5.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override5.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override6-expected.txt b/ets2panda/test/compiler/ets/override6-expected.txt
index f7aa2706ddd8da94c088e3aa285f5a78ee252cce..dd6442d3169944afcf23a85b98952596f77dc9cf 100644
--- a/ets2panda/test/compiler/ets/override6-expected.txt
+++ b/ets2panda/test/compiler/ets/override6-expected.txt
@@ -767,112 +767,6 @@
                 "program": "override6.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override6.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override8-expected.txt b/ets2panda/test/compiler/ets/override8-expected.txt
index d2f411e07260c9b7de410d7e76a5d3c5dd5a9258..fdf6ec4bb68583e9ac9b4bcc92adc1e8f6058249 100644
--- a/ets2panda/test/compiler/ets/override8-expected.txt
+++ b/ets2panda/test/compiler/ets/override8-expected.txt
@@ -718,112 +718,6 @@
                 "program": "override8.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override8.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/override9-expected.txt b/ets2panda/test/compiler/ets/override9-expected.txt
index 5f519f8d23badb8471099ccd3aaba6629f7954bb..3b72b763572051ebd5e587cc88cc98982dc4ba48 100644
--- a/ets2panda/test/compiler/ets/override9-expected.txt
+++ b/ets2panda/test/compiler/ets/override9-expected.txt
@@ -830,112 +830,6 @@
                 "program": "override9.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override9.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt
index f51678869e43bb3c90e309d91e611e16c20f92e5..330a7f175d1fc09ec13b759315de693601faec83 100644
--- a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt
+++ b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "parenthesizedType.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "parenthesizedType.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "parenthesizedType.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "parenthesizedType.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "parenthesizedType.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "parenthesizedType.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "parenthesizedType.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "parenthesizedType.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/requiredType_1-expected.txt b/ets2panda/test/compiler/ets/requiredType_1-expected.txt
index 2059ce24101b2f9a51614251b6b35a31577d4210..fd005ce9a0ee702a3ec5a75629a3ec5c2e2fa6d7 100644
--- a/ets2panda/test/compiler/ets/requiredType_1-expected.txt
+++ b/ets2panda/test/compiler/ets/requiredType_1-expected.txt
@@ -314,112 +314,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/requiredType_11-expected.txt b/ets2panda/test/compiler/ets/requiredType_11-expected.txt
index 4211a0eeddb1b7ccea45b5400a25c62495f05a2d..4e35e101965f9855b99e8eda87c1d6af923fbd91 100644
--- a/ets2panda/test/compiler/ets/requiredType_11-expected.txt
+++ b/ets2panda/test/compiler/ets/requiredType_11-expected.txt
@@ -653,112 +653,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_11.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_11.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_11.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_11.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_11.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_11.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_11.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_11.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/requiredType_4-expected.txt b/ets2panda/test/compiler/ets/requiredType_4-expected.txt
index 4c9bbeee77d91f3ea0d814de51cb52328e31b2fa..0d5a48c0ef37c40c486be5c18acda75f989d2dad 100644
--- a/ets2panda/test/compiler/ets/requiredType_4-expected.txt
+++ b/ets2panda/test/compiler/ets/requiredType_4-expected.txt
@@ -314,112 +314,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/requiredType_5-expected.txt b/ets2panda/test/compiler/ets/requiredType_5-expected.txt
index 82b78550bb9d3618d4a8bfdb4cbd09d9866be557..04f92ab299a43a584358f4fd1becfad945bfacc7 100644
--- a/ets2panda/test/compiler/ets/requiredType_5-expected.txt
+++ b/ets2panda/test/compiler/ets/requiredType_5-expected.txt
@@ -464,112 +464,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_5.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/requiredType_9-expected.txt b/ets2panda/test/compiler/ets/requiredType_9-expected.txt
index a80cb5e8d43fa76bc0acc6479968f22cf775ce28..ad0b9163fedd942a9b0d6d7a8ba4822a38091dab 100644
--- a/ets2panda/test/compiler/ets/requiredType_9-expected.txt
+++ b/ets2panda/test/compiler/ets/requiredType_9-expected.txt
@@ -923,112 +923,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "requiredType_9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "requiredType_9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "requiredType_9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "requiredType_9.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt b/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt
index 0ea37958658ff71e62add4310fb5e37023499181..0638cec80d64a736e6550b5b1d33a12fa37fff04 100644
--- a/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt
+++ b/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt
@@ -1167,112 +1167,6 @@
                 "program": "returnTypeGenericArray.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "returnTypeGenericArray.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "returnTypeGenericArray.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "returnTypeGenericArray.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "returnTypeGenericArray.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "returnTypeGenericArray.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "returnTypeGenericArray.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "returnTypeGenericArray.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "returnTypeGenericArray.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt b/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt
index 93586bf6dda0f18d91ab7ef7dd87ef528cadea28..2e3016b10dd4ec702b261984862a0ed0d1e987e5 100644
--- a/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt
+++ b/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt
@@ -715,112 +715,6 @@
                 "program": "switchStatementBoxing.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switchStatementBoxing.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switchStatementBoxing.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switchStatementBoxing.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switchStatementBoxing.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switchStatementBoxing.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switchStatementBoxing.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switchStatementBoxing.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switchStatementBoxing.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt
index af7db0e4eb3431308cef711dbd0edd68f0c27a03..f4af0e10ee801f33ea64ce744c921fe4410af645 100644
--- a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt
+++ b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt
@@ -1092,112 +1092,6 @@
                 "program": "switchStatementCorrectConversion.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switchStatementCorrectConversion.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switchStatementCorrectConversion.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switchStatementCorrectConversion.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switchStatementCorrectConversion.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switchStatementCorrectConversion.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switchStatementCorrectConversion.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switchStatementCorrectConversion.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switchStatementCorrectConversion.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/this_type_valid_return_type-expected.txt b/ets2panda/test/compiler/ets/this_type_valid_return_type-expected.txt
index 692685e1444307ab89f640fba678096aa7eb2567..00d473babb1e20d5a7d8ca165e0775abaa74c778 100644
--- a/ets2panda/test/compiler/ets/this_type_valid_return_type-expected.txt
+++ b/ets2panda/test/compiler/ets/this_type_valid_return_type-expected.txt
@@ -436,112 +436,6 @@
                 "program": "this_type_valid_return_type.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_type_valid_return_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_type_valid_return_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_type_valid_return_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_type_valid_return_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_type_valid_return_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_type_valid_return_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "this_type_valid_return_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "this_type_valid_return_type.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt
index 464bf819e4d2b828b3844aca9d7171d65bff5532..622d6f680637d148552bb7e1fa68c990a9a2f39f 100644
--- a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "throwInCatchClause3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "throwInCatchClause3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "throwInCatchClause3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "throwInCatchClause3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "throwInCatchClause3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "throwInCatchClause3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "throwInCatchClause3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "throwInCatchClause3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -487,7 +381,7 @@
                                           },
                                           "end": {
                                             "line": 21,
-                                            "column": 20,
+                                            "column": 34,
                                             "program": "throwInCatchClause3.ets"
                                           }
                                         }
diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt
index b02aacc5c6c4746bdfa22a711a2fba79f9f7ce1d..cf58dde60012dcf9512036b022fbbbdf50fb4762 100644
--- a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "throwInFinallyBlock1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "throwInFinallyBlock1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "throwInFinallyBlock1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "throwInFinallyBlock1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "throwInFinallyBlock1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "throwInFinallyBlock1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "throwInFinallyBlock1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "throwInFinallyBlock1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt
index fcf93a23b72d9b628d6eb0eb61681f2827af88fd..10971f0dba9e276ad9b525b9f592bdc2943df7cc 100644
--- a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "throwInTryStatement.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "throwInTryStatement.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "throwInTryStatement.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "throwInTryStatement.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "throwInTryStatement.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "throwInTryStatement.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "throwInTryStatement.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "throwInTryStatement.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt
index 8517a871da96c76d0e4de0297c38a5e483efa56d..20f9877ff4ae008b5b332588a4ba522800a5ce33 100644
--- a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt
+++ b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tryCatchErrorMissingParamType.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tryCatchErrorMissingParamType.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tryCatchErrorMissingParamType.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tryCatchErrorMissingParamType.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tryCatchErrorMissingParamType.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tryCatchErrorMissingParamType.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tryCatchErrorMissingParamType.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tryCatchErrorMissingParamType.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt
index 4b3df3d3296ea06877596862a0daa295db17a08f..37657dc7729a20942917c8f22fe7bdd750106f8f 100644
--- a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt
+++ b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tryCatchMissingParamType.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tryCatchMissingParamType.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tryCatchMissingParamType.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tryCatchMissingParamType.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tryCatchMissingParamType.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tryCatchMissingParamType.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tryCatchMissingParamType.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tryCatchMissingParamType.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt
index cae4964823da63113cf6213747eb22040b08f222..6afc2ae0f2c843bfe9323fda68a1d2fd52f0273c 100644
--- a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt
+++ b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tryDefaultCatches.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tryDefaultCatches.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tryDefaultCatches.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tryDefaultCatches.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tryDefaultCatches.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tryDefaultCatches.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tryDefaultCatches.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tryDefaultCatches.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt
index f03f541e3417022217d455109abf1836ccc4fbec..76ebead90c9dd80ee55b195b9377bb33ce6342ba 100644
--- a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt
@@ -989,112 +989,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt
index 64c9f8e3d79509f01c16e89b987e0c70db577f60..a0705f53c4afdb84f49eee4440d4ad638d7c0218 100644
--- a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt
@@ -703,112 +703,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_12.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_12.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_12.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_12.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_12.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_12.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_12.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_12.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt
index 20eb7a92ff65115a067895f2aa525059c8e85708..cfb19a1309033e170cf9bee13c67a959d5ea277e 100644
--- a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt
@@ -320,112 +320,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_13.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_13.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_13.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_13.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_13.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_13.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_13.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_13.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt
index 1e2a45c98472fe0ca980fa88476daf3b71898f1a..526c041004b5058bdf2a17a4c6d8456e3e8617b1 100644
--- a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt
@@ -734,112 +734,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_14.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_14.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_14.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_14.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_14.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_14.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_14.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_14.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt
index 9f4319f7ac4cf57bc19a603a6d73e362bcf6ac5b..7552efb33d4424da57e56d68b87cbbc5378165a3 100644
--- a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt
@@ -135,112 +135,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_15.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_15.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_15.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_15.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_15.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_15.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_15.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_15.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt
index e467d2ac934a09ec37078ec612abc40ea3044226..5770adaa07fc430a83599f979e3047b81a2a5b9c 100644
--- a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt
@@ -563,112 +563,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_16.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_16.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_16.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_16.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_16.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_16.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_16.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_16.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt
index 984be6af6d5d4402e53dfb5b57d0994390710b12..7ddfb736f53a0c33b735fd69613c80cc46502f66 100644
--- a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt
@@ -199,112 +199,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_17.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_17.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_17.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_17.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_17.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_17.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_17.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_17.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt
index 6c2c9e5f60165e3078191d631cc60bcdd49b6712..d2ad1165a7b088bbd1dac9837fcfb4e9a82a3edf 100644
--- a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt
@@ -246,112 +246,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_18.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_18.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_18.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_18.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_18.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_18.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_18.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_18.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt
index 4b80d82ca8ecb7630b67d7e4b6dc46d5331ff5ec..b7fc003e291afe90bf3d098b417e68cca2069360 100644
--- a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt
@@ -1922,112 +1922,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_19.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_19.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_19.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_19.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_19.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_19.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_19.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_19.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt
index ec5cc856c23fd7769d331760412a0884202b4e99..a36f10670e219c83fd04795d55138a7346420dcf 100644
--- a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tuple_types_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tuple_types_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tuple_types_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tuple_types_7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/typeAlias-expected.txt b/ets2panda/test/compiler/ets/typeAlias-expected.txt
index 25d6a1df61caed5a8b6e76b1b836d9e6e28c51d2..bc32a4656f1440ebe1c744ef2298b54e8b69bce9 100644
--- a/ets2panda/test/compiler/ets/typeAlias-expected.txt
+++ b/ets2panda/test/compiler/ets/typeAlias-expected.txt
@@ -130,246 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "typeAlias.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "typeAlias.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "Number",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 9,
-                                  "program": "typeAlias.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 15,
-                                  "program": "typeAlias.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "isInteger",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 16,
-                                  "program": "typeAlias.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 25,
-                                  "program": "typeAlias.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 9,
-                                "program": "typeAlias.ets"
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 25,
-                                "program": "typeAlias.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 26,
-                                  "program": "typeAlias.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 27,
-                                  "program": "typeAlias.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "typeAlias.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 28,
-                              "program": "typeAlias.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "typeAlias.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 28,
-                            "program": "typeAlias.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "typeAlias.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28,
-                          "program": "typeAlias.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "typeAlias.ets"
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 28,
-                      "program": "typeAlias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "typeAlias.ets"
-                  },
-                  "end": {
-                    "line": 17,
-                    "column": 28,
-                    "program": "typeAlias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "typeAlias.ets"
-                },
-                "end": {
-                  "line": 17,
-                  "column": 28,
-                  "program": "typeAlias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "typeAlias.ets"
-              },
-              "end": {
-                "line": 17,
-                "column": 28,
-                "program": "typeAlias.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt b/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt
index 99dd369916bdffb1c9c7671cddab81777a84c220..ebac4ab4bf728a48f4ff5f3a6c43107418bf40dc 100644
--- a/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt
+++ b/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt
@@ -742,112 +742,6 @@
                 "program": "typeVarReferenceFromStaticContext2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "typeVarReferenceFromStaticContext2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "typeVarReferenceFromStaticContext2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "typeVarReferenceFromStaticContext2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "typeVarReferenceFromStaticContext2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "typeVarReferenceFromStaticContext2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "typeVarReferenceFromStaticContext2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "typeVarReferenceFromStaticContext2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "typeVarReferenceFromStaticContext2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/compiler/ets/union_types_1-expected.txt b/ets2panda/test/compiler/ets/union_types_1-expected.txt
index a87ca86992aaa70f05d64b077487f31ab4cf292f..8dafbda8af1af0183bd3e60dc2d1f067c7b2908d 100644
--- a/ets2panda/test/compiler/ets/union_types_1-expected.txt
+++ b/ets2panda/test/compiler/ets/union_types_1-expected.txt
@@ -1035,112 +1035,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_types_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_types_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_types_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_types_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_types_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_types_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "union_types_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "union_types_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -1565,7 +1459,7 @@
                                     },
                                     "end": {
                                       "line": 36,
-                                      "column": 19,
+                                      "column": 25,
                                       "program": "union_types_1.ets"
                                     }
                                   }
@@ -1578,7 +1472,7 @@
                                   },
                                   "end": {
                                     "line": 36,
-                                    "column": 19,
+                                    "column": 25,
                                     "program": "union_types_1.ets"
                                   }
                                 }
@@ -3611,7 +3505,7 @@
                                     },
                                     "end": {
                                       "line": 55,
-                                      "column": 19,
+                                      "column": 25,
                                       "program": "union_types_1.ets"
                                     }
                                   }
@@ -3624,7 +3518,7 @@
                                   },
                                   "end": {
                                     "line": 55,
-                                    "column": 19,
+                                    "column": 25,
                                     "program": "union_types_1.ets"
                                   }
                                 }
diff --git a/ets2panda/test/compiler/ets/union_types_3-expected.txt b/ets2panda/test/compiler/ets/union_types_3-expected.txt
index a5f9e2000f25b236d5c87b4bd718924975357fd0..56db01f361879b55cf9ef4e7532c95412858202b 100644
--- a/ets2panda/test/compiler/ets/union_types_3-expected.txt
+++ b/ets2panda/test/compiler/ets/union_types_3-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_types_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_types_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_types_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_types_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_types_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_types_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "union_types_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "union_types_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/union_types_5-expected.txt b/ets2panda/test/compiler/ets/union_types_5-expected.txt
index e3e63e84453cf2ea7b21d166e3903eb53055679f..f1989add0ad62be45e122883a06f1554ba2e292c 100644
--- a/ets2panda/test/compiler/ets/union_types_5-expected.txt
+++ b/ets2panda/test/compiler/ets/union_types_5-expected.txt
@@ -993,112 +993,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_types_5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_types_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_types_5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_types_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_types_5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_types_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "union_types_5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "union_types_5.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/compiler/ets/union_types_merging-expected.txt b/ets2panda/test/compiler/ets/union_types_merging-expected.txt
index 54b9ed2d39bc295d35e3656d422003f6daa00c08..e34b1cf545a6b69969cf4485fedb3997dc84255e 100644
--- a/ets2panda/test/compiler/ets/union_types_merging-expected.txt
+++ b/ets2panda/test/compiler/ets/union_types_merging-expected.txt
@@ -1942,112 +1942,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_types_merging.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_types_merging.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_types_merging.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_types_merging.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_types_merging.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_types_merging.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "union_types_merging.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "union_types_merging.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt
index bd5f3031ef47d37a9e00fb18a1f2cb421d54f315..f4e0106c3866a251631db78447c176610e4ecd24 100644
--- a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt
+++ b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt
@@ -5326,112 +5326,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "AccessBinaryTrees.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "AccessBinaryTrees.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "AccessBinaryTrees.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "AccessBinaryTrees.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "AccessBinaryTrees.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "AccessBinaryTrees.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "AccessBinaryTrees.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "AccessBinaryTrees.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt
index 110e32851981bf4affe64964f6a178713906d836..c2518a139d1f7a3832accf4e8fad4d75fe6addc6 100644
--- a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt
+++ b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt
@@ -6143,112 +6143,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "AccessFannkuch.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "AccessFannkuch.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "AccessFannkuch.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "AccessFannkuch.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "AccessFannkuch.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "AccessFannkuch.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "AccessFannkuch.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "AccessFannkuch.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/AccessNBody-expected.txt b/ets2panda/test/parser/ets/AccessNBody-expected.txt
index 6f8a4195e705051b5fe95a5a94b2797cde66b2ef..48b4ec36be77767e61009bad51b15628a15687c4 100644
--- a/ets2panda/test/parser/ets/AccessNBody-expected.txt
+++ b/ets2panda/test/parser/ets/AccessNBody-expected.txt
@@ -16610,112 +16610,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "AccessNBody.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "AccessNBody.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "AccessNBody.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "AccessNBody.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "AccessNBody.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "AccessNBody.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "AccessNBody.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "AccessNBody.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/AccessNSieve-expected.txt b/ets2panda/test/parser/ets/AccessNSieve-expected.txt
index 55fb9c7065a4bc77dc6cea53a79959c2e2c24de1..3e7db58d1ae4f1390548c344bb506dd619a442df 100644
--- a/ets2panda/test/parser/ets/AccessNSieve-expected.txt
+++ b/ets2panda/test/parser/ets/AccessNSieve-expected.txt
@@ -3231,112 +3231,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "AccessNSieve.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "AccessNSieve.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "AccessNSieve.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "AccessNSieve.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "AccessNSieve.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "AccessNSieve.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "AccessNSieve.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "AccessNSieve.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt
index b1f1dd0298834f30d9d72604d003897a04b723d8..4ffca340cd2224d506f758111b6b5f44928048b0 100644
--- a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt
+++ b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt
@@ -2251,112 +2251,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Bitops3BitBitsInByte.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Bitops3BitBitsInByte.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Bitops3BitBitsInByte.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Bitops3BitBitsInByte.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Bitops3BitBitsInByte.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Bitops3BitBitsInByte.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "Bitops3BitBitsInByte.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "Bitops3BitBitsInByte.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt
index 17e1544ecf64f15b39b4b5117b10c86b8645276a..b6d266f29d46f593b7a790ea9f95b5b6eb801efd 100644
--- a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt
+++ b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt
@@ -1993,112 +1993,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "BitopsBitsInByte.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "BitopsBitsInByte.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "BitopsBitsInByte.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "BitopsBitsInByte.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "BitopsBitsInByte.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "BitopsBitsInByte.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "BitopsBitsInByte.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "BitopsBitsInByte.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt
index 8d065daf16682acc8ba60e0c89d590fca77a838f..6dddb68f6792c4e2ba1f3cb385e45cf45ba0dfa6 100644
--- a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt
+++ b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt
@@ -984,112 +984,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "BitopsBitwiseAnd.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "BitopsBitwiseAnd.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "BitopsBitwiseAnd.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "BitopsBitwiseAnd.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "BitopsBitwiseAnd.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "BitopsBitwiseAnd.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "BitopsBitwiseAnd.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "BitopsBitwiseAnd.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt
index 5ca725511bbeb5af8077a434f8c60b3a3b691ce8..96f19ff30a3a127e2f200727f6753c7cb5042bd1 100644
--- a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt
+++ b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt
@@ -3862,112 +3862,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "BitopsNSieveBits.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "BitopsNSieveBits.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "BitopsNSieveBits.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "BitopsNSieveBits.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "BitopsNSieveBits.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "BitopsNSieveBits.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "BitopsNSieveBits.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "BitopsNSieveBits.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt
index c18cffd19e240daccd38029ec5f1780d2cf4a4e0..33fa99535cdadb429d018d36fdc38d399effb3b2 100644
--- a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt
+++ b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Boolean_bitwise.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Boolean_bitwise.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Boolean_bitwise.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Boolean_bitwise.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Boolean_bitwise.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Boolean_bitwise.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "Boolean_bitwise.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "Boolean_bitwise.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt
index 05524201b860cbd095bcfcea4af200c0ede200f5..d146552bd5705cd1faf96bb015473dbc8024adcd 100644
--- a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt
+++ b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt
@@ -3899,112 +3899,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ControlFlowRecursive.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ControlFlowRecursive.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ControlFlowRecursive.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ControlFlowRecursive.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ControlFlowRecursive.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ControlFlowRecursive.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ControlFlowRecursive.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ControlFlowRecursive.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/Dollar_dollar_1-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_1-expected.txt
index 5caf5dd2777de2f0748f61cef494816a9c69d408..368087c522ea2a5fa421132622d69f001e199665 100644
--- a/ets2panda/test/parser/ets/Dollar_dollar_1-expected.txt
+++ b/ets2panda/test/parser/ets/Dollar_dollar_1-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "$$a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "Dollar_dollar_1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 8,
-                              "program": "Dollar_dollar_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BooleanLiteral",
-                          "value": true,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 11,
-                              "program": "Dollar_dollar_1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "Dollar_dollar_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "Dollar_dollar_1.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 15,
-                            "program": "Dollar_dollar_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "Dollar_dollar_1.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 15,
-                          "program": "Dollar_dollar_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "Dollar_dollar_1.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 15,
-                      "program": "Dollar_dollar_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "Dollar_dollar_1.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 15,
-                    "program": "Dollar_dollar_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "Dollar_dollar_1.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 15,
-                  "program": "Dollar_dollar_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "Dollar_dollar_1.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 15,
-                "program": "Dollar_dollar_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt
index 9e4bd37922b1681671beb99d984c6a4babdac69b..9901d6100719d0e6372688c68f15cb2a113f44de 100644
--- a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt
+++ b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt
@@ -1175,112 +1175,6 @@
                 "program": "Dollar_dollar_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Dollar_dollar_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Dollar_dollar_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Dollar_dollar_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Dollar_dollar_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Dollar_dollar_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Dollar_dollar_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "Dollar_dollar_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "Dollar_dollar_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt
index 1320b38631ba6fa1a5dbf9d83051ed64aa3435f1..c019eced6e4695bc5f14e58954ccf08e9dc6f988 100644
--- a/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt
+++ b/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt
@@ -285,289 +285,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "$$a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "Dollar_dollar_3.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 8,
-                              "program": "Dollar_dollar_3.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "A",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 17,
-                                    "column": 15,
-                                    "program": "Dollar_dollar_3.ets"
-                                  },
-                                  "end": {
-                                    "line": 17,
-                                    "column": 16,
-                                    "program": "Dollar_dollar_3.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 15,
-                                  "program": "Dollar_dollar_3.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 17,
-                                  "program": "Dollar_dollar_3.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 15,
-                                "program": "Dollar_dollar_3.ets"
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 17,
-                                "program": "Dollar_dollar_3.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 11,
-                              "program": "Dollar_dollar_3.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 4,
-                              "program": "Dollar_dollar_3.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "Dollar_dollar_3.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 4,
-                            "program": "Dollar_dollar_3.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "Dollar_dollar_3.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 4,
-                          "program": "Dollar_dollar_3.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "Dollar_dollar_3.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "Dollar_dollar_3.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "$$a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "Dollar_dollar_3.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "Dollar_dollar_3.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "Dollar_dollar_3.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "Dollar_dollar_3.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "Dollar_dollar_3.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "Dollar_dollar_3.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "Dollar_dollar_3.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 12,
-                      "program": "Dollar_dollar_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "Dollar_dollar_3.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 12,
-                    "program": "Dollar_dollar_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "Dollar_dollar_3.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 12,
-                  "program": "Dollar_dollar_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "Dollar_dollar_3.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 12,
-                "program": "Dollar_dollar_3.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/Dollar_dollar_4-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_4-expected.txt
index aa23adf4d86061c1dc926380c20573f9d03a343b..484ad01f181df76c84e4387942184a3207db41fc 100644
--- a/ets2panda/test/parser/ets/Dollar_dollar_4-expected.txt
+++ b/ets2panda/test/parser/ets/Dollar_dollar_4-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "$a$aa$$",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "Dollar_dollar_4.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "Dollar_dollar_4.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "Dollar_dollar_4.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "Dollar_dollar_4.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "Dollar_dollar_4.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 16,
-                            "program": "Dollar_dollar_4.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "Dollar_dollar_4.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 16,
-                          "program": "Dollar_dollar_4.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "Dollar_dollar_4.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 16,
-                      "program": "Dollar_dollar_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "Dollar_dollar_4.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 16,
-                    "program": "Dollar_dollar_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "Dollar_dollar_4.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 16,
-                  "program": "Dollar_dollar_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "Dollar_dollar_4.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 16,
-                "program": "Dollar_dollar_4.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/FunctionInSwitch-expected.txt b/ets2panda/test/parser/ets/FunctionInSwitch-expected.txt
index 5d047a89035dd8685b5e96c3b4baa1ddb1d4dd24..0ad429f3e75a27e8a95a630dd7f97849f42c2628 100644
--- a/ets2panda/test/parser/ets/FunctionInSwitch-expected.txt
+++ b/ets2panda/test/parser/ets/FunctionInSwitch-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "FunctionInSwitch.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "FunctionInSwitch.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "FunctionInSwitch.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "FunctionInSwitch.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "FunctionInSwitch.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "FunctionInSwitch.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "FunctionInSwitch.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "FunctionInSwitch.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/FunctionType-expected.txt b/ets2panda/test/parser/ets/FunctionType-expected.txt
index b2898c74e398e331871fad59eb58b6c3637165ca..ec170595d181b8e3c31d05ef8903a4119d2e273b 100644
--- a/ets2panda/test/parser/ets/FunctionType-expected.txt
+++ b/ets2panda/test/parser/ets/FunctionType-expected.txt
@@ -614,112 +614,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "FunctionType.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "FunctionType.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "FunctionType.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "FunctionType.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "FunctionType.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "FunctionType.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "FunctionType.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "FunctionType.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt
index 8f915148482cec6e1273ee1b821465983f867d14..73d3522592145b1c0684d72b1f6cb63dc11b8254 100644
--- a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt
+++ b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "FunctionalTypeAsTypeArgument.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "FunctionalTypeAsTypeArgument.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "FunctionalTypeAsTypeArgument.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "FunctionalTypeAsTypeArgument.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "FunctionalTypeAsTypeArgument.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "FunctionalTypeAsTypeArgument.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "FunctionalTypeAsTypeArgument.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "FunctionalTypeAsTypeArgument.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt
index 4423a330e5588e104144c4b64e844ad7efae8819..f0835174924845e8ddf72c28a3784f5b757a650b 100644
--- a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt
+++ b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt
@@ -1831,112 +1831,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "InferTypeParamFromParam1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "InferTypeParamFromParam1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "InferTypeParamFromParam1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "InferTypeParamFromParam1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "InferTypeParamFromParam1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "InferTypeParamFromParam1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "InferTypeParamFromParam1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "InferTypeParamFromParam1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt
index f043cd239edd03c79aba05aecc21fe398a86b722..174779f2a73cd2a85e36a6da886bd650ad205206 100644
--- a/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt
+++ b/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt
@@ -2051,112 +2051,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "InferTypeParamFromParam3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "InferTypeParamFromParam3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "InferTypeParamFromParam3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "InferTypeParamFromParam3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "InferTypeParamFromParam3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "InferTypeParamFromParam3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "InferTypeParamFromParam3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "InferTypeParamFromParam3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/MathCordic-expected.txt b/ets2panda/test/parser/ets/MathCordic-expected.txt
index ab95c14b4120f9fa58b43bddc85db83f0207bd73..d7ae2076f501609086856792027c1b3f494a9cc6 100644
--- a/ets2panda/test/parser/ets/MathCordic-expected.txt
+++ b/ets2panda/test/parser/ets/MathCordic-expected.txt
@@ -6024,112 +6024,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "MathCordic.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "MathCordic.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "MathCordic.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "MathCordic.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "MathCordic.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "MathCordic.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "MathCordic.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "MathCordic.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/MathPartialSums-expected.txt b/ets2panda/test/parser/ets/MathPartialSums-expected.txt
index 00abdda712270667c9ad4ed48bc2a6da5568a1ea..05f8fe99d11f36a0a00a157379c451708751ef90 100644
--- a/ets2panda/test/parser/ets/MathPartialSums-expected.txt
+++ b/ets2panda/test/parser/ets/MathPartialSums-expected.txt
@@ -5380,112 +5380,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "MathPartialSums.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "MathPartialSums.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "MathPartialSums.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "MathPartialSums.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "MathPartialSums.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "MathPartialSums.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "MathPartialSums.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "MathPartialSums.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt
index 81b830b8f126e6d207666027430ee16f888f54df..fb8aa23cd49ef0df0e04c55a22879d9a5af7a643 100644
--- a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt
+++ b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt
@@ -7135,112 +7135,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "MathSpectralNorm.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "MathSpectralNorm.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "MathSpectralNorm.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "MathSpectralNorm.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "MathSpectralNorm.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "MathSpectralNorm.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "MathSpectralNorm.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "MathSpectralNorm.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/Morph3d-expected.txt b/ets2panda/test/parser/ets/Morph3d-expected.txt
index 35ffe6f1196f50d1c3b9955e7c2c3ac73f070619..6cc691a04e0eb08bb115efd556ab5fdf5510483d 100644
--- a/ets2panda/test/parser/ets/Morph3d-expected.txt
+++ b/ets2panda/test/parser/ets/Morph3d-expected.txt
@@ -3788,112 +3788,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Morph3d.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Morph3d.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Morph3d.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Morph3d.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Morph3d.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Morph3d.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "Morph3d.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "Morph3d.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt b/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt
index f87faf7ebadb0e268245bfd599b93c373cf4dcd2..c0881b5913977d4bf83fae09bebfaa25c0c97d06 100644
--- a/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt
+++ b/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt
@@ -1576,112 +1576,6 @@
                 "program": "OptionalParametersWithGenericReturnTypes.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "OptionalParametersWithGenericReturnTypes.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "OptionalParametersWithGenericReturnTypes.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "OptionalParametersWithGenericReturnTypes.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "OptionalParametersWithGenericReturnTypes.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "OptionalParametersWithGenericReturnTypes.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "OptionalParametersWithGenericReturnTypes.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "OptionalParametersWithGenericReturnTypes.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "OptionalParametersWithGenericReturnTypes.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt
index 583a8f6d7d5ad61d3b1c3b03bd26d4ccca061da6..61ba919037bd43665e170868700109cc07d30d55 100644
--- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt
+++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt
@@ -403,112 +403,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "StaticFieldAndMethodSameName.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "StaticFieldAndMethodSameName.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "StaticFieldAndMethodSameName.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "StaticFieldAndMethodSameName.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "StaticFieldAndMethodSameName.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "StaticFieldAndMethodSameName.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "StaticFieldAndMethodSameName.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "StaticFieldAndMethodSameName.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt
index 02df1019bffd4bd1f6fc59d107273ac9d5b30f26..c3a563b70ac29eee00209c32078e0be7dc69d01c 100644
--- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt
+++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt
@@ -604,112 +604,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "StaticFieldAndMethodSameNameInheritance.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "StaticFieldAndMethodSameNameInheritance.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "StaticFieldAndMethodSameNameInheritance.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "StaticFieldAndMethodSameNameInheritance.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "StaticFieldAndMethodSameNameInheritance.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "StaticFieldAndMethodSameNameInheritance.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "StaticFieldAndMethodSameNameInheritance.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "StaticFieldAndMethodSameNameInheritance.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/StringBase64-expected.txt b/ets2panda/test/parser/ets/StringBase64-expected.txt
index 3f5fe930faee5bbf69b9544581ae67dbe4676c80..89c69e7f61555f97f3c98c1812c085f352a19e3a 100644
--- a/ets2panda/test/parser/ets/StringBase64-expected.txt
+++ b/ets2panda/test/parser/ets/StringBase64-expected.txt
@@ -10976,112 +10976,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "StringBase64.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "StringBase64.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "StringBase64.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "StringBase64.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "StringBase64.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "StringBase64.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "StringBase64.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "StringBase64.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/access_modifier_2-expected.txt b/ets2panda/test/parser/ets/access_modifier_2-expected.txt
index 245eb1ec143f49b8c63101b7a90702a4e60979b3..4d53b190150b481fae685bbdad6bc8d83f283912 100644
--- a/ets2panda/test/parser/ets/access_modifier_2-expected.txt
+++ b/ets2panda/test/parser/ets/access_modifier_2-expected.txt
@@ -405,112 +405,6 @@
                 "program": "access_modifier_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "access_modifier_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "access_modifier_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "access_modifier_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "access_modifier_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "access_modifier_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "access_modifier_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "access_modifier_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "access_modifier_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/access_modifier_3-expected.txt b/ets2panda/test/parser/ets/access_modifier_3-expected.txt
index b6437f1f5e118edd4e3de5d19083c0d1ed5f895a..e2b66069e7bc2e6521cc696022e0e953e56ca5a9 100644
--- a/ets2panda/test/parser/ets/access_modifier_3-expected.txt
+++ b/ets2panda/test/parser/ets/access_modifier_3-expected.txt
@@ -339,112 +339,6 @@
                 "program": "access_modifier_3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "access_modifier_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "access_modifier_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "access_modifier_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "access_modifier_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "access_modifier_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "access_modifier_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "access_modifier_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "access_modifier_3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt
index 2af8e374b297cff1dbf35765eb13461f9531d663..237b45a5728387e2e0f071a16dbad68733017442 100644
--- a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt
+++ b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt
@@ -397,112 +397,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_call_signature.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_call_signature.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_call_signature.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_call_signature.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_call_signature.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_call_signature.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_call_signature.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_call_signature.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt
index 0cbb526fdccf5bd95cc739d624b802f4afcc95c9..910db7df050bbfdc9611dc4fb727f02e74ca74d9 100644
--- a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt
+++ b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt
@@ -662,112 +662,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_indexer_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_indexer_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_indexer_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_indexer_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_indexer_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_indexer_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_indexer_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_indexer_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt
index 87d901d090d73e5a0c80cdade1061491f2498b3f..a242c3baac3813ded69d828294b8e12188412152 100644
--- a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt
+++ b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt
@@ -662,112 +662,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_indexer_6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_indexer_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_indexer_6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_indexer_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_indexer_6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_indexer_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_indexer_6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_indexer_6.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt b/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt
index 2278d3cce598c389226adf0bd27fbe8b0deb4f49..d74b18e92b9252e6ef56f6f19e7f3094109f0f2e 100644
--- a/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt
+++ b/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt
@@ -1160,112 +1160,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_object_iterable.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ambient_object_iterable.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_object_iterable.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ambient_object_iterable.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_object_iterable.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ambient_object_iterable.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_object_iterable.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ambient_object_iterable.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/array-expected.txt b/ets2panda/test/parser/ets/array-expected.txt
index 0559cf8adc47a8376858f0866f9a811c19a796eb..c9d59f27ba4effa61d883a3c390d54a4c31d90b0 100644
--- a/ets2panda/test/parser/ets/array-expected.txt
+++ b/ets2panda/test/parser/ets/array-expected.txt
@@ -130,339 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "array.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "array.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 17,
-                                  "program": "array.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 18,
-                                  "program": "array.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 2,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 19,
-                                  "program": "array.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 20,
-                                  "program": "array.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 21,
-                                  "program": "array.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 22,
-                                  "program": "array.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "array.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 23,
-                              "program": "array.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "array.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 23,
-                            "program": "array.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "array.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23,
-                          "program": "array.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "v",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "array.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "array.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "StringLiteral",
-                              "value": "x",
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 20,
-                                  "program": "array.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 23,
-                                  "program": "array.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "StringLiteral",
-                              "value": "y",
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 25,
-                                  "program": "array.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 28,
-                                  "program": "array.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "StringLiteral",
-                              "value": "z",
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 30,
-                                  "program": "array.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 33,
-                                  "program": "array.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 19,
-                              "program": "array.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 34,
-                              "program": "array.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "array.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 34,
-                            "program": "array.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "array.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 34,
-                          "program": "array.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "array.ets"
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 34,
-                      "program": "array.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "array.ets"
-                  },
-                  "end": {
-                    "line": 17,
-                    "column": 34,
-                    "program": "array.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "array.ets"
-                },
-                "end": {
-                  "line": 17,
-                  "column": 34,
-                  "program": "array.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "array.ets"
-              },
-              "end": {
-                "line": 17,
-                "column": 34,
-                "program": "array.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -577,7 +244,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 23,
+                "column": 16,
                 "program": "array.ets"
               }
             }
@@ -728,7 +395,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 34,
+                "column": 19,
                 "program": "array.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt b/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt
index 1b4cbae51709e6e356e4ec0e268fb396a6127215..2e57145e6fba14ab10deb5fe5d57436946fd71a7 100644
--- a/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt
+++ b/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt
@@ -24,305 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "arrayHoldingNullValue.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "arrayHoldingNullValue.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NullLiteral",
-                          "value": null,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 23,
-                              "program": "arrayHoldingNullValue.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 27,
-                              "program": "arrayHoldingNullValue.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "arrayHoldingNullValue.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 27,
-                            "program": "arrayHoldingNullValue.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "arrayHoldingNullValue.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27,
-                          "program": "arrayHoldingNullValue.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "arrayHoldingNullValue.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "arrayHoldingNullValue.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NullLiteral",
-                          "value": null,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 26,
-                              "program": "arrayHoldingNullValue.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 30,
-                              "program": "arrayHoldingNullValue.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "arrayHoldingNullValue.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 30,
-                            "program": "arrayHoldingNullValue.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "arrayHoldingNullValue.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 30,
-                          "program": "arrayHoldingNullValue.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "k",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "arrayHoldingNullValue.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "arrayHoldingNullValue.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NullLiteral",
-                          "value": null,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 26,
-                              "program": "arrayHoldingNullValue.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 30,
-                              "program": "arrayHoldingNullValue.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "arrayHoldingNullValue.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 30,
-                            "program": "arrayHoldingNullValue.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "arrayHoldingNullValue.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 30,
-                          "program": "arrayHoldingNullValue.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "arrayHoldingNullValue.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 30,
-                      "program": "arrayHoldingNullValue.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "arrayHoldingNullValue.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 30,
-                    "program": "arrayHoldingNullValue.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "arrayHoldingNullValue.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 30,
-                  "program": "arrayHoldingNullValue.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "arrayHoldingNullValue.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 30,
-                "program": "arrayHoldingNullValue.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -469,7 +170,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 27,
+                "column": 23,
                 "program": "arrayHoldingNullValue.ets"
               }
             }
@@ -620,7 +321,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 30,
+                "column": 26,
                 "program": "arrayHoldingNullValue.ets"
               }
             }
@@ -803,7 +504,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 30,
+                "column": 26,
                 "program": "arrayHoldingNullValue.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt b/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt
index 1ea8384ba86c8ac4444b8eb35b100abc35a67c50..84f18237500371c422e7d2d6692472febe769abe 100644
--- a/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt
+++ b/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "arrayLiteralReassign.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "arrayLiteralReassign.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "arrayLiteralReassign.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "arrayLiteralReassign.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "arrayLiteralReassign.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "arrayLiteralReassign.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "arrayLiteralReassign.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "arrayLiteralReassign.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/array_creation_expression-expected.txt b/ets2panda/test/parser/ets/array_creation_expression-expected.txt
index 9e3b3964d9c0ddd7936ccfdb231ec61c57e998a0..c335cdc1f4d40822e5fb0e45524a1c4db555ecf2 100644
--- a/ets2panda/test/parser/ets/array_creation_expression-expected.txt
+++ b/ets2panda/test/parser/ets/array_creation_expression-expected.txt
@@ -1116,112 +1116,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_creation_expression.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_creation_expression.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_creation_expression.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_creation_expression.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_creation_expression.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_creation_expression.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "array_creation_expression.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "array_creation_expression.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt b/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt
index 36b29615f1c2b081a350d2b4e9516c2a47cb780d..3ee407d48945abdfde3d43710181aae940e3670b 100644
--- a/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt
+++ b/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_expression_implicit_cast_assignment.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_expression_implicit_cast_assignment.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_expression_implicit_cast_assignment.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_expression_implicit_cast_assignment.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_expression_implicit_cast_assignment.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_expression_implicit_cast_assignment.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "array_expression_implicit_cast_assignment.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "array_expression_implicit_cast_assignment.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/array_expression_implicit_cast_return-expected.txt b/ets2panda/test/parser/ets/array_expression_implicit_cast_return-expected.txt
index eddeef6b233e3ca33b9db61b3b5105d54da3da23..2599dbb4a2bb7b40682fef7dbe7afbf919f526a5 100644
--- a/ets2panda/test/parser/ets/array_expression_implicit_cast_return-expected.txt
+++ b/ets2panda/test/parser/ets/array_expression_implicit_cast_return-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_expression_implicit_cast_return.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_expression_implicit_cast_return.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_expression_implicit_cast_return.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_expression_implicit_cast_return.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_expression_implicit_cast_return.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_expression_implicit_cast_return.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "array_expression_implicit_cast_return.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "array_expression_implicit_cast_return.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/array_new-expected.txt b/ets2panda/test/parser/ets/array_new-expected.txt
index 7654424bc75f6af18d95e9e193261045819a2978..7d0776852b980f9f8ef5ed52451e5388992a8901 100644
--- a/ets2panda/test/parser/ets/array_new-expected.txt
+++ b/ets2panda/test/parser/ets/array_new-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_new.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_new.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_new.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_new.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_new.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_new.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "array_new.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "array_new.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/array_type_from_literal-expected.txt b/ets2panda/test/parser/ets/array_type_from_literal-expected.txt
index f9f1bb2285f47dceddeef8afd52f71b916710177..d96edac837049e0db0534fc34411ddbf85529388 100644
--- a/ets2panda/test/parser/ets/array_type_from_literal-expected.txt
+++ b/ets2panda/test/parser/ets/array_type_from_literal-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_type_from_literal.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "array_type_from_literal.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_type_from_literal.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "array_type_from_literal.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_type_from_literal.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "array_type_from_literal.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "array_type_from_literal.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "array_type_from_literal.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -691,7 +585,7 @@
                           },
                           "end": {
                             "line": 21,
-                            "column": 14,
+                            "column": 23,
                             "program": "array_type_from_literal.ets"
                           }
                         }
@@ -704,7 +598,7 @@
                         },
                         "end": {
                           "line": 21,
-                          "column": 14,
+                          "column": 23,
                           "program": "array_type_from_literal.ets"
                         }
                       }
diff --git a/ets2panda/test/parser/ets/as_expression_unary_expression-expected.txt b/ets2panda/test/parser/ets/as_expression_unary_expression-expected.txt
index 77c49e0732efede1aca4e4e5506c23568a6b91db..fe5985159b7291cd8f9d65316f72f209343a536c 100644
--- a/ets2panda/test/parser/ets/as_expression_unary_expression-expected.txt
+++ b/ets2panda/test/parser/ets/as_expression_unary_expression-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "as_expression_unary_expression.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "as_expression_unary_expression.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "as_expression_unary_expression.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "as_expression_unary_expression.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "as_expression_unary_expression.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "as_expression_unary_expression.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "as_expression_unary_expression.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "as_expression_unary_expression.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -275,7 +169,7 @@
                               },
                               "end": {
                                 "line": 17,
-                                "column": 20,
+                                "column": 28,
                                 "program": "as_expression_unary_expression.ets"
                               }
                             }
@@ -288,7 +182,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 20,
+                              "column": 28,
                               "program": "as_expression_unary_expression.ets"
                             }
                           }
@@ -303,7 +197,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 20,
+                          "column": 28,
                           "program": "as_expression_unary_expression.ets"
                         }
                       }
diff --git a/ets2panda/test/parser/ets/assert-expected.txt b/ets2panda/test/parser/ets/assert-expected.txt
index 669a90f286eb14a9a1503fe48f4e3f725c60879c..bc0d581067e0393699e8a98512eb476c3f9a7f35 100644
--- a/ets2panda/test/parser/ets/assert-expected.txt
+++ b/ets2panda/test/parser/ets/assert-expected.txt
@@ -1116,112 +1116,6 @@
                 "program": "assert.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assert.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assert.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assert.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assert.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assert.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assert.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "assert.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "assert.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/assign-expected.txt b/ets2panda/test/parser/ets/assign-expected.txt
index c9fdcbfabaf53cab792b98da4d524603d34ce72e..5adcdb05f5fb98d89cebb9a4e83e29012c5bde9f 100644
--- a/ets2panda/test/parser/ets/assign-expected.txt
+++ b/ets2panda/test/parser/ets/assign-expected.txt
@@ -24,177 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "assign.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "assign.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 0,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 9,
-                              "program": "assign.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 10,
-                              "program": "assign.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "assign.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 10,
-                            "program": "assign.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "assign.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 10,
-                          "program": "assign.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "assign.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 10,
-                      "program": "assign.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "assign.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 10,
-                    "program": "assign.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "assign.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 10,
-                  "program": "assign.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "assign.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 10,
-                "program": "assign.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/assign-func-expected.txt b/ets2panda/test/parser/ets/assign-func-expected.txt
index 4c37006bef7e4b367a5f5b96970d98826b0d6efb..ab49aaaaddfcc6fa152f5df47ee91a0fbf507522 100644
--- a/ets2panda/test/parser/ets/assign-func-expected.txt
+++ b/ets2panda/test/parser/ets/assign-func-expected.txt
@@ -518,112 +518,6 @@
                 "program": "assign-func.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assign-func.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assign-func.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assign-func.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assign-func.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assign-func.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assign-func.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "assign-func.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "assign-func.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt b/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt
index 63d8c1ba459f732be2fc0f09a483fd8ad0f4aab5..bd1366ce6b911a3a6fc58883bdb7e908dce0a727 100644
--- a/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt
+++ b/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt
@@ -443,112 +443,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignNullableFromMethodToNullableParam.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignNullableFromMethodToNullableParam.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignNullableFromMethodToNullableParam.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignNullableFromMethodToNullableParam.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignNullableFromMethodToNullableParam.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignNullableFromMethodToNullableParam.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "assignNullableFromMethodToNullableParam.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "assignNullableFromMethodToNullableParam.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt
index 2aca76bfaea1760e1a6c1f7b5d60f8ffbf34656c..56682ed93600d6e4a32f84d3972cabfa1a26e212 100644
--- a/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt
+++ b/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt
@@ -179,112 +179,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignNullableToNonNullable.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignNullableToNonNullable.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignNullableToNonNullable.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignNullableToNonNullable.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignNullableToNonNullable.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignNullableToNonNullable.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "assignNullableToNonNullable.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "assignNullableToNonNullable.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt
index 42083111fb83d4ed5434b8d4b2c5650758f19b4d..4ad55b440d905203dfe2644a4137e5130b1a6623 100644
--- a/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt
+++ b/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt
@@ -179,112 +179,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignNullableToNonNullableArray.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignNullableToNonNullableArray.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignNullableToNonNullableArray.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignNullableToNonNullableArray.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignNullableToNonNullableArray.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignNullableToNonNullableArray.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "assignNullableToNonNullableArray.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "assignNullableToNonNullableArray.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt
index 6c337052f3c35cd055a6a704dd96c330f3a2decb..095e1d9e9adacd3782050f8ec18c1321c05cfff8 100644
--- a/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt
+++ b/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt
@@ -290,112 +290,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignNullableToNonNullableTypeAlias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignNullableToNonNullableTypeAlias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignNullableToNonNullableTypeAlias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignNullableToNonNullableTypeAlias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignNullableToNonNullableTypeAlias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignNullableToNonNullableTypeAlias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "assignNullableToNonNullableTypeAlias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "assignNullableToNonNullableTypeAlias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/assignments-expected.txt b/ets2panda/test/parser/ets/assignments-expected.txt
index d2f2cbdfc75c9d66e37a9cc67b14bb9ed5f520c9..36c61009deeb1dcb1f14bfb6876e7e17047d5c0a 100644
--- a/ets2panda/test/parser/ets/assignments-expected.txt
+++ b/ets2panda/test/parser/ets/assignments-expected.txt
@@ -2021,112 +2021,6 @@
                 "program": "assignments.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignments.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "assignments.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignments.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "assignments.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignments.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "assignments.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "assignments.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "assignments.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/async_func_return_type-expected.txt b/ets2panda/test/parser/ets/async_func_return_type-expected.txt
index 79eae8cee49f4fc1bded6757008af034112cd0ee..992af5f6e8c23ab1dbfdc7473017cecc9346753e 100644
--- a/ets2panda/test/parser/ets/async_func_return_type-expected.txt
+++ b/ets2panda/test/parser/ets/async_func_return_type-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "async_func_return_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "async_func_return_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "async_func_return_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "async_func_return_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "async_func_return_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "async_func_return_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "async_func_return_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "async_func_return_type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/async_function-expected.txt b/ets2panda/test/parser/ets/async_function-expected.txt
index 07c34ec1ac43ec4e745b3234ff26516091ca8067..cb94f4255cd72bc0535ca9d0fb1be18a0e103688 100644
--- a/ets2panda/test/parser/ets/async_function-expected.txt
+++ b/ets2panda/test/parser/ets/async_function-expected.txt
@@ -566,387 +566,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "lambda",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "async_function.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 11,
-                              "program": "async_function.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrowFunctionExpression",
-                          "function": {
-                            "type": "ScriptFunction",
-                            "id": null,
-                            "generator": false,
-                            "async": true,
-                            "expression": false,
-                            "params": [],
-                            "returnType": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "Promise",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 54,
-                                      "program": "async_function.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 61,
-                                      "program": "async_function.ets"
-                                    }
-                                  }
-                                },
-                                "typeParams": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "ETSUnionType",
-                                      "types": [
-                                        {
-                                          "type": "ETSTypeReference",
-                                          "part": {
-                                            "type": "ETSTypeReferencePart",
-                                            "name": {
-                                              "type": "Identifier",
-                                              "name": "Object",
-                                              "decorators": [],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 22,
-                                                  "column": 62,
-                                                  "program": "async_function.ets"
-                                                },
-                                                "end": {
-                                                  "line": 22,
-                                                  "column": 68,
-                                                  "program": "async_function.ets"
-                                                }
-                                              }
-                                            },
-                                            "loc": {
-                                              "start": {
-                                                "line": 22,
-                                                "column": 62,
-                                                "program": "async_function.ets"
-                                              },
-                                              "end": {
-                                                "line": 22,
-                                                "column": 70,
-                                                "program": "async_function.ets"
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 22,
-                                              "column": 62,
-                                              "program": "async_function.ets"
-                                            },
-                                            "end": {
-                                              "line": 22,
-                                              "column": 70,
-                                              "program": "async_function.ets"
-                                            }
-                                          }
-                                        },
-                                        {
-                                          "type": "ETSNullType",
-                                          "loc": {
-                                            "start": {
-                                              "line": 22,
-                                              "column": 71,
-                                              "program": "async_function.ets"
-                                            },
-                                            "end": {
-                                              "line": 22,
-                                              "column": 75,
-                                              "program": "async_function.ets"
-                                            }
-                                          }
-                                        }
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 22,
-                                          "column": 62,
-                                          "program": "async_function.ets"
-                                        },
-                                        "end": {
-                                          "line": 22,
-                                          "column": 75,
-                                          "program": "async_function.ets"
-                                        }
-                                      }
-                                    }
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 61,
-                                      "program": "async_function.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 76,
-                                      "program": "async_function.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 22,
-                                    "column": 54,
-                                    "program": "async_function.ets"
-                                  },
-                                  "end": {
-                                    "line": 22,
-                                    "column": 79,
-                                    "program": "async_function.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 54,
-                                  "program": "async_function.ets"
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 79,
-                                  "program": "async_function.ets"
-                                }
-                              }
-                            },
-                            "body": {
-                              "type": "BlockStatement",
-                              "statements": [
-                                {
-                                  "type": "ReturnStatement",
-                                  "argument": {
-                                    "type": "NullLiteral",
-                                    "value": null,
-                                    "loc": {
-                                      "start": {
-                                        "line": 22,
-                                        "column": 89,
-                                        "program": "async_function.ets"
-                                      },
-                                      "end": {
-                                        "line": 22,
-                                        "column": 93,
-                                        "program": "async_function.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 82,
-                                      "program": "async_function.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 94,
-                                      "program": "async_function.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 80,
-                                  "program": "async_function.ets"
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 96,
-                                  "program": "async_function.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 50,
-                                "program": "async_function.ets"
-                              },
-                              "end": {
-                                "line": 22,
-                                "column": 96,
-                                "program": "async_function.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 50,
-                              "program": "async_function.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 96,
-                              "program": "async_function.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "async_function.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 96,
-                            "program": "async_function.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "async_function.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 96,
-                          "program": "async_function.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 22,
-                      "column": 5,
-                      "program": "async_function.ets"
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 96,
-                      "program": "async_function.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 22,
-                    "column": 5,
-                    "program": "async_function.ets"
-                  },
-                  "end": {
-                    "line": 22,
-                    "column": 96,
-                    "program": "async_function.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 22,
-                  "column": 5,
-                  "program": "async_function.ets"
-                },
-                "end": {
-                  "line": 22,
-                  "column": 96,
-                  "program": "async_function.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 22,
-                "column": 5,
-                "program": "async_function.ets"
-              },
-              "end": {
-                "line": 22,
-                "column": 96,
-                "program": "async_function.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -1422,7 +1041,7 @@
               },
               "end": {
                 "line": 22,
-                "column": 96,
+                "column": 50,
                 "program": "async_function.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/async_overload-expected.txt b/ets2panda/test/parser/ets/async_overload-expected.txt
index ca6a8d918f60081a8931d442fae97edd453b6335..4cdb5686b1b5b7e0fce77b599496f970cb5d58d7 100644
--- a/ets2panda/test/parser/ets/async_overload-expected.txt
+++ b/ets2panda/test/parser/ets/async_overload-expected.txt
@@ -917,112 +917,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "async_overload.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "async_overload.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "async_overload.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "async_overload.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "async_overload.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "async_overload.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "async_overload.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "async_overload.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/async_with_lambda-expected.txt b/ets2panda/test/parser/ets/async_with_lambda-expected.txt
index 9e47c47d77fd0bc236d66dc08df2976189603faf..08200f2b383d60b2aa34e5dc85747338d190e0ec 100644
--- a/ets2panda/test/parser/ets/async_with_lambda-expected.txt
+++ b/ets2panda/test/parser/ets/async_with_lambda-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "async_with_lambda.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "async_with_lambda.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "async_with_lambda.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "async_with_lambda.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "async_with_lambda.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "async_with_lambda.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "async_with_lambda.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "async_with_lambda.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/await_complex_promise-expected.txt b/ets2panda/test/parser/ets/await_complex_promise-expected.txt
index 1b5b00439c727949848e67fce52d2f7505628202..75c3023806bf4639db1e31602d2c67785252db7b 100644
--- a/ets2panda/test/parser/ets/await_complex_promise-expected.txt
+++ b/ets2panda/test/parser/ets/await_complex_promise-expected.txt
@@ -337,112 +337,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "await_complex_promise.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "await_complex_promise.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "await_complex_promise.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "await_complex_promise.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "await_complex_promise.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "await_complex_promise.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "await_complex_promise.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "await_complex_promise.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/await_keyword-expected.txt b/ets2panda/test/parser/ets/await_keyword-expected.txt
index 250f778f4540efb374f7d1a4bd5ed9323645d903..53f6835b6a1397c55747bb558409f669305792fa 100644
--- a/ets2panda/test/parser/ets/await_keyword-expected.txt
+++ b/ets2panda/test/parser/ets/await_keyword-expected.txt
@@ -130,2014 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "asyncLambda",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "await_keyword.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 16,
-                              "program": "await_keyword.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrowFunctionExpression",
-                          "function": {
-                            "type": "ScriptFunction",
-                            "id": null,
-                            "generator": false,
-                            "async": true,
-                            "expression": false,
-                            "params": [],
-                            "returnType": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "Promise",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 59,
-                                      "program": "await_keyword.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 66,
-                                      "program": "await_keyword.ets"
-                                    }
-                                  }
-                                },
-                                "typeParams": {
-                                  "type": "TSTypeParameterInstantiation",
-                                  "params": [
-                                    {
-                                      "type": "ETSUnionType",
-                                      "types": [
-                                        {
-                                          "type": "ETSTypeReference",
-                                          "part": {
-                                            "type": "ETSTypeReferencePart",
-                                            "name": {
-                                              "type": "Identifier",
-                                              "name": "Object",
-                                              "decorators": [],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 22,
-                                                  "column": 67,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 22,
-                                                  "column": 73,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            "loc": {
-                                              "start": {
-                                                "line": 22,
-                                                "column": 67,
-                                                "program": "await_keyword.ets"
-                                              },
-                                              "end": {
-                                                "line": 22,
-                                                "column": 75,
-                                                "program": "await_keyword.ets"
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 22,
-                                              "column": 67,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 22,
-                                              "column": 75,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        {
-                                          "type": "ETSNullType",
-                                          "loc": {
-                                            "start": {
-                                              "line": 22,
-                                              "column": 76,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 22,
-                                              "column": 80,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        }
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 22,
-                                          "column": 67,
-                                          "program": "await_keyword.ets"
-                                        },
-                                        "end": {
-                                          "line": 22,
-                                          "column": 80,
-                                          "program": "await_keyword.ets"
-                                        }
-                                      }
-                                    }
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 66,
-                                      "program": "await_keyword.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 81,
-                                      "program": "await_keyword.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 22,
-                                    "column": 59,
-                                    "program": "await_keyword.ets"
-                                  },
-                                  "end": {
-                                    "line": 22,
-                                    "column": 84,
-                                    "program": "await_keyword.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 59,
-                                  "program": "await_keyword.ets"
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 84,
-                                  "program": "await_keyword.ets"
-                                }
-                              }
-                            },
-                            "body": {
-                              "type": "BlockStatement",
-                              "statements": [
-                                {
-                                  "type": "VariableDeclaration",
-                                  "declarations": [
-                                    {
-                                      "type": "VariableDeclarator",
-                                      "id": {
-                                        "type": "Identifier",
-                                        "name": "promise",
-                                        "typeAnnotation": {
-                                          "type": "ETSUnionType",
-                                          "types": [
-                                            {
-                                              "type": "ETSTypeReference",
-                                              "part": {
-                                                "type": "ETSTypeReferencePart",
-                                                "name": {
-                                                  "type": "Identifier",
-                                                  "name": "Promise",
-                                                  "decorators": [],
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 23,
-                                                      "column": 18,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 23,
-                                                      "column": 25,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                },
-                                                "typeParams": {
-                                                  "type": "TSTypeParameterInstantiation",
-                                                  "params": [
-                                                    {
-                                                      "type": "ETSUnionType",
-                                                      "types": [
-                                                        {
-                                                          "type": "ETSTypeReference",
-                                                          "part": {
-                                                            "type": "ETSTypeReferencePart",
-                                                            "name": {
-                                                              "type": "Identifier",
-                                                              "name": "Object",
-                                                              "decorators": [],
-                                                              "loc": {
-                                                                "start": {
-                                                                  "line": 23,
-                                                                  "column": 26,
-                                                                  "program": "await_keyword.ets"
-                                                                },
-                                                                "end": {
-                                                                  "line": 23,
-                                                                  "column": 32,
-                                                                  "program": "await_keyword.ets"
-                                                                }
-                                                              }
-                                                            },
-                                                            "loc": {
-                                                              "start": {
-                                                                "line": 23,
-                                                                "column": 26,
-                                                                "program": "await_keyword.ets"
-                                                              },
-                                                              "end": {
-                                                                "line": 23,
-                                                                "column": 34,
-                                                                "program": "await_keyword.ets"
-                                                              }
-                                                            }
-                                                          },
-                                                          "loc": {
-                                                            "start": {
-                                                              "line": 23,
-                                                              "column": 26,
-                                                              "program": "await_keyword.ets"
-                                                            },
-                                                            "end": {
-                                                              "line": 23,
-                                                              "column": 34,
-                                                              "program": "await_keyword.ets"
-                                                            }
-                                                          }
-                                                        },
-                                                        {
-                                                          "type": "ETSNullType",
-                                                          "loc": {
-                                                            "start": {
-                                                              "line": 23,
-                                                              "column": 35,
-                                                              "program": "await_keyword.ets"
-                                                            },
-                                                            "end": {
-                                                              "line": 23,
-                                                              "column": 39,
-                                                              "program": "await_keyword.ets"
-                                                            }
-                                                          }
-                                                        }
-                                                      ],
-                                                      "loc": {
-                                                        "start": {
-                                                          "line": 23,
-                                                          "column": 26,
-                                                          "program": "await_keyword.ets"
-                                                        },
-                                                        "end": {
-                                                          "line": 23,
-                                                          "column": 39,
-                                                          "program": "await_keyword.ets"
-                                                        }
-                                                      }
-                                                    }
-                                                  ],
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 23,
-                                                      "column": 25,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 23,
-                                                      "column": 40,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                },
-                                                "loc": {
-                                                  "start": {
-                                                    "line": 23,
-                                                    "column": 18,
-                                                    "program": "await_keyword.ets"
-                                                  },
-                                                  "end": {
-                                                    "line": 23,
-                                                    "column": 42,
-                                                    "program": "await_keyword.ets"
-                                                  }
-                                                }
-                                              },
-                                              "loc": {
-                                                "start": {
-                                                  "line": 23,
-                                                  "column": 18,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 23,
-                                                  "column": 42,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "type": "ETSNullType",
-                                              "loc": {
-                                                "start": {
-                                                  "line": 23,
-                                                  "column": 43,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 23,
-                                                  "column": 47,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            }
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 23,
-                                              "column": 18,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 23,
-                                              "column": 47,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 23,
-                                            "column": 9,
-                                            "program": "await_keyword.ets"
-                                          },
-                                          "end": {
-                                            "line": 23,
-                                            "column": 16,
-                                            "program": "await_keyword.ets"
-                                          }
-                                        }
-                                      },
-                                      "init": {
-                                        "type": "CallExpression",
-                                        "callee": {
-                                          "type": "ArrowFunctionExpression",
-                                          "function": {
-                                            "type": "ScriptFunction",
-                                            "id": null,
-                                            "generator": false,
-                                            "async": false,
-                                            "expression": false,
-                                            "params": [],
-                                            "returnType": {
-                                              "type": "ETSUnionType",
-                                              "types": [
-                                                {
-                                                  "type": "ETSTypeReference",
-                                                  "part": {
-                                                    "type": "ETSTypeReferencePart",
-                                                    "name": {
-                                                      "type": "Identifier",
-                                                      "name": "Promise",
-                                                      "decorators": [],
-                                                      "loc": {
-                                                        "start": {
-                                                          "line": 23,
-                                                          "column": 54,
-                                                          "program": "await_keyword.ets"
-                                                        },
-                                                        "end": {
-                                                          "line": 23,
-                                                          "column": 61,
-                                                          "program": "await_keyword.ets"
-                                                        }
-                                                      }
-                                                    },
-                                                    "typeParams": {
-                                                      "type": "TSTypeParameterInstantiation",
-                                                      "params": [
-                                                        {
-                                                          "type": "ETSUnionType",
-                                                          "types": [
-                                                            {
-                                                              "type": "ETSTypeReference",
-                                                              "part": {
-                                                                "type": "ETSTypeReferencePart",
-                                                                "name": {
-                                                                  "type": "Identifier",
-                                                                  "name": "Object",
-                                                                  "decorators": [],
-                                                                  "loc": {
-                                                                    "start": {
-                                                                      "line": 23,
-                                                                      "column": 62,
-                                                                      "program": "await_keyword.ets"
-                                                                    },
-                                                                    "end": {
-                                                                      "line": 23,
-                                                                      "column": 68,
-                                                                      "program": "await_keyword.ets"
-                                                                    }
-                                                                  }
-                                                                },
-                                                                "loc": {
-                                                                  "start": {
-                                                                    "line": 23,
-                                                                    "column": 62,
-                                                                    "program": "await_keyword.ets"
-                                                                  },
-                                                                  "end": {
-                                                                    "line": 23,
-                                                                    "column": 70,
-                                                                    "program": "await_keyword.ets"
-                                                                  }
-                                                                }
-                                                              },
-                                                              "loc": {
-                                                                "start": {
-                                                                  "line": 23,
-                                                                  "column": 62,
-                                                                  "program": "await_keyword.ets"
-                                                                },
-                                                                "end": {
-                                                                  "line": 23,
-                                                                  "column": 70,
-                                                                  "program": "await_keyword.ets"
-                                                                }
-                                                              }
-                                                            },
-                                                            {
-                                                              "type": "ETSNullType",
-                                                              "loc": {
-                                                                "start": {
-                                                                  "line": 23,
-                                                                  "column": 71,
-                                                                  "program": "await_keyword.ets"
-                                                                },
-                                                                "end": {
-                                                                  "line": 23,
-                                                                  "column": 75,
-                                                                  "program": "await_keyword.ets"
-                                                                }
-                                                              }
-                                                            }
-                                                          ],
-                                                          "loc": {
-                                                            "start": {
-                                                              "line": 23,
-                                                              "column": 62,
-                                                              "program": "await_keyword.ets"
-                                                            },
-                                                            "end": {
-                                                              "line": 23,
-                                                              "column": 75,
-                                                              "program": "await_keyword.ets"
-                                                            }
-                                                          }
-                                                        }
-                                                      ],
-                                                      "loc": {
-                                                        "start": {
-                                                          "line": 23,
-                                                          "column": 61,
-                                                          "program": "await_keyword.ets"
-                                                        },
-                                                        "end": {
-                                                          "line": 23,
-                                                          "column": 76,
-                                                          "program": "await_keyword.ets"
-                                                        }
-                                                      }
-                                                    },
-                                                    "loc": {
-                                                      "start": {
-                                                        "line": 23,
-                                                        "column": 54,
-                                                        "program": "await_keyword.ets"
-                                                      },
-                                                      "end": {
-                                                        "line": 23,
-                                                        "column": 78,
-                                                        "program": "await_keyword.ets"
-                                                      }
-                                                    }
-                                                  },
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 23,
-                                                      "column": 54,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 23,
-                                                      "column": 78,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                },
-                                                {
-                                                  "type": "ETSNullType",
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 23,
-                                                      "column": 79,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 23,
-                                                      "column": 83,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                }
-                                              ],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 23,
-                                                  "column": 54,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 23,
-                                                  "column": 83,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            "body": {
-                                              "type": "BlockStatement",
-                                              "statements": [
-                                                {
-                                                  "type": "ReturnStatement",
-                                                  "argument": {
-                                                    "type": "NullLiteral",
-                                                    "value": null,
-                                                    "loc": {
-                                                      "start": {
-                                                        "line": 23,
-                                                        "column": 96,
-                                                        "program": "await_keyword.ets"
-                                                      },
-                                                      "end": {
-                                                        "line": 23,
-                                                        "column": 100,
-                                                        "program": "await_keyword.ets"
-                                                      }
-                                                    }
-                                                  },
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 23,
-                                                      "column": 89,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 23,
-                                                      "column": 101,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                }
-                                              ],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 23,
-                                                  "column": 87,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 23,
-                                                  "column": 103,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            "loc": {
-                                              "start": {
-                                                "line": 23,
-                                                "column": 50,
-                                                "program": "await_keyword.ets"
-                                              },
-                                              "end": {
-                                                "line": 23,
-                                                "column": 103,
-                                                "program": "await_keyword.ets"
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 23,
-                                              "column": 50,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 23,
-                                              "column": 103,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        "arguments": [],
-                                        "optional": false,
-                                        "loc": {
-                                          "start": {
-                                            "line": 23,
-                                            "column": 50,
-                                            "program": "await_keyword.ets"
-                                          },
-                                          "end": {
-                                            "line": 23,
-                                            "column": 105,
-                                            "program": "await_keyword.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 23,
-                                          "column": 9,
-                                          "program": "await_keyword.ets"
-                                        },
-                                        "end": {
-                                          "line": 23,
-                                          "column": 105,
-                                          "program": "await_keyword.ets"
-                                        }
-                                      }
-                                    }
-                                  ],
-                                  "kind": "let",
-                                  "loc": {
-                                    "start": {
-                                      "line": 23,
-                                      "column": 5,
-                                      "program": "await_keyword.ets"
-                                    },
-                                    "end": {
-                                      "line": 23,
-                                      "column": 106,
-                                      "program": "await_keyword.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "VariableDeclaration",
-                                  "declarations": [
-                                    {
-                                      "type": "VariableDeclarator",
-                                      "id": {
-                                        "type": "Identifier",
-                                        "name": "obj",
-                                        "typeAnnotation": {
-                                          "type": "ETSUnionType",
-                                          "types": [
-                                            {
-                                              "type": "ETSTypeReference",
-                                              "part": {
-                                                "type": "ETSTypeReferencePart",
-                                                "name": {
-                                                  "type": "Identifier",
-                                                  "name": "Object",
-                                                  "decorators": [],
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 24,
-                                                      "column": 14,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 24,
-                                                      "column": 20,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                },
-                                                "loc": {
-                                                  "start": {
-                                                    "line": 24,
-                                                    "column": 14,
-                                                    "program": "await_keyword.ets"
-                                                  },
-                                                  "end": {
-                                                    "line": 24,
-                                                    "column": 22,
-                                                    "program": "await_keyword.ets"
-                                                  }
-                                                }
-                                              },
-                                              "loc": {
-                                                "start": {
-                                                  "line": 24,
-                                                  "column": 14,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 24,
-                                                  "column": 22,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "type": "ETSNullType",
-                                              "loc": {
-                                                "start": {
-                                                  "line": 24,
-                                                  "column": 23,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 24,
-                                                  "column": 27,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            }
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 24,
-                                              "column": 14,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 24,
-                                              "column": 27,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 24,
-                                            "column": 9,
-                                            "program": "await_keyword.ets"
-                                          },
-                                          "end": {
-                                            "line": 24,
-                                            "column": 12,
-                                            "program": "await_keyword.ets"
-                                          }
-                                        }
-                                      },
-                                      "init": {
-                                        "type": "AwaitExpression",
-                                        "argument": {
-                                          "type": "TSNonNullExpression",
-                                          "expression": {
-                                            "type": "Identifier",
-                                            "name": "promise",
-                                            "decorators": [],
-                                            "loc": {
-                                              "start": {
-                                                "line": 24,
-                                                "column": 36,
-                                                "program": "await_keyword.ets"
-                                              },
-                                              "end": {
-                                                "line": 24,
-                                                "column": 43,
-                                                "program": "await_keyword.ets"
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 24,
-                                              "column": 36,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 24,
-                                              "column": 44,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        "loc": {
-                                          "start": {
-                                            "line": 24,
-                                            "column": 30,
-                                            "program": "await_keyword.ets"
-                                          },
-                                          "end": {
-                                            "line": 24,
-                                            "column": 44,
-                                            "program": "await_keyword.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 24,
-                                          "column": 9,
-                                          "program": "await_keyword.ets"
-                                        },
-                                        "end": {
-                                          "line": 24,
-                                          "column": 44,
-                                          "program": "await_keyword.ets"
-                                        }
-                                      }
-                                    }
-                                  ],
-                                  "kind": "let",
-                                  "loc": {
-                                    "start": {
-                                      "line": 24,
-                                      "column": 5,
-                                      "program": "await_keyword.ets"
-                                    },
-                                    "end": {
-                                      "line": 24,
-                                      "column": 45,
-                                      "program": "await_keyword.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "ReturnStatement",
-                                  "argument": {
-                                    "type": "Identifier",
-                                    "name": "promise",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 25,
-                                        "column": 12,
-                                        "program": "await_keyword.ets"
-                                      },
-                                      "end": {
-                                        "line": 25,
-                                        "column": 19,
-                                        "program": "await_keyword.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 25,
-                                      "column": 5,
-                                      "program": "await_keyword.ets"
-                                    },
-                                    "end": {
-                                      "line": 25,
-                                      "column": 20,
-                                      "program": "await_keyword.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 85,
-                                  "program": "await_keyword.ets"
-                                },
-                                "end": {
-                                  "line": 26,
-                                  "column": 2,
-                                  "program": "await_keyword.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 55,
-                                "program": "await_keyword.ets"
-                              },
-                              "end": {
-                                "line": 26,
-                                "column": 2,
-                                "program": "await_keyword.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 55,
-                              "program": "await_keyword.ets"
-                            },
-                            "end": {
-                              "line": 26,
-                              "column": 2,
-                              "program": "await_keyword.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "await_keyword.ets"
-                          },
-                          "end": {
-                            "line": 26,
-                            "column": 2,
-                            "program": "await_keyword.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "await_keyword.ets"
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 2,
-                          "program": "await_keyword.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "lambda",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 33,
-                              "column": 5,
-                              "program": "await_keyword.ets"
-                            },
-                            "end": {
-                              "line": 33,
-                              "column": 11,
-                              "program": "await_keyword.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrowFunctionExpression",
-                          "function": {
-                            "type": "ScriptFunction",
-                            "id": null,
-                            "generator": false,
-                            "async": false,
-                            "expression": false,
-                            "params": [],
-                            "returnType": {
-                              "type": "ETSPrimitiveType",
-                              "loc": {
-                                "start": {
-                                  "line": 33,
-                                  "column": 30,
-                                  "program": "await_keyword.ets"
-                                },
-                                "end": {
-                                  "line": 33,
-                                  "column": 34,
-                                  "program": "await_keyword.ets"
-                                }
-                              }
-                            },
-                            "body": {
-                              "type": "BlockStatement",
-                              "statements": [
-                                {
-                                  "type": "VariableDeclaration",
-                                  "declarations": [
-                                    {
-                                      "type": "VariableDeclarator",
-                                      "id": {
-                                        "type": "Identifier",
-                                        "name": "promise",
-                                        "typeAnnotation": {
-                                          "type": "ETSUnionType",
-                                          "types": [
-                                            {
-                                              "type": "ETSTypeReference",
-                                              "part": {
-                                                "type": "ETSTypeReferencePart",
-                                                "name": {
-                                                  "type": "Identifier",
-                                                  "name": "Promise",
-                                                  "decorators": [],
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 34,
-                                                      "column": 18,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 34,
-                                                      "column": 25,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                },
-                                                "typeParams": {
-                                                  "type": "TSTypeParameterInstantiation",
-                                                  "params": [
-                                                    {
-                                                      "type": "ETSUnionType",
-                                                      "types": [
-                                                        {
-                                                          "type": "ETSTypeReference",
-                                                          "part": {
-                                                            "type": "ETSTypeReferencePart",
-                                                            "name": {
-                                                              "type": "Identifier",
-                                                              "name": "Object",
-                                                              "decorators": [],
-                                                              "loc": {
-                                                                "start": {
-                                                                  "line": 34,
-                                                                  "column": 26,
-                                                                  "program": "await_keyword.ets"
-                                                                },
-                                                                "end": {
-                                                                  "line": 34,
-                                                                  "column": 32,
-                                                                  "program": "await_keyword.ets"
-                                                                }
-                                                              }
-                                                            },
-                                                            "loc": {
-                                                              "start": {
-                                                                "line": 34,
-                                                                "column": 26,
-                                                                "program": "await_keyword.ets"
-                                                              },
-                                                              "end": {
-                                                                "line": 34,
-                                                                "column": 34,
-                                                                "program": "await_keyword.ets"
-                                                              }
-                                                            }
-                                                          },
-                                                          "loc": {
-                                                            "start": {
-                                                              "line": 34,
-                                                              "column": 26,
-                                                              "program": "await_keyword.ets"
-                                                            },
-                                                            "end": {
-                                                              "line": 34,
-                                                              "column": 34,
-                                                              "program": "await_keyword.ets"
-                                                            }
-                                                          }
-                                                        },
-                                                        {
-                                                          "type": "ETSNullType",
-                                                          "loc": {
-                                                            "start": {
-                                                              "line": 34,
-                                                              "column": 35,
-                                                              "program": "await_keyword.ets"
-                                                            },
-                                                            "end": {
-                                                              "line": 34,
-                                                              "column": 39,
-                                                              "program": "await_keyword.ets"
-                                                            }
-                                                          }
-                                                        }
-                                                      ],
-                                                      "loc": {
-                                                        "start": {
-                                                          "line": 34,
-                                                          "column": 26,
-                                                          "program": "await_keyword.ets"
-                                                        },
-                                                        "end": {
-                                                          "line": 34,
-                                                          "column": 39,
-                                                          "program": "await_keyword.ets"
-                                                        }
-                                                      }
-                                                    }
-                                                  ],
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 34,
-                                                      "column": 25,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 34,
-                                                      "column": 40,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                },
-                                                "loc": {
-                                                  "start": {
-                                                    "line": 34,
-                                                    "column": 18,
-                                                    "program": "await_keyword.ets"
-                                                  },
-                                                  "end": {
-                                                    "line": 34,
-                                                    "column": 42,
-                                                    "program": "await_keyword.ets"
-                                                  }
-                                                }
-                                              },
-                                              "loc": {
-                                                "start": {
-                                                  "line": 34,
-                                                  "column": 18,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 34,
-                                                  "column": 42,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "type": "ETSNullType",
-                                              "loc": {
-                                                "start": {
-                                                  "line": 34,
-                                                  "column": 43,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 34,
-                                                  "column": 47,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            }
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 34,
-                                              "column": 18,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 34,
-                                              "column": 47,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 34,
-                                            "column": 9,
-                                            "program": "await_keyword.ets"
-                                          },
-                                          "end": {
-                                            "line": 34,
-                                            "column": 16,
-                                            "program": "await_keyword.ets"
-                                          }
-                                        }
-                                      },
-                                      "init": {
-                                        "type": "CallExpression",
-                                        "callee": {
-                                          "type": "ArrowFunctionExpression",
-                                          "function": {
-                                            "type": "ScriptFunction",
-                                            "id": null,
-                                            "generator": false,
-                                            "async": false,
-                                            "expression": false,
-                                            "params": [],
-                                            "returnType": {
-                                              "type": "ETSUnionType",
-                                              "types": [
-                                                {
-                                                  "type": "ETSTypeReference",
-                                                  "part": {
-                                                    "type": "ETSTypeReferencePart",
-                                                    "name": {
-                                                      "type": "Identifier",
-                                                      "name": "Promise",
-                                                      "decorators": [],
-                                                      "loc": {
-                                                        "start": {
-                                                          "line": 34,
-                                                          "column": 54,
-                                                          "program": "await_keyword.ets"
-                                                        },
-                                                        "end": {
-                                                          "line": 34,
-                                                          "column": 61,
-                                                          "program": "await_keyword.ets"
-                                                        }
-                                                      }
-                                                    },
-                                                    "typeParams": {
-                                                      "type": "TSTypeParameterInstantiation",
-                                                      "params": [
-                                                        {
-                                                          "type": "ETSUnionType",
-                                                          "types": [
-                                                            {
-                                                              "type": "ETSTypeReference",
-                                                              "part": {
-                                                                "type": "ETSTypeReferencePart",
-                                                                "name": {
-                                                                  "type": "Identifier",
-                                                                  "name": "Object",
-                                                                  "decorators": [],
-                                                                  "loc": {
-                                                                    "start": {
-                                                                      "line": 34,
-                                                                      "column": 62,
-                                                                      "program": "await_keyword.ets"
-                                                                    },
-                                                                    "end": {
-                                                                      "line": 34,
-                                                                      "column": 68,
-                                                                      "program": "await_keyword.ets"
-                                                                    }
-                                                                  }
-                                                                },
-                                                                "loc": {
-                                                                  "start": {
-                                                                    "line": 34,
-                                                                    "column": 62,
-                                                                    "program": "await_keyword.ets"
-                                                                  },
-                                                                  "end": {
-                                                                    "line": 34,
-                                                                    "column": 70,
-                                                                    "program": "await_keyword.ets"
-                                                                  }
-                                                                }
-                                                              },
-                                                              "loc": {
-                                                                "start": {
-                                                                  "line": 34,
-                                                                  "column": 62,
-                                                                  "program": "await_keyword.ets"
-                                                                },
-                                                                "end": {
-                                                                  "line": 34,
-                                                                  "column": 70,
-                                                                  "program": "await_keyword.ets"
-                                                                }
-                                                              }
-                                                            },
-                                                            {
-                                                              "type": "ETSNullType",
-                                                              "loc": {
-                                                                "start": {
-                                                                  "line": 34,
-                                                                  "column": 71,
-                                                                  "program": "await_keyword.ets"
-                                                                },
-                                                                "end": {
-                                                                  "line": 34,
-                                                                  "column": 75,
-                                                                  "program": "await_keyword.ets"
-                                                                }
-                                                              }
-                                                            }
-                                                          ],
-                                                          "loc": {
-                                                            "start": {
-                                                              "line": 34,
-                                                              "column": 62,
-                                                              "program": "await_keyword.ets"
-                                                            },
-                                                            "end": {
-                                                              "line": 34,
-                                                              "column": 75,
-                                                              "program": "await_keyword.ets"
-                                                            }
-                                                          }
-                                                        }
-                                                      ],
-                                                      "loc": {
-                                                        "start": {
-                                                          "line": 34,
-                                                          "column": 61,
-                                                          "program": "await_keyword.ets"
-                                                        },
-                                                        "end": {
-                                                          "line": 34,
-                                                          "column": 76,
-                                                          "program": "await_keyword.ets"
-                                                        }
-                                                      }
-                                                    },
-                                                    "loc": {
-                                                      "start": {
-                                                        "line": 34,
-                                                        "column": 54,
-                                                        "program": "await_keyword.ets"
-                                                      },
-                                                      "end": {
-                                                        "line": 34,
-                                                        "column": 78,
-                                                        "program": "await_keyword.ets"
-                                                      }
-                                                    }
-                                                  },
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 34,
-                                                      "column": 54,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 34,
-                                                      "column": 78,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                },
-                                                {
-                                                  "type": "ETSNullType",
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 34,
-                                                      "column": 79,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 34,
-                                                      "column": 83,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                }
-                                              ],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 34,
-                                                  "column": 54,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 34,
-                                                  "column": 83,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            "body": {
-                                              "type": "BlockStatement",
-                                              "statements": [
-                                                {
-                                                  "type": "ReturnStatement",
-                                                  "argument": {
-                                                    "type": "NullLiteral",
-                                                    "value": null,
-                                                    "loc": {
-                                                      "start": {
-                                                        "line": 34,
-                                                        "column": 96,
-                                                        "program": "await_keyword.ets"
-                                                      },
-                                                      "end": {
-                                                        "line": 34,
-                                                        "column": 100,
-                                                        "program": "await_keyword.ets"
-                                                      }
-                                                    }
-                                                  },
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 34,
-                                                      "column": 89,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 34,
-                                                      "column": 101,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                }
-                                              ],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 34,
-                                                  "column": 87,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 34,
-                                                  "column": 103,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            "loc": {
-                                              "start": {
-                                                "line": 34,
-                                                "column": 50,
-                                                "program": "await_keyword.ets"
-                                              },
-                                              "end": {
-                                                "line": 34,
-                                                "column": 103,
-                                                "program": "await_keyword.ets"
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 34,
-                                              "column": 50,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 34,
-                                              "column": 103,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        "arguments": [],
-                                        "optional": false,
-                                        "loc": {
-                                          "start": {
-                                            "line": 34,
-                                            "column": 50,
-                                            "program": "await_keyword.ets"
-                                          },
-                                          "end": {
-                                            "line": 34,
-                                            "column": 105,
-                                            "program": "await_keyword.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 34,
-                                          "column": 9,
-                                          "program": "await_keyword.ets"
-                                        },
-                                        "end": {
-                                          "line": 34,
-                                          "column": 105,
-                                          "program": "await_keyword.ets"
-                                        }
-                                      }
-                                    }
-                                  ],
-                                  "kind": "let",
-                                  "loc": {
-                                    "start": {
-                                      "line": 34,
-                                      "column": 5,
-                                      "program": "await_keyword.ets"
-                                    },
-                                    "end": {
-                                      "line": 34,
-                                      "column": 106,
-                                      "program": "await_keyword.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "VariableDeclaration",
-                                  "declarations": [
-                                    {
-                                      "type": "VariableDeclarator",
-                                      "id": {
-                                        "type": "Identifier",
-                                        "name": "obj",
-                                        "typeAnnotation": {
-                                          "type": "ETSUnionType",
-                                          "types": [
-                                            {
-                                              "type": "ETSTypeReference",
-                                              "part": {
-                                                "type": "ETSTypeReferencePart",
-                                                "name": {
-                                                  "type": "Identifier",
-                                                  "name": "Object",
-                                                  "decorators": [],
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 35,
-                                                      "column": 14,
-                                                      "program": "await_keyword.ets"
-                                                    },
-                                                    "end": {
-                                                      "line": 35,
-                                                      "column": 20,
-                                                      "program": "await_keyword.ets"
-                                                    }
-                                                  }
-                                                },
-                                                "loc": {
-                                                  "start": {
-                                                    "line": 35,
-                                                    "column": 14,
-                                                    "program": "await_keyword.ets"
-                                                  },
-                                                  "end": {
-                                                    "line": 35,
-                                                    "column": 22,
-                                                    "program": "await_keyword.ets"
-                                                  }
-                                                }
-                                              },
-                                              "loc": {
-                                                "start": {
-                                                  "line": 35,
-                                                  "column": 14,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 35,
-                                                  "column": 22,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            },
-                                            {
-                                              "type": "ETSNullType",
-                                              "loc": {
-                                                "start": {
-                                                  "line": 35,
-                                                  "column": 23,
-                                                  "program": "await_keyword.ets"
-                                                },
-                                                "end": {
-                                                  "line": 35,
-                                                  "column": 27,
-                                                  "program": "await_keyword.ets"
-                                                }
-                                              }
-                                            }
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 35,
-                                              "column": 14,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 35,
-                                              "column": 27,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 35,
-                                            "column": 9,
-                                            "program": "await_keyword.ets"
-                                          },
-                                          "end": {
-                                            "line": 35,
-                                            "column": 12,
-                                            "program": "await_keyword.ets"
-                                          }
-                                        }
-                                      },
-                                      "init": {
-                                        "type": "AwaitExpression",
-                                        "argument": {
-                                          "type": "TSNonNullExpression",
-                                          "expression": {
-                                            "type": "Identifier",
-                                            "name": "promise",
-                                            "decorators": [],
-                                            "loc": {
-                                              "start": {
-                                                "line": 35,
-                                                "column": 36,
-                                                "program": "await_keyword.ets"
-                                              },
-                                              "end": {
-                                                "line": 35,
-                                                "column": 43,
-                                                "program": "await_keyword.ets"
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 35,
-                                              "column": 36,
-                                              "program": "await_keyword.ets"
-                                            },
-                                            "end": {
-                                              "line": 35,
-                                              "column": 44,
-                                              "program": "await_keyword.ets"
-                                            }
-                                          }
-                                        },
-                                        "loc": {
-                                          "start": {
-                                            "line": 35,
-                                            "column": 30,
-                                            "program": "await_keyword.ets"
-                                          },
-                                          "end": {
-                                            "line": 35,
-                                            "column": 44,
-                                            "program": "await_keyword.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 35,
-                                          "column": 9,
-                                          "program": "await_keyword.ets"
-                                        },
-                                        "end": {
-                                          "line": 35,
-                                          "column": 44,
-                                          "program": "await_keyword.ets"
-                                        }
-                                      }
-                                    }
-                                  ],
-                                  "kind": "let",
-                                  "loc": {
-                                    "start": {
-                                      "line": 35,
-                                      "column": 5,
-                                      "program": "await_keyword.ets"
-                                    },
-                                    "end": {
-                                      "line": 35,
-                                      "column": 45,
-                                      "program": "await_keyword.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 33,
-                                  "column": 38,
-                                  "program": "await_keyword.ets"
-                                },
-                                "end": {
-                                  "line": 36,
-                                  "column": 2,
-                                  "program": "await_keyword.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 33,
-                                "column": 26,
-                                "program": "await_keyword.ets"
-                              },
-                              "end": {
-                                "line": 36,
-                                "column": 2,
-                                "program": "await_keyword.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 33,
-                              "column": 26,
-                              "program": "await_keyword.ets"
-                            },
-                            "end": {
-                              "line": 36,
-                              "column": 2,
-                              "program": "await_keyword.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 33,
-                            "column": 5,
-                            "program": "await_keyword.ets"
-                          },
-                          "end": {
-                            "line": 36,
-                            "column": 2,
-                            "program": "await_keyword.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 33,
-                          "column": 5,
-                          "program": "await_keyword.ets"
-                        },
-                        "end": {
-                          "line": 36,
-                          "column": 2,
-                          "program": "await_keyword.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "promise",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 38,
-                              "column": 5,
-                              "program": "await_keyword.ets"
-                            },
-                            "end": {
-                              "line": 38,
-                              "column": 12,
-                              "program": "await_keyword.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NullLiteral",
-                          "value": null,
-                          "loc": {
-                            "start": {
-                              "line": 38,
-                              "column": 46,
-                              "program": "await_keyword.ets"
-                            },
-                            "end": {
-                              "line": 38,
-                              "column": 50,
-                              "program": "await_keyword.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 38,
-                            "column": 5,
-                            "program": "await_keyword.ets"
-                          },
-                          "end": {
-                            "line": 38,
-                            "column": 50,
-                            "program": "await_keyword.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 38,
-                          "column": 5,
-                          "program": "await_keyword.ets"
-                        },
-                        "end": {
-                          "line": 38,
-                          "column": 50,
-                          "program": "await_keyword.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "obj",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 39,
-                              "column": 5,
-                              "program": "await_keyword.ets"
-                            },
-                            "end": {
-                              "line": 39,
-                              "column": 8,
-                              "program": "await_keyword.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "AwaitExpression",
-                          "argument": {
-                            "type": "TSNonNullExpression",
-                            "expression": {
-                              "type": "Identifier",
-                              "name": "promise",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 39,
-                                  "column": 32,
-                                  "program": "await_keyword.ets"
-                                },
-                                "end": {
-                                  "line": 39,
-                                  "column": 39,
-                                  "program": "await_keyword.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 39,
-                                "column": 32,
-                                "program": "await_keyword.ets"
-                              },
-                              "end": {
-                                "line": 39,
-                                "column": 40,
-                                "program": "await_keyword.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 39,
-                              "column": 26,
-                              "program": "await_keyword.ets"
-                            },
-                            "end": {
-                              "line": 39,
-                              "column": 40,
-                              "program": "await_keyword.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 39,
-                            "column": 5,
-                            "program": "await_keyword.ets"
-                          },
-                          "end": {
-                            "line": 39,
-                            "column": 40,
-                            "program": "await_keyword.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 5,
-                          "program": "await_keyword.ets"
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 40,
-                          "program": "await_keyword.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 22,
-                      "column": 5,
-                      "program": "await_keyword.ets"
-                    },
-                    "end": {
-                      "line": 39,
-                      "column": 40,
-                      "program": "await_keyword.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 22,
-                    "column": 5,
-                    "program": "await_keyword.ets"
-                  },
-                  "end": {
-                    "line": 39,
-                    "column": 40,
-                    "program": "await_keyword.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 22,
-                  "column": 5,
-                  "program": "await_keyword.ets"
-                },
-                "end": {
-                  "line": 39,
-                  "column": 40,
-                  "program": "await_keyword.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 22,
-                "column": 5,
-                "program": "await_keyword.ets"
-              },
-              "end": {
-                "line": 39,
-                "column": 40,
-                "program": "await_keyword.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -3289,8 +1281,8 @@
                 "program": "await_keyword.ets"
               },
               "end": {
-                "line": 26,
-                "column": 2,
+                "line": 22,
+                "column": 55,
                 "program": "await_keyword.ets"
               }
             }
@@ -4158,8 +2150,8 @@
                 "program": "await_keyword.ets"
               },
               "end": {
-                "line": 36,
-                "column": 2,
+                "line": 33,
+                "column": 26,
                 "program": "await_keyword.ets"
               }
             }
@@ -4374,7 +2366,7 @@
               },
               "end": {
                 "line": 38,
-                "column": 50,
+                "column": 46,
                 "program": "await_keyword.ets"
               }
             }
@@ -4493,7 +2485,7 @@
               },
               "end": {
                 "line": 39,
-                "column": 40,
+                "column": 26,
                 "program": "await_keyword.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/binary_op-expected.txt b/ets2panda/test/parser/ets/binary_op-expected.txt
index f4bf9db30e5338a17104e70bbcb55ffa3fef1f8a..779d29a52a25aee9bcff5595263c1e5654940656 100644
--- a/ets2panda/test/parser/ets/binary_op-expected.txt
+++ b/ets2panda/test/parser/ets/binary_op-expected.txt
@@ -130,5718 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 10,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 10,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 10,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "j",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 2,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 10,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 10,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 10,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b1",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 7,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BooleanLiteral",
-                          "value": true,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 10,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 14,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 14,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 14,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 7,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BooleanLiteral",
-                          "value": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 10,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 15,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 15,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 15,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "r1",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 7,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "Object",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 14,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 20,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 14,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 21,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 14,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 21,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 10,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 23,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 23,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 23,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "r2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 7,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NullLiteral",
-                          "value": null,
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 25,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 29,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 29,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 29,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "r3",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 25,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 25,
-                              "column": 7,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "??",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "r1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 25,
-                                "column": 10,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 25,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "r2",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 25,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 25,
-                                "column": 18,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 25,
-                              "column": 10,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 25,
-                              "column": 18,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 25,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 25,
-                            "column": 18,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 18,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "r4",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 26,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 26,
-                              "column": 7,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "??",
-                          "left": {
-                            "type": "LogicalExpression",
-                            "operator": "??",
-                            "left": {
-                              "type": "Identifier",
-                              "name": "r1",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 26,
-                                  "column": 10,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 26,
-                                  "column": 12,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "r2",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 26,
-                                  "column": 16,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 26,
-                                  "column": 18,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 26,
-                                "column": 10,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 26,
-                                "column": 18,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "r3",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 26,
-                                "column": 22,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 26,
-                                "column": 24,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 26,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 26,
-                              "column": 24,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 26,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 26,
-                            "column": 24,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 24,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b01",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 29,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 29,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "&&",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "b1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 29,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 29,
-                                "column": 13,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "b2",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 29,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 29,
-                                "column": 19,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 29,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 29,
-                              "column": 19,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 29,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 29,
-                            "column": 19,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 19,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b02",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 30,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 30,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "||",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "b1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 30,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 30,
-                                "column": 13,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "b2",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 30,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 30,
-                                "column": 19,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 30,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 30,
-                              "column": 19,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 30,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 30,
-                            "column": 19,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 19,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b03",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 31,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 31,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "&&",
-                          "left": {
-                            "type": "LogicalExpression",
-                            "operator": "&&",
-                            "left": {
-                              "type": "LogicalExpression",
-                              "operator": "&&",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "b1",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 31,
-                                    "column": 11,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 31,
-                                    "column": 13,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "b2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 31,
-                                    "column": 17,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 31,
-                                    "column": 19,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 31,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 31,
-                                  "column": 19,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "b01",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 31,
-                                  "column": 23,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 31,
-                                  "column": 26,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 31,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 31,
-                                "column": 26,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "b02",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 31,
-                                "column": 30,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 31,
-                                "column": 33,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 31,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 31,
-                              "column": 33,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 31,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 31,
-                            "column": 33,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 31,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 31,
-                          "column": 33,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b04",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 32,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 32,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "||",
-                          "left": {
-                            "type": "LogicalExpression",
-                            "operator": "||",
-                            "left": {
-                              "type": "LogicalExpression",
-                              "operator": "||",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "b1",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 32,
-                                    "column": 11,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 32,
-                                    "column": 13,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "b2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 32,
-                                    "column": 17,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 32,
-                                    "column": 19,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 32,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 32,
-                                  "column": 19,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "b01",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 32,
-                                  "column": 23,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 32,
-                                  "column": 26,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 32,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 32,
-                                "column": 26,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "b02",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 32,
-                                "column": 30,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 32,
-                                "column": 33,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 32,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 32,
-                              "column": 33,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 32,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 32,
-                            "column": 33,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 33,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b05",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 33,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 33,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "||",
-                          "left": {
-                            "type": "LogicalExpression",
-                            "operator": "||",
-                            "left": {
-                              "type": "LogicalExpression",
-                              "operator": "&&",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "b1",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 33,
-                                    "column": 11,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 33,
-                                    "column": 13,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "b2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 33,
-                                    "column": 17,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 33,
-                                    "column": 19,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 33,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 33,
-                                  "column": 19,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "b01",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 33,
-                                  "column": 23,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 33,
-                                  "column": 26,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 33,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 33,
-                                "column": 26,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "b02",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 33,
-                                "column": 30,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 33,
-                                "column": 33,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 33,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 33,
-                              "column": 33,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 33,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 33,
-                            "column": 33,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 33,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 33,
-                          "column": 33,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b06",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 34,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 34,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "||",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "b1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 34,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 34,
-                                "column": 13,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "LogicalExpression",
-                            "operator": "&&",
-                            "left": {
-                              "type": "LogicalExpression",
-                              "operator": "&&",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "b2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 34,
-                                    "column": 17,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 34,
-                                    "column": 19,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "b01",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 34,
-                                    "column": 23,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 34,
-                                    "column": 26,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 34,
-                                  "column": 17,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 34,
-                                  "column": 26,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "b02",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 34,
-                                  "column": 30,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 34,
-                                  "column": 33,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 34,
-                                "column": 23,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 34,
-                                "column": 33,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 34,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 34,
-                              "column": 33,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 34,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 34,
-                            "column": 33,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 34,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 34,
-                          "column": 33,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i01",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 37,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 37,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "&",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 37,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 37,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 37,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 37,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 37,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 37,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 37,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 37,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 37,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 37,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i02",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 38,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 38,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "^",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 38,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 38,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 38,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 38,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 38,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 38,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 38,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 38,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 38,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 38,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i03",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 39,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 39,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "|",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 39,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 39,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 39,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 39,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 39,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 39,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 39,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 39,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i04",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 40,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 40,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "|",
-                          "left": {
-                            "type": "BinaryExpression",
-                            "operator": "^",
-                            "left": {
-                              "type": "BinaryExpression",
-                              "operator": "&",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "i",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 40,
-                                    "column": 11,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 40,
-                                    "column": 12,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "j",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 40,
-                                    "column": 15,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 40,
-                                    "column": 16,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 40,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 40,
-                                  "column": 16,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "BinaryExpression",
-                              "operator": "&",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "i",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 40,
-                                    "column": 19,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 40,
-                                    "column": 20,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "j",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 40,
-                                    "column": 23,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 40,
-                                    "column": 24,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 40,
-                                  "column": 19,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 40,
-                                  "column": 24,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 40,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 40,
-                                "column": 24,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "BinaryExpression",
-                            "operator": "^",
-                            "left": {
-                              "type": "Identifier",
-                              "name": "i",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 40,
-                                  "column": 27,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 40,
-                                  "column": 28,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "j",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 40,
-                                  "column": 31,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 40,
-                                  "column": 32,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 40,
-                                "column": 27,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 40,
-                                "column": 32,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 40,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 40,
-                              "column": 32,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 40,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 40,
-                            "column": 32,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 40,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 40,
-                          "column": 32,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b07",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 43,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 43,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "!=",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 43,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 43,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 43,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 43,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 43,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 43,
-                              "column": 17,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 43,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 43,
-                            "column": 17,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 43,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 43,
-                          "column": 17,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b08",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 44,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 44,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "==",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 44,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 44,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 44,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 44,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 44,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 44,
-                              "column": 17,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 44,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 44,
-                            "column": 17,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 44,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 44,
-                          "column": 17,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b09",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 45,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 45,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "!==",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "r1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 45,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 45,
-                                "column": 13,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "r2",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 45,
-                                "column": 18,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 45,
-                                "column": 20,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 45,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 45,
-                              "column": 20,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 45,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 45,
-                            "column": 20,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 45,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 45,
-                          "column": 20,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b10",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 46,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 46,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "===",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "r1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 46,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 46,
-                                "column": 13,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "r2",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 46,
-                                "column": 18,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 46,
-                                "column": 20,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 46,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 46,
-                              "column": 20,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 46,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 46,
-                            "column": 20,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 46,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 46,
-                          "column": 20,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b12",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 49,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 49,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "<",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 49,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 49,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 49,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 49,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 49,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 49,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 49,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 49,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 49,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 49,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b13",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 50,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 50,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": ">",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 50,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 50,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 50,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 50,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 50,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 50,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 50,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 50,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 50,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 50,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b14",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 51,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 51,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "<=",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 51,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 51,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 51,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 51,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 51,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 51,
-                              "column": 17,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 51,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 51,
-                            "column": 17,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 51,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 51,
-                          "column": 17,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b15",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 52,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 52,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": ">=",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 52,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 52,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 52,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 52,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 52,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 52,
-                              "column": 17,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 52,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 52,
-                            "column": 17,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 52,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 52,
-                          "column": 17,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b16",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 53,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 53,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "instanceof",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "r1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 53,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 53,
-                                "column": 13,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "Object",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 53,
-                                    "column": 25,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 53,
-                                    "column": 31,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 53,
-                                  "column": 25,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 53,
-                                  "column": 32,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 53,
-                                "column": 25,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 53,
-                                "column": 32,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 53,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 53,
-                              "column": 32,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 53,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 53,
-                            "column": 32,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 53,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 53,
-                          "column": 32,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b17",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 56,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 56,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": ">>",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 56,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 56,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 56,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 56,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 56,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 56,
-                              "column": 17,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 56,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 56,
-                            "column": 17,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 56,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 56,
-                          "column": 17,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b18",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 57,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 57,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "<<",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 57,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 57,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 57,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 57,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 57,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 57,
-                              "column": 17,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 57,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 57,
-                            "column": 17,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 57,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 57,
-                          "column": 17,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b19",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 58,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 58,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": ">>>",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 58,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 58,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 58,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 58,
-                                "column": 18,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 58,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 58,
-                              "column": 18,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 58,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 58,
-                            "column": 18,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 58,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 58,
-                          "column": 18,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b20",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 59,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 59,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": ">>>",
-                          "left": {
-                            "type": "BinaryExpression",
-                            "operator": "<<",
-                            "left": {
-                              "type": "BinaryExpression",
-                              "operator": ">>",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "i",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 59,
-                                    "column": 11,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 59,
-                                    "column": 12,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "j",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 59,
-                                    "column": 16,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 59,
-                                    "column": 17,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 59,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 59,
-                                  "column": 17,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "i",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 59,
-                                  "column": 21,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 59,
-                                  "column": 22,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 59,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 59,
-                                "column": 22,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 59,
-                                "column": 27,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 59,
-                                "column": 28,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 59,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 59,
-                              "column": 28,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 59,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 59,
-                            "column": 28,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 59,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 59,
-                          "column": 28,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i05",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 62,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 62,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "+",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 62,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 62,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 62,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 62,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 62,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 62,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 62,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 62,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 62,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 62,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i06",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 63,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 63,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "-",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 63,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 63,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 63,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 63,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 63,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 63,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 63,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 63,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 63,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 63,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i07",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 64,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 64,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "+",
-                          "left": {
-                            "type": "BinaryExpression",
-                            "operator": "-",
-                            "left": {
-                              "type": "BinaryExpression",
-                              "operator": "+",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "i",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 64,
-                                    "column": 11,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 64,
-                                    "column": 12,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "j",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 64,
-                                    "column": 15,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 64,
-                                    "column": 16,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 64,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 64,
-                                  "column": 16,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "i",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 64,
-                                  "column": 19,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 64,
-                                  "column": 20,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 64,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 64,
-                                "column": 20,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 64,
-                                "column": 23,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 64,
-                                "column": 24,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 64,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 64,
-                              "column": 24,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 64,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 64,
-                            "column": 24,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 64,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 64,
-                          "column": 24,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i08",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 67,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 67,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "*",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 67,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 67,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 67,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 67,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 67,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 67,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 67,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 67,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 67,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 67,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i09",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 68,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 68,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "/",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 68,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 68,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 68,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 68,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 68,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 68,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 68,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 68,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 68,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 68,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i10",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 69,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 69,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "%",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "i",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 69,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 69,
-                                "column": 12,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 69,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 69,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 69,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 69,
-                              "column": 16,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 69,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 69,
-                            "column": 16,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 69,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 69,
-                          "column": 16,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "i11",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 70,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 70,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": "/",
-                          "left": {
-                            "type": "BinaryExpression",
-                            "operator": "*",
-                            "left": {
-                              "type": "BinaryExpression",
-                              "operator": "%",
-                              "left": {
-                                "type": "BinaryExpression",
-                                "operator": "/",
-                                "left": {
-                                  "type": "BinaryExpression",
-                                  "operator": "*",
-                                  "left": {
-                                    "type": "Identifier",
-                                    "name": "i",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 70,
-                                        "column": 11,
-                                        "program": "binary_op.ets"
-                                      },
-                                      "end": {
-                                        "line": 70,
-                                        "column": 12,
-                                        "program": "binary_op.ets"
-                                      }
-                                    }
-                                  },
-                                  "right": {
-                                    "type": "Identifier",
-                                    "name": "j",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 70,
-                                        "column": 15,
-                                        "program": "binary_op.ets"
-                                      },
-                                      "end": {
-                                        "line": 70,
-                                        "column": 16,
-                                        "program": "binary_op.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 70,
-                                      "column": 11,
-                                      "program": "binary_op.ets"
-                                    },
-                                    "end": {
-                                      "line": 70,
-                                      "column": 16,
-                                      "program": "binary_op.ets"
-                                    }
-                                  }
-                                },
-                                "right": {
-                                  "type": "Identifier",
-                                  "name": "i",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 70,
-                                      "column": 19,
-                                      "program": "binary_op.ets"
-                                    },
-                                    "end": {
-                                      "line": 70,
-                                      "column": 20,
-                                      "program": "binary_op.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 70,
-                                    "column": 15,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 70,
-                                    "column": 20,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "j",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 70,
-                                    "column": 23,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 70,
-                                    "column": 24,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 70,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 70,
-                                  "column": 24,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "i",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 70,
-                                  "column": 27,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 70,
-                                  "column": 28,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 70,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 70,
-                                "column": 28,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "j",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 70,
-                                "column": 31,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 70,
-                                "column": 32,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 70,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 70,
-                              "column": 32,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 70,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 70,
-                            "column": 32,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 70,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 70,
-                          "column": 32,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b21",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 73,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 73,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BinaryExpression",
-                          "operator": ">>>",
-                          "left": {
-                            "type": "BinaryExpression",
-                            "operator": "*",
-                            "left": {
-                              "type": "Identifier",
-                              "name": "i",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 73,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 73,
-                                  "column": 12,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "j",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 73,
-                                  "column": 15,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 73,
-                                  "column": 16,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 73,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 73,
-                                "column": 16,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "BinaryExpression",
-                            "operator": "-",
-                            "left": {
-                              "type": "Identifier",
-                              "name": "i",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 73,
-                                  "column": 21,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 73,
-                                  "column": 22,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "j",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 73,
-                                  "column": 25,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 73,
-                                  "column": 26,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 73,
-                                "column": 21,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 73,
-                                "column": 26,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 73,
-                              "column": 15,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 73,
-                              "column": 26,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 73,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 73,
-                            "column": 26,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 73,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 73,
-                          "column": 26,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b22",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 74,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 74,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "||",
-                          "left": {
-                            "type": "LogicalExpression",
-                            "operator": "&&",
-                            "left": {
-                              "type": "BinaryExpression",
-                              "operator": ">",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "i",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 74,
-                                    "column": 11,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 74,
-                                    "column": 12,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "j",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 74,
-                                    "column": 15,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 74,
-                                    "column": 16,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 74,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 74,
-                                  "column": 16,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "b1",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 74,
-                                  "column": 20,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 74,
-                                  "column": 22,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 74,
-                                "column": 15,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 74,
-                                "column": 22,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "b2",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 74,
-                                "column": 26,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 74,
-                                "column": 28,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 74,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 74,
-                              "column": 28,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 74,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 74,
-                            "column": 28,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 74,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 74,
-                          "column": 28,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b23",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 75,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 75,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "||",
-                          "left": {
-                            "type": "LogicalExpression",
-                            "operator": "&&",
-                            "left": {
-                              "type": "BinaryExpression",
-                              "operator": "|",
-                              "left": {
-                                "type": "BinaryExpression",
-                                "operator": "^",
-                                "left": {
-                                  "type": "BinaryExpression",
-                                  "operator": "&",
-                                  "left": {
-                                    "type": "BinaryExpression",
-                                    "operator": "!=",
-                                    "left": {
-                                      "type": "BinaryExpression",
-                                      "operator": "<",
-                                      "left": {
-                                        "type": "BinaryExpression",
-                                        "operator": ">>",
-                                        "left": {
-                                          "type": "BinaryExpression",
-                                          "operator": "+",
-                                          "left": {
-                                            "type": "BinaryExpression",
-                                            "operator": "*",
-                                            "left": {
-                                              "type": "Identifier",
-                                              "name": "i",
-                                              "decorators": [],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 75,
-                                                  "column": 11,
-                                                  "program": "binary_op.ets"
-                                                },
-                                                "end": {
-                                                  "line": 75,
-                                                  "column": 12,
-                                                  "program": "binary_op.ets"
-                                                }
-                                              }
-                                            },
-                                            "right": {
-                                              "type": "Identifier",
-                                              "name": "j",
-                                              "decorators": [],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 75,
-                                                  "column": 15,
-                                                  "program": "binary_op.ets"
-                                                },
-                                                "end": {
-                                                  "line": 75,
-                                                  "column": 16,
-                                                  "program": "binary_op.ets"
-                                                }
-                                              }
-                                            },
-                                            "loc": {
-                                              "start": {
-                                                "line": 75,
-                                                "column": 11,
-                                                "program": "binary_op.ets"
-                                              },
-                                              "end": {
-                                                "line": 75,
-                                                "column": 16,
-                                                "program": "binary_op.ets"
-                                              }
-                                            }
-                                          },
-                                          "right": {
-                                            "type": "Identifier",
-                                            "name": "i",
-                                            "decorators": [],
-                                            "loc": {
-                                              "start": {
-                                                "line": 75,
-                                                "column": 19,
-                                                "program": "binary_op.ets"
-                                              },
-                                              "end": {
-                                                "line": 75,
-                                                "column": 20,
-                                                "program": "binary_op.ets"
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 75,
-                                              "column": 15,
-                                              "program": "binary_op.ets"
-                                            },
-                                            "end": {
-                                              "line": 75,
-                                              "column": 20,
-                                              "program": "binary_op.ets"
-                                            }
-                                          }
-                                        },
-                                        "right": {
-                                          "type": "Identifier",
-                                          "name": "j",
-                                          "decorators": [],
-                                          "loc": {
-                                            "start": {
-                                              "line": 75,
-                                              "column": 24,
-                                              "program": "binary_op.ets"
-                                            },
-                                            "end": {
-                                              "line": 75,
-                                              "column": 25,
-                                              "program": "binary_op.ets"
-                                            }
-                                          }
-                                        },
-                                        "loc": {
-                                          "start": {
-                                            "line": 75,
-                                            "column": 11,
-                                            "program": "binary_op.ets"
-                                          },
-                                          "end": {
-                                            "line": 75,
-                                            "column": 25,
-                                            "program": "binary_op.ets"
-                                          }
-                                        }
-                                      },
-                                      "right": {
-                                        "type": "Identifier",
-                                        "name": "i",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 75,
-                                            "column": 28,
-                                            "program": "binary_op.ets"
-                                          },
-                                          "end": {
-                                            "line": 75,
-                                            "column": 29,
-                                            "program": "binary_op.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 75,
-                                          "column": 11,
-                                          "program": "binary_op.ets"
-                                        },
-                                        "end": {
-                                          "line": 75,
-                                          "column": 29,
-                                          "program": "binary_op.ets"
-                                        }
-                                      }
-                                    },
-                                    "right": {
-                                      "type": "Identifier",
-                                      "name": "b1",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 75,
-                                          "column": 33,
-                                          "program": "binary_op.ets"
-                                        },
-                                        "end": {
-                                          "line": 75,
-                                          "column": 35,
-                                          "program": "binary_op.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 75,
-                                        "column": 11,
-                                        "program": "binary_op.ets"
-                                      },
-                                      "end": {
-                                        "line": 75,
-                                        "column": 35,
-                                        "program": "binary_op.ets"
-                                      }
-                                    }
-                                  },
-                                  "right": {
-                                    "type": "Identifier",
-                                    "name": "b2",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 75,
-                                        "column": 38,
-                                        "program": "binary_op.ets"
-                                      },
-                                      "end": {
-                                        "line": 75,
-                                        "column": 40,
-                                        "program": "binary_op.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 75,
-                                      "column": 11,
-                                      "program": "binary_op.ets"
-                                    },
-                                    "end": {
-                                      "line": 75,
-                                      "column": 40,
-                                      "program": "binary_op.ets"
-                                    }
-                                  }
-                                },
-                                "right": {
-                                  "type": "Identifier",
-                                  "name": "b1",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 75,
-                                      "column": 43,
-                                      "program": "binary_op.ets"
-                                    },
-                                    "end": {
-                                      "line": 75,
-                                      "column": 45,
-                                      "program": "binary_op.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 75,
-                                    "column": 11,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 75,
-                                    "column": 45,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "b2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 75,
-                                    "column": 48,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 75,
-                                    "column": 50,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 75,
-                                  "column": 11,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 75,
-                                  "column": 50,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "b1",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 75,
-                                  "column": 54,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 75,
-                                  "column": 56,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 75,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 75,
-                                "column": 56,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "Identifier",
-                            "name": "b2",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 75,
-                                "column": 60,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 75,
-                                "column": 62,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 75,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 75,
-                              "column": 62,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 75,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 75,
-                            "column": 62,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 75,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 75,
-                          "column": 62,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b24",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 76,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 76,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "||",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "b1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 76,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 76,
-                                "column": 13,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "LogicalExpression",
-                            "operator": "&&",
-                            "left": {
-                              "type": "Identifier",
-                              "name": "b2",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 76,
-                                  "column": 17,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 76,
-                                  "column": 19,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "BinaryExpression",
-                              "operator": "|",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "b1",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 76,
-                                    "column": 23,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 76,
-                                    "column": 25,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "BinaryExpression",
-                                "operator": "^",
-                                "left": {
-                                  "type": "Identifier",
-                                  "name": "b2",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 76,
-                                      "column": 28,
-                                      "program": "binary_op.ets"
-                                    },
-                                    "end": {
-                                      "line": 76,
-                                      "column": 30,
-                                      "program": "binary_op.ets"
-                                    }
-                                  }
-                                },
-                                "right": {
-                                  "type": "BinaryExpression",
-                                  "operator": "&",
-                                  "left": {
-                                    "type": "Identifier",
-                                    "name": "b1",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 76,
-                                        "column": 33,
-                                        "program": "binary_op.ets"
-                                      },
-                                      "end": {
-                                        "line": 76,
-                                        "column": 35,
-                                        "program": "binary_op.ets"
-                                      }
-                                    }
-                                  },
-                                  "right": {
-                                    "type": "BinaryExpression",
-                                    "operator": "==",
-                                    "left": {
-                                      "type": "Identifier",
-                                      "name": "b2",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 76,
-                                          "column": 38,
-                                          "program": "binary_op.ets"
-                                        },
-                                        "end": {
-                                          "line": 76,
-                                          "column": 40,
-                                          "program": "binary_op.ets"
-                                        }
-                                      }
-                                    },
-                                    "right": {
-                                      "type": "BinaryExpression",
-                                      "operator": ">=",
-                                      "left": {
-                                        "type": "Identifier",
-                                        "name": "i",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 76,
-                                            "column": 44,
-                                            "program": "binary_op.ets"
-                                          },
-                                          "end": {
-                                            "line": 76,
-                                            "column": 45,
-                                            "program": "binary_op.ets"
-                                          }
-                                        }
-                                      },
-                                      "right": {
-                                        "type": "BinaryExpression",
-                                        "operator": "<<",
-                                        "left": {
-                                          "type": "Identifier",
-                                          "name": "j",
-                                          "decorators": [],
-                                          "loc": {
-                                            "start": {
-                                              "line": 76,
-                                              "column": 49,
-                                              "program": "binary_op.ets"
-                                            },
-                                            "end": {
-                                              "line": 76,
-                                              "column": 50,
-                                              "program": "binary_op.ets"
-                                            }
-                                          }
-                                        },
-                                        "right": {
-                                          "type": "BinaryExpression",
-                                          "operator": "-",
-                                          "left": {
-                                            "type": "Identifier",
-                                            "name": "i",
-                                            "decorators": [],
-                                            "loc": {
-                                              "start": {
-                                                "line": 76,
-                                                "column": 54,
-                                                "program": "binary_op.ets"
-                                              },
-                                              "end": {
-                                                "line": 76,
-                                                "column": 55,
-                                                "program": "binary_op.ets"
-                                              }
-                                            }
-                                          },
-                                          "right": {
-                                            "type": "BinaryExpression",
-                                            "operator": "%",
-                                            "left": {
-                                              "type": "Identifier",
-                                              "name": "j",
-                                              "decorators": [],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 76,
-                                                  "column": 58,
-                                                  "program": "binary_op.ets"
-                                                },
-                                                "end": {
-                                                  "line": 76,
-                                                  "column": 59,
-                                                  "program": "binary_op.ets"
-                                                }
-                                              }
-                                            },
-                                            "right": {
-                                              "type": "Identifier",
-                                              "name": "i",
-                                              "decorators": [],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 76,
-                                                  "column": 62,
-                                                  "program": "binary_op.ets"
-                                                },
-                                                "end": {
-                                                  "line": 76,
-                                                  "column": 63,
-                                                  "program": "binary_op.ets"
-                                                }
-                                              }
-                                            },
-                                            "loc": {
-                                              "start": {
-                                                "line": 76,
-                                                "column": 58,
-                                                "program": "binary_op.ets"
-                                              },
-                                              "end": {
-                                                "line": 76,
-                                                "column": 63,
-                                                "program": "binary_op.ets"
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 76,
-                                              "column": 54,
-                                              "program": "binary_op.ets"
-                                            },
-                                            "end": {
-                                              "line": 76,
-                                              "column": 63,
-                                              "program": "binary_op.ets"
-                                            }
-                                          }
-                                        },
-                                        "loc": {
-                                          "start": {
-                                            "line": 76,
-                                            "column": 49,
-                                            "program": "binary_op.ets"
-                                          },
-                                          "end": {
-                                            "line": 76,
-                                            "column": 63,
-                                            "program": "binary_op.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 76,
-                                          "column": 44,
-                                          "program": "binary_op.ets"
-                                        },
-                                        "end": {
-                                          "line": 76,
-                                          "column": 63,
-                                          "program": "binary_op.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 76,
-                                        "column": 38,
-                                        "program": "binary_op.ets"
-                                      },
-                                      "end": {
-                                        "line": 76,
-                                        "column": 63,
-                                        "program": "binary_op.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 76,
-                                      "column": 33,
-                                      "program": "binary_op.ets"
-                                    },
-                                    "end": {
-                                      "line": 76,
-                                      "column": 63,
-                                      "program": "binary_op.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 76,
-                                    "column": 28,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 76,
-                                    "column": 63,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 76,
-                                  "column": 23,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 76,
-                                  "column": 63,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 76,
-                                "column": 17,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 76,
-                                "column": 63,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 76,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 76,
-                              "column": 63,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 76,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 76,
-                            "column": 63,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 76,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 76,
-                          "column": 63,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b25",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 77,
-                              "column": 5,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 77,
-                              "column": 8,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "LogicalExpression",
-                          "operator": "??",
-                          "left": {
-                            "type": "Identifier",
-                            "name": "r1",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 77,
-                                "column": 11,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 77,
-                                "column": 13,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "right": {
-                            "type": "BinaryExpression",
-                            "operator": "|",
-                            "left": {
-                              "type": "BinaryExpression",
-                              "operator": "!=",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "b1",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 77,
-                                    "column": 17,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 77,
-                                    "column": 19,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "b2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 77,
-                                    "column": 23,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 77,
-                                    "column": 25,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 77,
-                                  "column": 17,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 77,
-                                  "column": 25,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "BinaryExpression",
-                              "operator": "<=",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "i",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 77,
-                                    "column": 28,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 77,
-                                    "column": 29,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "j",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 77,
-                                    "column": 33,
-                                    "program": "binary_op.ets"
-                                  },
-                                  "end": {
-                                    "line": 77,
-                                    "column": 34,
-                                    "program": "binary_op.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 77,
-                                  "column": 28,
-                                  "program": "binary_op.ets"
-                                },
-                                "end": {
-                                  "line": 77,
-                                  "column": 34,
-                                  "program": "binary_op.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 77,
-                                "column": 23,
-                                "program": "binary_op.ets"
-                              },
-                              "end": {
-                                "line": 77,
-                                "column": 34,
-                                "program": "binary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 77,
-                              "column": 11,
-                              "program": "binary_op.ets"
-                            },
-                            "end": {
-                              "line": 77,
-                              "column": 34,
-                              "program": "binary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 77,
-                            "column": 5,
-                            "program": "binary_op.ets"
-                          },
-                          "end": {
-                            "line": 77,
-                            "column": 34,
-                            "program": "binary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 77,
-                          "column": 5,
-                          "program": "binary_op.ets"
-                        },
-                        "end": {
-                          "line": 77,
-                          "column": 34,
-                          "program": "binary_op.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "binary_op.ets"
-                    },
-                    "end": {
-                      "line": 77,
-                      "column": 34,
-                      "program": "binary_op.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "binary_op.ets"
-                  },
-                  "end": {
-                    "line": 77,
-                    "column": 34,
-                    "program": "binary_op.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "binary_op.ets"
-                },
-                "end": {
-                  "line": 77,
-                  "column": 34,
-                  "program": "binary_op.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "binary_op.ets"
-              },
-              "end": {
-                "line": 77,
-                "column": 34,
-                "program": "binary_op.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -6283,7 +571,7 @@
               },
               "end": {
                 "line": 22,
-                "column": 29,
+                "column": 25,
                 "program": "binary_op.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/binary_operations-expected.txt b/ets2panda/test/parser/ets/binary_operations-expected.txt
index e74bc20467917a3ebd6df59283db8b264283d042..c00b564851d14eebed72e251d67dee9b36343ebc 100644
--- a/ets2panda/test/parser/ets/binary_operations-expected.txt
+++ b/ets2panda/test/parser/ets/binary_operations-expected.txt
@@ -1988,112 +1988,6 @@
                 "program": "binary_operations.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "binary_operations.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "binary_operations.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "binary_operations.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "binary_operations.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "binary_operations.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "binary_operations.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "binary_operations.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "binary_operations.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/blocks-expected.txt b/ets2panda/test/parser/ets/blocks-expected.txt
index 5d037504e57052ba998ca4d7bd769de6e685ea7a..868668bd9fc612fd57c6dec849a325d0fecdf1c8 100644
--- a/ets2panda/test/parser/ets/blocks-expected.txt
+++ b/ets2panda/test/parser/ets/blocks-expected.txt
@@ -129,295 +129,6 @@
                 "program": "blocks.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "BlockStatement",
-                      "statements": [
-                        {
-                          "type": "VariableDeclaration",
-                          "declarations": [
-                            {
-                              "type": "VariableDeclarator",
-                              "id": {
-                                "type": "Identifier",
-                                "name": "a",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 7,
-                                    "program": "blocks.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 8,
-                                    "program": "blocks.ets"
-                                  }
-                                }
-                              },
-                              "init": {
-                                "type": "NumberLiteral",
-                                "value": 42,
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 11,
-                                    "program": "blocks.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 13,
-                                    "program": "blocks.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 7,
-                                  "program": "blocks.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 13,
-                                  "program": "blocks.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "kind": "let",
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 3,
-                              "program": "blocks.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 14,
-                              "program": "blocks.ets"
-                            }
-                          }
-                        },
-                        {
-                          "type": "BlockStatement",
-                          "statements": [
-                            {
-                              "type": "VariableDeclaration",
-                              "declarations": [
-                                {
-                                  "type": "VariableDeclarator",
-                                  "id": {
-                                    "type": "Identifier",
-                                    "name": "b",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 9,
-                                        "program": "blocks.ets"
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 10,
-                                        "program": "blocks.ets"
-                                      }
-                                    }
-                                  },
-                                  "init": {
-                                    "type": "NumberLiteral",
-                                    "value": 43,
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 13,
-                                        "program": "blocks.ets"
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 15,
-                                        "program": "blocks.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 9,
-                                      "program": "blocks.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 15,
-                                      "program": "blocks.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "kind": "let",
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 5,
-                                  "program": "blocks.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 16,
-                                  "program": "blocks.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "BlockStatement",
-                              "statements": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 5,
-                                  "program": "blocks.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 7,
-                                  "program": "blocks.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 3,
-                              "program": "blocks.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 4,
-                              "program": "blocks.ets"
-                            }
-                          }
-                        }
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 1,
-                          "program": "blocks.ets"
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 2,
-                          "program": "blocks.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 1,
-                      "program": "blocks.ets"
-                    },
-                    "end": {
-                      "line": 23,
-                      "column": 2,
-                      "program": "blocks.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 1,
-                    "program": "blocks.ets"
-                  },
-                  "end": {
-                    "line": 23,
-                    "column": 2,
-                    "program": "blocks.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 1,
-                  "program": "blocks.ets"
-                },
-                "end": {
-                  "line": 23,
-                  "column": 2,
-                  "program": "blocks.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 1,
-                "program": "blocks.ets"
-              },
-              "end": {
-                "line": 23,
-                "column": 2,
-                "program": "blocks.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/blocks_scopes-expected.txt b/ets2panda/test/parser/ets/blocks_scopes-expected.txt
index 33730ccfecfd56d4b41c2efc828b115233aa470e..ca3d6884fa9d5167a45d97362d3e91065f2bcf33 100644
--- a/ets2panda/test/parser/ets/blocks_scopes-expected.txt
+++ b/ets2panda/test/parser/ets/blocks_scopes-expected.txt
@@ -129,444 +129,6 @@
                 "program": "blocks_scopes.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "BlockStatement",
-                      "statements": [
-                        {
-                          "type": "VariableDeclaration",
-                          "declarations": [
-                            {
-                              "type": "VariableDeclarator",
-                              "id": {
-                                "type": "Identifier",
-                                "name": "a",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 7,
-                                    "program": "blocks_scopes.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 8,
-                                    "program": "blocks_scopes.ets"
-                                  }
-                                }
-                              },
-                              "init": {
-                                "type": "NumberLiteral",
-                                "value": 42,
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 11,
-                                    "program": "blocks_scopes.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 13,
-                                    "program": "blocks_scopes.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 7,
-                                  "program": "blocks_scopes.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 13,
-                                  "program": "blocks_scopes.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "kind": "let",
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 3,
-                              "program": "blocks_scopes.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 14,
-                              "program": "blocks_scopes.ets"
-                            }
-                          }
-                        },
-                        {
-                          "type": "BlockStatement",
-                          "statements": [
-                            {
-                              "type": "VariableDeclaration",
-                              "declarations": [
-                                {
-                                  "type": "VariableDeclarator",
-                                  "id": {
-                                    "type": "Identifier",
-                                    "name": "b",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 9,
-                                        "program": "blocks_scopes.ets"
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 10,
-                                        "program": "blocks_scopes.ets"
-                                      }
-                                    }
-                                  },
-                                  "init": {
-                                    "type": "BinaryExpression",
-                                    "operator": "+",
-                                    "left": {
-                                      "type": "Identifier",
-                                      "name": "a",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 20,
-                                          "column": 13,
-                                          "program": "blocks_scopes.ets"
-                                        },
-                                        "end": {
-                                          "line": 20,
-                                          "column": 14,
-                                          "program": "blocks_scopes.ets"
-                                        }
-                                      }
-                                    },
-                                    "right": {
-                                      "type": "NumberLiteral",
-                                      "value": 43,
-                                      "loc": {
-                                        "start": {
-                                          "line": 20,
-                                          "column": 17,
-                                          "program": "blocks_scopes.ets"
-                                        },
-                                        "end": {
-                                          "line": 20,
-                                          "column": 19,
-                                          "program": "blocks_scopes.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 13,
-                                        "program": "blocks_scopes.ets"
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 19,
-                                        "program": "blocks_scopes.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 9,
-                                      "program": "blocks_scopes.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 19,
-                                      "program": "blocks_scopes.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "kind": "let",
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 5,
-                                  "program": "blocks_scopes.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 20,
-                                  "program": "blocks_scopes.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "BlockStatement",
-                              "statements": [
-                                {
-                                  "type": "VariableDeclaration",
-                                  "declarations": [
-                                    {
-                                      "type": "VariableDeclarator",
-                                      "id": {
-                                        "type": "Identifier",
-                                        "name": "c",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 22,
-                                            "column": 13,
-                                            "program": "blocks_scopes.ets"
-                                          },
-                                          "end": {
-                                            "line": 22,
-                                            "column": 14,
-                                            "program": "blocks_scopes.ets"
-                                          }
-                                        }
-                                      },
-                                      "init": {
-                                        "type": "BinaryExpression",
-                                        "operator": "+",
-                                        "left": {
-                                          "type": "Identifier",
-                                          "name": "b",
-                                          "decorators": [],
-                                          "loc": {
-                                            "start": {
-                                              "line": 22,
-                                              "column": 17,
-                                              "program": "blocks_scopes.ets"
-                                            },
-                                            "end": {
-                                              "line": 22,
-                                              "column": 18,
-                                              "program": "blocks_scopes.ets"
-                                            }
-                                          }
-                                        },
-                                        "right": {
-                                          "type": "NumberLiteral",
-                                          "value": 10,
-                                          "loc": {
-                                            "start": {
-                                              "line": 22,
-                                              "column": 21,
-                                              "program": "blocks_scopes.ets"
-                                            },
-                                            "end": {
-                                              "line": 22,
-                                              "column": 23,
-                                              "program": "blocks_scopes.ets"
-                                            }
-                                          }
-                                        },
-                                        "loc": {
-                                          "start": {
-                                            "line": 22,
-                                            "column": 17,
-                                            "program": "blocks_scopes.ets"
-                                          },
-                                          "end": {
-                                            "line": 22,
-                                            "column": 23,
-                                            "program": "blocks_scopes.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 22,
-                                          "column": 13,
-                                          "program": "blocks_scopes.ets"
-                                        },
-                                        "end": {
-                                          "line": 22,
-                                          "column": 23,
-                                          "program": "blocks_scopes.ets"
-                                        }
-                                      }
-                                    }
-                                  ],
-                                  "kind": "let",
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 9,
-                                      "program": "blocks_scopes.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 24,
-                                      "program": "blocks_scopes.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "BlockStatement",
-                                  "statements": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 23,
-                                      "column": 9,
-                                      "program": "blocks_scopes.ets"
-                                    },
-                                    "end": {
-                                      "line": 23,
-                                      "column": 11,
-                                      "program": "blocks_scopes.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 5,
-                                  "program": "blocks_scopes.ets"
-                                },
-                                "end": {
-                                  "line": 24,
-                                  "column": 6,
-                                  "program": "blocks_scopes.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 3,
-                              "program": "blocks_scopes.ets"
-                            },
-                            "end": {
-                              "line": 25,
-                              "column": 4,
-                              "program": "blocks_scopes.ets"
-                            }
-                          }
-                        }
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 1,
-                          "program": "blocks_scopes.ets"
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 2,
-                          "program": "blocks_scopes.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 1,
-                      "program": "blocks_scopes.ets"
-                    },
-                    "end": {
-                      "line": 26,
-                      "column": 2,
-                      "program": "blocks_scopes.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 1,
-                    "program": "blocks_scopes.ets"
-                  },
-                  "end": {
-                    "line": 26,
-                    "column": 2,
-                    "program": "blocks_scopes.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 1,
-                  "program": "blocks_scopes.ets"
-                },
-                "end": {
-                  "line": 26,
-                  "column": 2,
-                  "program": "blocks_scopes.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 1,
-                "program": "blocks_scopes.ets"
-              },
-              "end": {
-                "line": 26,
-                "column": 2,
-                "program": "blocks_scopes.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/boolean-expected.txt b/ets2panda/test/parser/ets/boolean-expected.txt
index f33849578b78562c4aa1318cf64f1018d9de0179..d037aef3089d0b7e09700f5a2e04f7621f6e11c8 100644
--- a/ets2panda/test/parser/ets/boolean-expected.txt
+++ b/ets2panda/test/parser/ets/boolean-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "boolean.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "boolean.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BooleanLiteral",
-                          "value": true,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 18,
-                              "program": "boolean.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 22,
-                              "program": "boolean.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "boolean.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 22,
-                            "program": "boolean.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "boolean.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22,
-                          "program": "boolean.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "boolean.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 22,
-                      "program": "boolean.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "boolean.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 22,
-                    "program": "boolean.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "boolean.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 22,
-                  "program": "boolean.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "boolean.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 22,
-                "program": "boolean.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -351,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 22,
+                "column": 18,
                 "program": "boolean.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/boolean_cond-expected.txt b/ets2panda/test/parser/ets/boolean_cond-expected.txt
index 97a76c166fe900a6616e075b19ca67346089f44c..851dd9142c6ce23356e216b0da11fdb84d5cadb0 100644
--- a/ets2panda/test/parser/ets/boolean_cond-expected.txt
+++ b/ets2panda/test/parser/ets/boolean_cond-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boolean_cond.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boolean_cond.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boolean_cond.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boolean_cond.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boolean_cond.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boolean_cond.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "boolean_cond.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "boolean_cond.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/boolean_default-expected.txt b/ets2panda/test/parser/ets/boolean_default-expected.txt
index c0bfe203bc3493e70069c685fb2f260fd9138b40..fa255fe329e59a44f28bef6f1ccaa6c38b6609b1 100644
--- a/ets2panda/test/parser/ets/boolean_default-expected.txt
+++ b/ets2panda/test/parser/ets/boolean_default-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boolean_default.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "boolean_default.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boolean_default.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "boolean_default.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boolean_default.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "boolean_default.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "boolean_default.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "boolean_default.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/break-expected.txt b/ets2panda/test/parser/ets/break-expected.txt
index f3879d3ce195b42570d1c43db004a4357b61a4fd..17478cff571cf61f5dc473151c2c7f0ffc7ac868 100644
--- a/ets2panda/test/parser/ets/break-expected.txt
+++ b/ets2panda/test/parser/ets/break-expected.txt
@@ -24,226 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "break.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "break.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 17,
-                                  "program": "break.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 18,
-                                  "program": "break.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 2,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 20,
-                                  "program": "break.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 21,
-                                  "program": "break.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 23,
-                                  "program": "break.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 24,
-                                  "program": "break.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "break.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 25,
-                              "program": "break.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "break.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 25,
-                            "program": "break.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "break.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 25,
-                          "program": "break.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "break.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 25,
-                      "program": "break.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "break.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 25,
-                    "program": "break.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "break.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 25,
-                  "program": "break.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "break.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 25,
-                "program": "break.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -358,7 +138,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 25,
+                "column": 16,
                 "program": "break.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt
index 343d19a3edcb9d8f61dd392486b280ac37468643..71e1011089228b7a5af68a96fcf203f9c05c223d 100644
--- a/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt
+++ b/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt
@@ -179,112 +179,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "callFunctionWithNullableParam.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "callFunctionWithNullableParam.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "callFunctionWithNullableParam.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "callFunctionWithNullableParam.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "callFunctionWithNullableParam.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "callFunctionWithNullableParam.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "callFunctionWithNullableParam.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "callFunctionWithNullableParam.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt
index 5f65c07269b36dc319bdc26488c3f9b681a1e8d0..fb95ce1b924332277259fb698ead29964e754a14 100644
--- a/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt
+++ b/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt
@@ -678,112 +678,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "callInterfaceMethodWithNullableParam.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "callInterfaceMethodWithNullableParam.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "callInterfaceMethodWithNullableParam.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "callInterfaceMethodWithNullableParam.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "callInterfaceMethodWithNullableParam.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "callInterfaceMethodWithNullableParam.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "callInterfaceMethodWithNullableParam.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "callInterfaceMethodWithNullableParam.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt
index 235762958a0792894c81a19aa2ff6939949e60bc..b1445d492689d1501f5b65f461a79fae58fcd5ac 100644
--- a/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt
+++ b/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt
@@ -380,112 +380,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "callMethodWithNullableParam.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "callMethodWithNullableParam.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "callMethodWithNullableParam.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "callMethodWithNullableParam.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "callMethodWithNullableParam.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "callMethodWithNullableParam.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "callMethodWithNullableParam.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "callMethodWithNullableParam.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt
index 084c4c27f5f87ac7bcd601d92f81c53d2e2a9701..ba281756a15865a3f5c02fd2218f161bad597fec 100644
--- a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt
+++ b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt
@@ -794,112 +794,6 @@
                 "program": "calling_superclass_methods.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "calling_superclass_methods.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "calling_superclass_methods.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "calling_superclass_methods.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "calling_superclass_methods.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "calling_superclass_methods.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "calling_superclass_methods.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "calling_superclass_methods.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "calling_superclass_methods.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/cast_const_union-expected.txt b/ets2panda/test/parser/ets/cast_const_union-expected.txt
index 00e5e9065570c079fe69ff093283b960425056aa..031db96d28dd71a8573976c4f0d5c637cec94b0c 100644
--- a/ets2panda/test/parser/ets/cast_const_union-expected.txt
+++ b/ets2panda/test/parser/ets/cast_const_union-expected.txt
@@ -24,241 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "cast_const_union.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "cast_const_union.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "Double",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 16,
-                                    "column": 22,
-                                    "program": "cast_const_union.ets"
-                                  },
-                                  "end": {
-                                    "line": 16,
-                                    "column": 28,
-                                    "program": "cast_const_union.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 22,
-                                  "program": "cast_const_union.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 29,
-                                  "program": "cast_const_union.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 22,
-                                "program": "cast_const_union.ets"
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 29,
-                                "program": "cast_const_union.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": -1.1e-20,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 29,
-                                  "program": "cast_const_union.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 37,
-                                  "program": "cast_const_union.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 18,
-                              "program": "cast_const_union.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "cast_const_union.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "cast_const_union.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 9,
-                            "program": "cast_const_union.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "cast_const_union.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 9,
-                          "program": "cast_const_union.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "cast_const_union.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 9,
-                      "program": "cast_const_union.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "cast_const_union.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 9,
-                    "program": "cast_const_union.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "cast_const_union.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 9,
-                  "program": "cast_const_union.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "cast_const_union.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 9,
-                "program": "cast_const_union.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -340,8 +105,8 @@
                 "program": "cast_const_union.ets"
               },
               "end": {
-                "line": 18,
-                "column": 9,
+                "line": 16,
+                "column": 18,
                 "program": "cast_const_union.ets"
               }
             }
@@ -753,7 +518,7 @@
                               },
                               "end": {
                                 "line": 20,
-                                "column": 23,
+                                "column": 34,
                                 "program": "cast_const_union.ets"
                               }
                             }
diff --git a/ets2panda/test/parser/ets/cast_expressions-expected.txt b/ets2panda/test/parser/ets/cast_expressions-expected.txt
index 681bcf415016b1c1951432af8f9111d6e62c7f9b..cd809852f70e1651a9b73b3f24cad79e0a33af39 100644
--- a/ets2panda/test/parser/ets/cast_expressions-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "cast_expressions.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "cast_expressions.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "cast_expressions.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "cast_expressions.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "cast_expressions.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "cast_expressions.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "cast_expressions.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "cast_expressions.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -544,7 +438,7 @@
                                   },
                                   "end": {
                                     "line": 18,
-                                    "column": 32,
+                                    "column": 40,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -2241,7 +2135,7 @@
                                   },
                                   "end": {
                                     "line": 40,
-                                    "column": 28,
+                                    "column": 37,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -2254,7 +2148,7 @@
                                 },
                                 "end": {
                                   "line": 40,
-                                  "column": 28,
+                                  "column": 37,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -2370,7 +2264,7 @@
                                   },
                                   "end": {
                                     "line": 41,
-                                    "column": 28,
+                                    "column": 37,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -2383,7 +2277,7 @@
                                 },
                                 "end": {
                                   "line": 41,
-                                  "column": 28,
+                                  "column": 37,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -2499,7 +2393,7 @@
                                   },
                                   "end": {
                                     "line": 42,
-                                    "column": 28,
+                                    "column": 39,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -2512,7 +2406,7 @@
                                 },
                                 "end": {
                                   "line": 42,
-                                  "column": 28,
+                                  "column": 39,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -2909,7 +2803,7 @@
                                   },
                                   "end": {
                                     "line": 48,
-                                    "column": 35,
+                                    "column": 44,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -4488,7 +4382,7 @@
                                   },
                                   "end": {
                                     "line": 69,
-                                    "column": 31,
+                                    "column": 41,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -4501,7 +4395,7 @@
                                 },
                                 "end": {
                                   "line": 69,
-                                  "column": 31,
+                                  "column": 41,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -4617,7 +4511,7 @@
                                   },
                                   "end": {
                                     "line": 70,
-                                    "column": 31,
+                                    "column": 41,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -4630,7 +4524,7 @@
                                 },
                                 "end": {
                                   "line": 70,
-                                  "column": 31,
+                                  "column": 41,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -4746,7 +4640,7 @@
                                   },
                                   "end": {
                                     "line": 71,
-                                    "column": 31,
+                                    "column": 42,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -4759,7 +4653,7 @@
                                 },
                                 "end": {
                                   "line": 71,
-                                  "column": 31,
+                                  "column": 42,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -5156,7 +5050,7 @@
                                   },
                                   "end": {
                                     "line": 77,
-                                    "column": 32,
+                                    "column": 40,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -6735,7 +6629,7 @@
                                   },
                                   "end": {
                                     "line": 98,
-                                    "column": 28,
+                                    "column": 37,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -6748,7 +6642,7 @@
                                 },
                                 "end": {
                                   "line": 98,
-                                  "column": 28,
+                                  "column": 37,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -6864,7 +6758,7 @@
                                   },
                                   "end": {
                                     "line": 99,
-                                    "column": 28,
+                                    "column": 37,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -6877,7 +6771,7 @@
                                 },
                                 "end": {
                                   "line": 99,
-                                  "column": 28,
+                                  "column": 37,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -6993,7 +6887,7 @@
                                   },
                                   "end": {
                                     "line": 100,
-                                    "column": 28,
+                                    "column": 39,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -7006,7 +6900,7 @@
                                 },
                                 "end": {
                                   "line": 100,
-                                  "column": 28,
+                                  "column": 39,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -7403,7 +7297,7 @@
                                   },
                                   "end": {
                                     "line": 106,
-                                    "column": 29,
+                                    "column": 36,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -8864,7 +8758,7 @@
                                   },
                                   "end": {
                                     "line": 126,
-                                    "column": 27,
+                                    "column": 35,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -8877,7 +8771,7 @@
                                 },
                                 "end": {
                                   "line": 126,
-                                  "column": 27,
+                                  "column": 35,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -8993,7 +8887,7 @@
                                   },
                                   "end": {
                                     "line": 127,
-                                    "column": 27,
+                                    "column": 35,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -9006,7 +8900,7 @@
                                 },
                                 "end": {
                                   "line": 127,
-                                  "column": 27,
+                                  "column": 35,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -9122,7 +9016,7 @@
                                   },
                                   "end": {
                                     "line": 128,
-                                    "column": 27,
+                                    "column": 38,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -9135,7 +9029,7 @@
                                 },
                                 "end": {
                                   "line": 128,
-                                  "column": 27,
+                                  "column": 38,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -9532,7 +9426,7 @@
                                   },
                                   "end": {
                                     "line": 134,
-                                    "column": 32,
+                                    "column": 40,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -10875,7 +10769,7 @@
                                   },
                                   "end": {
                                     "line": 153,
-                                    "column": 28,
+                                    "column": 37,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -10888,7 +10782,7 @@
                                 },
                                 "end": {
                                   "line": 153,
-                                  "column": 28,
+                                  "column": 37,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -11004,7 +10898,7 @@
                                   },
                                   "end": {
                                     "line": 154,
-                                    "column": 28,
+                                    "column": 37,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -11017,7 +10911,7 @@
                                 },
                                 "end": {
                                   "line": 154,
-                                  "column": 28,
+                                  "column": 37,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -11133,7 +11027,7 @@
                                   },
                                   "end": {
                                     "line": 155,
-                                    "column": 28,
+                                    "column": 39,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -11146,7 +11040,7 @@
                                 },
                                 "end": {
                                   "line": 155,
-                                  "column": 28,
+                                  "column": 39,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -11543,7 +11437,7 @@
                                   },
                                   "end": {
                                     "line": 161,
-                                    "column": 35,
+                                    "column": 44,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -12650,7 +12544,7 @@
                                   },
                                   "end": {
                                     "line": 178,
-                                    "column": 31,
+                                    "column": 41,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -12663,7 +12557,7 @@
                                 },
                                 "end": {
                                   "line": 178,
-                                  "column": 31,
+                                  "column": 41,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -12779,7 +12673,7 @@
                                   },
                                   "end": {
                                     "line": 179,
-                                    "column": 31,
+                                    "column": 41,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -12792,7 +12686,7 @@
                                 },
                                 "end": {
                                   "line": 179,
-                                  "column": 31,
+                                  "column": 41,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -12908,7 +12802,7 @@
                                   },
                                   "end": {
                                     "line": 180,
-                                    "column": 31,
+                                    "column": 42,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -12921,7 +12815,7 @@
                                 },
                                 "end": {
                                   "line": 180,
-                                  "column": 31,
+                                  "column": 42,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -13318,7 +13212,7 @@
                                   },
                                   "end": {
                                     "line": 186,
-                                    "column": 38,
+                                    "column": 48,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -14307,7 +14201,7 @@
                                   },
                                   "end": {
                                     "line": 202,
-                                    "column": 34,
+                                    "column": 45,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -14320,7 +14214,7 @@
                                 },
                                 "end": {
                                   "line": 202,
-                                  "column": 34,
+                                  "column": 45,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -14436,7 +14330,7 @@
                                   },
                                   "end": {
                                     "line": 203,
-                                    "column": 34,
+                                    "column": 45,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -14449,7 +14343,7 @@
                                 },
                                 "end": {
                                   "line": 203,
-                                  "column": 34,
+                                  "column": 45,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -14565,7 +14459,7 @@
                                   },
                                   "end": {
                                     "line": 204,
-                                    "column": 34,
+                                    "column": 45,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -14578,7 +14472,7 @@
                                 },
                                 "end": {
                                   "line": 204,
-                                  "column": 34,
+                                  "column": 45,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -15059,7 +14953,7 @@
                                   },
                                   "end": {
                                     "line": 214,
-                                    "column": 35,
+                                    "column": 46,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -15072,7 +14966,7 @@
                                 },
                                 "end": {
                                   "line": 214,
-                                  "column": 35,
+                                  "column": 46,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -15156,7 +15050,7 @@
                                   },
                                   "end": {
                                     "line": 215,
-                                    "column": 35,
+                                    "column": 46,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -15169,7 +15063,7 @@
                                 },
                                 "end": {
                                   "line": 215,
-                                  "column": 35,
+                                  "column": 46,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -15302,7 +15196,7 @@
                                   },
                                   "end": {
                                     "line": 220,
-                                    "column": 35,
+                                    "column": 47,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -15315,7 +15209,7 @@
                                 },
                                 "end": {
                                   "line": 220,
-                                  "column": 35,
+                                  "column": 47,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -15431,7 +15325,7 @@
                                   },
                                   "end": {
                                     "line": 221,
-                                    "column": 35,
+                                    "column": 47,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -15444,7 +15338,7 @@
                                 },
                                 "end": {
                                   "line": 221,
-                                  "column": 35,
+                                  "column": 47,
                                   "program": "cast_expressions.ets"
                                 }
                               }
@@ -15560,7 +15454,7 @@
                                   },
                                   "end": {
                                     "line": 222,
-                                    "column": 35,
+                                    "column": 46,
                                     "program": "cast_expressions.ets"
                                   }
                                 }
@@ -15573,7 +15467,7 @@
                                 },
                                 "end": {
                                   "line": 222,
-                                  "column": 35,
+                                  "column": 46,
                                   "program": "cast_expressions.ets"
                                 }
                               }
diff --git a/ets2panda/test/parser/ets/cast_expressions3-expected.txt b/ets2panda/test/parser/ets/cast_expressions3-expected.txt
index b21a1e97b39c2edc6652533599fc938bb782f616..977ed890912f3d7595534dfbb6abd729cd393f32 100644
--- a/ets2panda/test/parser/ets/cast_expressions3-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions3-expected.txt
@@ -799,112 +799,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "cast_expressions3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "cast_expressions3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "cast_expressions3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "cast_expressions3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "cast_expressions3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "cast_expressions3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "cast_expressions3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "cast_expressions3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -1181,7 +1075,7 @@
                               },
                               "end": {
                                 "line": 24,
-                                "column": 15,
+                                "column": 21,
                                 "program": "cast_expressions3.ets"
                               }
                             }
@@ -1194,7 +1088,7 @@
                             },
                             "end": {
                               "line": 24,
-                              "column": 15,
+                              "column": 21,
                               "program": "cast_expressions3.ets"
                             }
                           }
@@ -1310,7 +1204,7 @@
                               },
                               "end": {
                                 "line": 25,
-                                "column": 15,
+                                "column": 21,
                                 "program": "cast_expressions3.ets"
                               }
                             }
@@ -1323,7 +1217,7 @@
                             },
                             "end": {
                               "line": 25,
-                              "column": 15,
+                              "column": 21,
                               "program": "cast_expressions3.ets"
                             }
                           }
@@ -1439,7 +1333,7 @@
                               },
                               "end": {
                                 "line": 26,
-                                "column": 15,
+                                "column": 21,
                                 "program": "cast_expressions3.ets"
                               }
                             }
@@ -1452,7 +1346,7 @@
                             },
                             "end": {
                               "line": 26,
-                              "column": 15,
+                              "column": 21,
                               "program": "cast_expressions3.ets"
                             }
                           }
@@ -1568,7 +1462,7 @@
                               },
                               "end": {
                                 "line": 27,
-                                "column": 15,
+                                "column": 21,
                                 "program": "cast_expressions3.ets"
                               }
                             }
@@ -1581,7 +1475,7 @@
                             },
                             "end": {
                               "line": 27,
-                              "column": 15,
+                              "column": 21,
                               "program": "cast_expressions3.ets"
                             }
                           }
@@ -1697,7 +1591,7 @@
                               },
                               "end": {
                                 "line": 29,
-                                "column": 16,
+                                "column": 22,
                                 "program": "cast_expressions3.ets"
                               }
                             }
@@ -1710,7 +1604,7 @@
                             },
                             "end": {
                               "line": 29,
-                              "column": 16,
+                              "column": 22,
                               "program": "cast_expressions3.ets"
                             }
                           }
@@ -1826,7 +1720,7 @@
                               },
                               "end": {
                                 "line": 30,
-                                "column": 16,
+                                "column": 22,
                                 "program": "cast_expressions3.ets"
                               }
                             }
@@ -1839,7 +1733,7 @@
                             },
                             "end": {
                               "line": 30,
-                              "column": 16,
+                              "column": 22,
                               "program": "cast_expressions3.ets"
                             }
                           }
@@ -1955,7 +1849,7 @@
                               },
                               "end": {
                                 "line": 31,
-                                "column": 16,
+                                "column": 22,
                                 "program": "cast_expressions3.ets"
                               }
                             }
@@ -1968,7 +1862,7 @@
                             },
                             "end": {
                               "line": 31,
-                              "column": 16,
+                              "column": 22,
                               "program": "cast_expressions3.ets"
                             }
                           }
diff --git a/ets2panda/test/parser/ets/cast_expressions4-expected.txt b/ets2panda/test/parser/ets/cast_expressions4-expected.txt
index 8241915ac091093af55f9fbd2582f5e59508cc0a..c9eaf1079e21f1536bc17f5cb2a6aacb88763fd2 100644
--- a/ets2panda/test/parser/ets/cast_expressions4-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions4-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "cast_expressions4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "cast_expressions4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "cast_expressions4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "cast_expressions4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "cast_expressions4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "cast_expressions4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "cast_expressions4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "cast_expressions4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -815,7 +709,7 @@
                               },
                               "end": {
                                 "line": 18,
-                                "column": 41,
+                                "column": 64,
                                 "program": "cast_expressions4.ets"
                               }
                             }
@@ -828,7 +722,7 @@
                             },
                             "end": {
                               "line": 18,
-                              "column": 41,
+                              "column": 64,
                               "program": "cast_expressions4.ets"
                             }
                           }
@@ -1119,7 +1013,7 @@
                               },
                               "end": {
                                 "line": 19,
-                                "column": 39,
+                                "column": 59,
                                 "program": "cast_expressions4.ets"
                               }
                             }
@@ -1132,7 +1026,7 @@
                             },
                             "end": {
                               "line": 19,
-                              "column": 39,
+                              "column": 59,
                               "program": "cast_expressions4.ets"
                             }
                           }
@@ -1248,7 +1142,7 @@
                               },
                               "end": {
                                 "line": 21,
-                                "column": 18,
+                                "column": 29,
                                 "program": "cast_expressions4.ets"
                               }
                             }
@@ -1261,7 +1155,7 @@
                             },
                             "end": {
                               "line": 21,
-                              "column": 18,
+                              "column": 29,
                               "program": "cast_expressions4.ets"
                             }
                           }
diff --git a/ets2panda/test/parser/ets/cast_expressions5-expected.txt b/ets2panda/test/parser/ets/cast_expressions5-expected.txt
index 4f98ac702e1f4d2e237b388d4f4f70bc17281935..75f9899bcac57e5a314f8cc28ead2d1f1a0c1373 100644
--- a/ets2panda/test/parser/ets/cast_expressions5-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions5-expected.txt
@@ -798,177 +798,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "globalLong",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "cast_expressions5.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "cast_expressions5.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 0,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 24,
-                              "program": "cast_expressions5.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 25,
-                              "program": "cast_expressions5.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "cast_expressions5.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 25,
-                            "program": "cast_expressions5.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "cast_expressions5.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 25,
-                          "program": "cast_expressions5.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "cast_expressions5.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 25,
-                      "program": "cast_expressions5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "cast_expressions5.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 25,
-                    "program": "cast_expressions5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "cast_expressions5.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 25,
-                  "program": "cast_expressions5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "cast_expressions5.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 25,
-                "program": "cast_expressions5.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -1019,7 +848,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 25,
+                "column": 24,
                 "program": "cast_expressions5.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/class_init-expected.txt b/ets2panda/test/parser/ets/class_init-expected.txt
index 5f0d248f14c004cd1cf2f0bb7729c9f34dc3676c..32e1680e0924772f0eb16a123e43197288646f47 100644
--- a/ets2panda/test/parser/ets/class_init-expected.txt
+++ b/ets2panda/test/parser/ets/class_init-expected.txt
@@ -520,112 +520,6 @@
                 "program": "class_init.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_init.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_init.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_init.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_init.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_init.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_init.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "class_init.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "class_init.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/class_instance-expected.txt b/ets2panda/test/parser/ets/class_instance-expected.txt
index d67f34a88f2debceddb3af60bc90385c3906df6d..18fbfcdfeae53559ae04fee51f536b3d6f5f1db1 100644
--- a/ets2panda/test/parser/ets/class_instance-expected.txt
+++ b/ets2panda/test/parser/ets/class_instance-expected.txt
@@ -130,613 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 9,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 10,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "class_instance.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 10,
-                            "program": "class_instance.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "class_instance.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 10,
-                          "program": "class_instance.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 10,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 11,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "class_instance.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 11,
-                            "program": "class_instance.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "class_instance.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 11,
-                          "program": "class_instance.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewArrayInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSPrimitiveType",
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 13,
-                                "program": "class_instance.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 16,
-                                "program": "class_instance.ets"
-                              }
-                            }
-                          },
-                          "dimension": {
-                            "type": "NumberLiteral",
-                            "value": 10,
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 17,
-                                "program": "class_instance.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 19,
-                                "program": "class_instance.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 20,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "class_instance.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 20,
-                            "program": "class_instance.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "class_instance.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 20,
-                          "program": "class_instance.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewMultiDimArrayInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSPrimitiveType",
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 13,
-                                "program": "class_instance.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 16,
-                                "program": "class_instance.ets"
-                              }
-                            }
-                          },
-                          "dimensions": [
-                            {
-                              "type": "Identifier",
-                              "name": "a",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 17,
-                                  "program": "class_instance.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 18,
-                                  "program": "class_instance.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "Identifier",
-                              "name": "b",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 20,
-                                  "program": "class_instance.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 21,
-                                  "program": "class_instance.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 22,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "class_instance.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 22,
-                            "program": "class_instance.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "class_instance.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22,
-                          "program": "class_instance.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "z",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewMultiDimArrayInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSPrimitiveType",
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 13,
-                                "program": "class_instance.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 16,
-                                "program": "class_instance.ets"
-                              }
-                            }
-                          },
-                          "dimensions": [
-                            {
-                              "type": "Identifier",
-                              "name": "a",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 17,
-                                  "program": "class_instance.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 18,
-                                  "program": "class_instance.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "Identifier",
-                              "name": "b",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 20,
-                                  "program": "class_instance.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 21,
-                                  "program": "class_instance.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "BinaryExpression",
-                              "operator": "+",
-                              "left": {
-                                "type": "Identifier",
-                                "name": "a",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 23,
-                                    "program": "class_instance.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 24,
-                                    "program": "class_instance.ets"
-                                  }
-                                }
-                              },
-                              "right": {
-                                "type": "Identifier",
-                                "name": "b",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 27,
-                                    "program": "class_instance.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 28,
-                                    "program": "class_instance.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 23,
-                                  "program": "class_instance.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 28,
-                                  "program": "class_instance.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 9,
-                              "program": "class_instance.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 29,
-                              "program": "class_instance.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "class_instance.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 29,
-                            "program": "class_instance.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "class_instance.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 29,
-                          "program": "class_instance.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "class_instance.ets"
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 29,
-                      "program": "class_instance.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "class_instance.ets"
-                  },
-                  "end": {
-                    "line": 21,
-                    "column": 29,
-                    "program": "class_instance.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "class_instance.ets"
-                },
-                "end": {
-                  "line": 21,
-                  "column": 29,
-                  "program": "class_instance.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "class_instance.ets"
-              },
-              "end": {
-                "line": 21,
-                "column": 29,
-                "program": "class_instance.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/class_instance_creation-expected.txt b/ets2panda/test/parser/ets/class_instance_creation-expected.txt
index 91d81e481429eca9c644d18590e09faa3ea7e91a..87889e73721cc01689d5b4d7504e40fc73c6ab29 100644
--- a/ets2panda/test/parser/ets/class_instance_creation-expected.txt
+++ b/ets2panda/test/parser/ets/class_instance_creation-expected.txt
@@ -1173,112 +1173,6 @@
                 "program": "class_instance_creation.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_instance_creation.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_instance_creation.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_instance_creation.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_instance_creation.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_instance_creation.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_instance_creation.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "class_instance_creation.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "class_instance_creation.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/class_instance_import_alias-expected.txt b/ets2panda/test/parser/ets/class_instance_import_alias-expected.txt
index 31cfa717b7bfc02f07e13526d6c429226010be58..f7e697eeaa826c78f6fbe2e3a8e3942a82583b40 100644
--- a/ets2panda/test/parser/ets/class_instance_import_alias-expected.txt
+++ b/ets2panda/test/parser/ets/class_instance_import_alias-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_instance_import_alias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_instance_import_alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_instance_import_alias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_instance_import_alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_instance_import_alias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_instance_import_alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "class_instance_import_alias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "class_instance_import_alias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/class_instance_initializer-expected.txt b/ets2panda/test/parser/ets/class_instance_initializer-expected.txt
index aeac543276983317c652a334dd248866da815dc0..9301343d5dc9390f53a8308367226d50d74e5294 100644
--- a/ets2panda/test/parser/ets/class_instance_initializer-expected.txt
+++ b/ets2panda/test/parser/ets/class_instance_initializer-expected.txt
@@ -3537,112 +3537,6 @@
                 "program": "class_instance_initializer.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_instance_initializer.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_instance_initializer.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_instance_initializer.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_instance_initializer.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_instance_initializer.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_instance_initializer.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "class_instance_initializer.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "class_instance_initializer.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/class_static_initializer-expected.txt b/ets2panda/test/parser/ets/class_static_initializer-expected.txt
index d9e54d92223728716addde3424a5b15aa0dd1c85..3927f7784c5defdafff9ad1a689ea9842c1f4587 100644
--- a/ets2panda/test/parser/ets/class_static_initializer-expected.txt
+++ b/ets2panda/test/parser/ets/class_static_initializer-expected.txt
@@ -901,112 +901,6 @@
                 "program": "class_static_initializer.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_static_initializer.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_static_initializer.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_static_initializer.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_static_initializer.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_static_initializer.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_static_initializer.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "class_static_initializer.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "class_static_initializer.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/classes-expected.txt b/ets2panda/test/parser/ets/classes-expected.txt
index 264010ea5377a9982a50c207561d59b63f20f532..796c2324ea2d8a33b7186b0e84421ce763dd81a5 100644
--- a/ets2panda/test/parser/ets/classes-expected.txt
+++ b/ets2panda/test/parser/ets/classes-expected.txt
@@ -795,112 +795,6 @@
                 "program": "classes.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "classes.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "classes.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "classes.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "classes.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "classes.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "classes.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "classes.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "classes.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/comment_block-expected.txt b/ets2panda/test/parser/ets/comment_block-expected.txt
index e15e80b28d3970a60189a0ccaf6231261ce52a16..3d07b8cac493cc7d76686ab2787cde114c15d80b 100644
--- a/ets2panda/test/parser/ets/comment_block-expected.txt
+++ b/ets2panda/test/parser/ets/comment_block-expected.txt
@@ -129,112 +129,6 @@
                 "program": "comment_block.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "comment_block.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "comment_block.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "comment_block.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "comment_block.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "comment_block.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "comment_block.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "comment_block.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "comment_block.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/comment_line-expected.txt b/ets2panda/test/parser/ets/comment_line-expected.txt
index c2729f70bf7e4362b8c1849d5e5fb2947f882240..7595a6ea17e685ada62fb74eb813f20ea35e3667 100644
--- a/ets2panda/test/parser/ets/comment_line-expected.txt
+++ b/ets2panda/test/parser/ets/comment_line-expected.txt
@@ -129,112 +129,6 @@
                 "program": "comment_line.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "comment_line.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "comment_line.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "comment_line.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "comment_line.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "comment_line.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "comment_line.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "comment_line.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "comment_line.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt
index ea9efc575360ae6e817f183e4292f564f4ce9b83..a2830d6eabac15eb85559523d40cef43b1f94ef2 100644
--- a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt
+++ b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "conditionalExpressionType.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "conditionalExpressionType.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "conditionalExpressionType.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "conditionalExpressionType.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "conditionalExpressionType.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "conditionalExpressionType.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "conditionalExpressionType.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "conditionalExpressionType.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/const-expected.txt b/ets2panda/test/parser/ets/const-expected.txt
index 5e04fa184152bf86980d21cb2593d32120a7d9ff..48edb2a50040ecd9e4f7e3e2d0a6af7eb6c9f5fb 100644
--- a/ets2panda/test/parser/ets/const-expected.txt
+++ b/ets2panda/test/parser/ets/const-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "const.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "const.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "const.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "const.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "const.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "const.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "const.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "const.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/constructor_super_call1-expected.txt b/ets2panda/test/parser/ets/constructor_super_call1-expected.txt
index 0dd867d18a9fd1251fe378b4edd62040d7aa4bd0..6d951d397ddf80d243ee6d0ddc94b69a257c1c63 100644
--- a/ets2panda/test/parser/ets/constructor_super_call1-expected.txt
+++ b/ets2panda/test/parser/ets/constructor_super_call1-expected.txt
@@ -821,112 +821,6 @@
                 "program": "constructor_super_call1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "constructor_super_call1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "constructor_super_call1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "constructor_super_call1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "constructor_super_call1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "constructor_super_call1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "constructor_super_call1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "constructor_super_call1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "constructor_super_call1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/constructor_super_call3-expected.txt b/ets2panda/test/parser/ets/constructor_super_call3-expected.txt
index 3d29b936160bada9745205f0718272bca0765571..df6bfb7dcda4245ab922c256f0252ffca9246d53 100644
--- a/ets2panda/test/parser/ets/constructor_super_call3-expected.txt
+++ b/ets2panda/test/parser/ets/constructor_super_call3-expected.txt
@@ -535,112 +535,6 @@
                 "program": "constructor_super_call3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "constructor_super_call3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "constructor_super_call3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "constructor_super_call3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "constructor_super_call3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "constructor_super_call3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "constructor_super_call3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "constructor_super_call3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "constructor_super_call3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/constructor_test-expected.txt b/ets2panda/test/parser/ets/constructor_test-expected.txt
index de3c82290a31d136d72392a30772ab71fedef430..7fef3c8ca6183096480fd37d3d68d2061ea43856 100644
--- a/ets2panda/test/parser/ets/constructor_test-expected.txt
+++ b/ets2panda/test/parser/ets/constructor_test-expected.txt
@@ -1273,112 +1273,6 @@
                 "program": "constructor_test.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "constructor_test.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "constructor_test.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "constructor_test.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "constructor_test.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "constructor_test.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "constructor_test.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "constructor_test.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "constructor_test.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/constructor_with_return_2-expected.txt b/ets2panda/test/parser/ets/constructor_with_return_2-expected.txt
index e8b1a538fe0530a50326b92dd3b4e19d3ccf656e..e0f64c455060fe8a014a370e67c4dc2fa7a8c8d7 100644
--- a/ets2panda/test/parser/ets/constructor_with_return_2-expected.txt
+++ b/ets2panda/test/parser/ets/constructor_with_return_2-expected.txt
@@ -453,112 +453,6 @@
                 "program": "constructor_with_return_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "constructor_with_return_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "constructor_with_return_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "constructor_with_return_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "constructor_with_return_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "constructor_with_return_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "constructor_with_return_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "constructor_with_return_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "constructor_with_return_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/continue-expected.txt b/ets2panda/test/parser/ets/continue-expected.txt
index d28fae802d2083952ec175b51b9226f12cf9f367..6a68211d135a34d36966963aafdd402b1dcb5732 100644
--- a/ets2panda/test/parser/ets/continue-expected.txt
+++ b/ets2panda/test/parser/ets/continue-expected.txt
@@ -24,226 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "continue.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "continue.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 17,
-                                  "program": "continue.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 18,
-                                  "program": "continue.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 2,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 20,
-                                  "program": "continue.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 21,
-                                  "program": "continue.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 23,
-                                  "program": "continue.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 24,
-                                  "program": "continue.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "continue.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 25,
-                              "program": "continue.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "continue.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 25,
-                            "program": "continue.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "continue.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 25,
-                          "program": "continue.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "continue.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 25,
-                      "program": "continue.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "continue.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 25,
-                    "program": "continue.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "continue.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 25,
-                  "program": "continue.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "continue.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 25,
-                "program": "continue.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -358,7 +138,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 25,
+                "column": 16,
                 "program": "continue.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/conversions-expected.txt b/ets2panda/test/parser/ets/conversions-expected.txt
index 4108a9fc06c21c826448ff37179c9ba9dc87e404..34bcd562835e6bfff2619a32d5a7682e805a51ba 100644
--- a/ets2panda/test/parser/ets/conversions-expected.txt
+++ b/ets2panda/test/parser/ets/conversions-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "conversions.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "conversions.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "conversions.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "conversions.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "conversions.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "conversions.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "conversions.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "conversions.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -275,7 +169,7 @@
                               },
                               "end": {
                                 "line": 17,
-                                "column": 20,
+                                "column": 28,
                                 "program": "conversions.ets"
                               }
                             }
@@ -288,7 +182,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 20,
+                              "column": 28,
                               "program": "conversions.ets"
                             }
                           }
@@ -303,7 +197,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 20,
+                          "column": 28,
                           "program": "conversions.ets"
                         }
                       }
diff --git a/ets2panda/test/parser/ets/decl_infer-expected.txt b/ets2panda/test/parser/ets/decl_infer-expected.txt
index f0a6e3abfed9ba411e1e0f9bd52ebebc2c1e5edd..d71f676adc6cfe76fab9a295e1e6b10abb2cad6c 100644
--- a/ets2panda/test/parser/ets/decl_infer-expected.txt
+++ b/ets2panda/test/parser/ets/decl_infer-expected.txt
@@ -130,433 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "li",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 7,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 0,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 10,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 11,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "decl_infer.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 11,
-                            "program": "decl_infer.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "decl_infer.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 11,
-                          "program": "decl_infer.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "ld",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 7,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 0,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 10,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 13,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "decl_infer.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 13,
-                            "program": "decl_infer.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "decl_infer.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 13,
-                          "program": "decl_infer.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "lc",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 7,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CharLiteral",
-                          "value": "a",
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 10,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 14,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "decl_infer.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 14,
-                            "program": "decl_infer.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "decl_infer.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 14,
-                          "program": "decl_infer.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "ls",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 7,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "11",
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 10,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 14,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "decl_infer.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 14,
-                            "program": "decl_infer.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "decl_infer.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 14,
-                          "program": "decl_infer.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "lb",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 7,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BooleanLiteral",
-                          "value": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 10,
-                              "program": "decl_infer.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 15,
-                              "program": "decl_infer.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "decl_infer.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 15,
-                            "program": "decl_infer.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "decl_infer.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 15,
-                          "program": "decl_infer.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "decl_infer.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 15,
-                      "program": "decl_infer.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "decl_infer.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 15,
-                    "program": "decl_infer.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "decl_infer.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 15,
-                  "program": "decl_infer.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "decl_infer.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 15,
-                "program": "decl_infer.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt b/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt
index cf14e29753e6e0ad22f6d7d950e74f1457fca9ee..457ee662c10460dc53e0ef6eb1fc48e8bcde7872 100644
--- a/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt
+++ b/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "declare_ambient_const_variable.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "declare_ambient_const_variable.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "declare_ambient_const_variable.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "declare_ambient_const_variable.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "declare_ambient_const_variable.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "declare_ambient_const_variable.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "declare_ambient_const_variable.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "declare_ambient_const_variable.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/default_parameter10-expected.txt b/ets2panda/test/parser/ets/default_parameter10-expected.txt
index 26d1df2fb9e102d89e9aac309a5171b2994c6a59..b559787fa086e5d57026bfaef3eae6fb47bb5834 100644
--- a/ets2panda/test/parser/ets/default_parameter10-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter10-expected.txt
@@ -563,112 +563,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter10.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter10.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter10.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter10.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter10.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter10.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter10.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter10.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/default_parameter5-expected.txt b/ets2panda/test/parser/ets/default_parameter5-expected.txt
index fc7986789195676df190d14e93cab7467c78c697..fac42f021c5cbe8887a4a265238ce857c165cbf4 100644
--- a/ets2panda/test/parser/ets/default_parameter5-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter5-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter5.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/default_parameter7-expected.txt b/ets2panda/test/parser/ets/default_parameter7-expected.txt
index bd5be6aeff437baec66fdbdc6a72bdb9b68817e1..f54b41ee38d0238868e7a9a9ca83f5363dcd8b04 100644
--- a/ets2panda/test/parser/ets/default_parameter7-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter7-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/default_parameter9-expected.txt b/ets2panda/test/parser/ets/default_parameter9-expected.txt
index bdfd77d587909fbeb0441248cba871f0b9c4ed00..bfed56499803c697591fbcd50d352e14eff783f9 100644
--- a/ets2panda/test/parser/ets/default_parameter9-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter9-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter9.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt b/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt
index 5cd4e16481db88901e73cf9a4391f49f6c36e119..404a547348246dda13417d31da7c5929e65d2c3d 100644
--- a/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter_implicitly_typed_return_void.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_parameter_implicitly_typed_return_void.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter_implicitly_typed_return_void.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_parameter_implicitly_typed_return_void.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter_implicitly_typed_return_void.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_parameter_implicitly_typed_return_void.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter_implicitly_typed_return_void.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "default_parameter_implicitly_typed_return_void.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/dynamic_import_tests/dynamic_optional_decl-expected.txt b/ets2panda/test/parser/ets/dynamic_import_tests/dynamic_optional_decl-expected.txt
index 094e6f07e067c15348e5674d3dc886314626e392..1aa290207bffeff810d2265e445d8b3e5cfa72b5 100644
--- a/ets2panda/test/parser/ets/dynamic_import_tests/dynamic_optional_decl-expected.txt
+++ b/ets2panda/test/parser/ets/dynamic_import_tests/dynamic_optional_decl-expected.txt
@@ -155,112 +155,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "dynamic_optional_decl.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "dynamic_optional_decl.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "dynamic_optional_decl.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "dynamic_optional_decl.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "dynamic_optional_decl.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "dynamic_optional_decl.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "dynamic_optional_decl.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "dynamic_optional_decl.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -635,7 +529,7 @@
                               },
                               "end": {
                                 "line": 21,
-                                "column": 39,
+                                "column": 51,
                                 "program": "dynamic_optional_decl.ets"
                               }
                             }
diff --git a/ets2panda/test/parser/ets/empty_class-expected.txt b/ets2panda/test/parser/ets/empty_class-expected.txt
index 59f82bdf0fc3b3bb5b043e7a252383c756f88912..8cf346e6cecb247c0852e5a10299d8b25fd39c6d 100644
--- a/ets2panda/test/parser/ets/empty_class-expected.txt
+++ b/ets2panda/test/parser/ets/empty_class-expected.txt
@@ -284,112 +284,6 @@
                 "program": "empty_class.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "empty_class.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "empty_class.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "empty_class.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "empty_class.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "empty_class.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "empty_class.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "empty_class.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "empty_class.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/empty_statement-expected.txt b/ets2panda/test/parser/ets/empty_statement-expected.txt
index b943d266bf8bc3bb48c320eacf3dee5e95bb7ebf..e8dfad19316496954fd81cbd9ffa1816828b91ad 100644
--- a/ets2panda/test/parser/ets/empty_statement-expected.txt
+++ b/ets2panda/test/parser/ets/empty_statement-expected.txt
@@ -986,112 +986,6 @@
                 "program": "empty_statement.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "empty_statement.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "empty_statement.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "empty_statement.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "empty_statement.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "empty_statement.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "empty_statement.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "empty_statement.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "empty_statement.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/exports-expected.txt b/ets2panda/test/parser/ets/exports-expected.txt
index 115ec532d38afceef6fd716ec182bb0a397d1833..af774594e952f2d0f22a69306b40995e14e34210 100644
--- a/ets2panda/test/parser/ets/exports-expected.txt
+++ b/ets2panda/test/parser/ets/exports-expected.txt
@@ -381,177 +381,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "exports.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 13,
-                              "program": "exports.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 11,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "exports.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 18,
-                              "program": "exports.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "exports.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 18,
-                            "program": "exports.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "exports.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 18,
-                          "program": "exports.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "exports.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 18,
-                      "program": "exports.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "exports.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 18,
-                    "program": "exports.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "exports.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 18,
-                  "program": "exports.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "exports.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 18,
-                "program": "exports.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt b/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt
index 6062aa7e883fa11b3878a37bad47dfd213ebb08e..2c43e571498e8ad0483d9180f78918ed0eae51cb 100644
--- a/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt
+++ b/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "external_cyclic_constructor_check.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "external_cyclic_constructor_check.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "external_cyclic_constructor_check.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "external_cyclic_constructor_check.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "external_cyclic_constructor_check.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "external_cyclic_constructor_check.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "external_cyclic_constructor_check.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "external_cyclic_constructor_check.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/field_decl-expected.txt b/ets2panda/test/parser/ets/field_decl-expected.txt
index b13048343fa82e51b6907879af1ed0ba0e577255..1a7ff14cca1aaec47c555607f311fe5d3a5ce523 100644
--- a/ets2panda/test/parser/ets/field_decl-expected.txt
+++ b/ets2panda/test/parser/ets/field_decl-expected.txt
@@ -859,112 +859,6 @@
                 "program": "field_decl.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "field_decl.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "field_decl.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "field_decl.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "field_decl.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "field_decl.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "field_decl.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "field_decl.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "field_decl.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/final_empty_class-expected.txt b/ets2panda/test/parser/ets/final_empty_class-expected.txt
index cb234dfcc64c1f4736653594465f99f69fd77219..8140907a23f073713ed7fa435fafab4c8531a22b 100644
--- a/ets2panda/test/parser/ets/final_empty_class-expected.txt
+++ b/ets2panda/test/parser/ets/final_empty_class-expected.txt
@@ -284,112 +284,6 @@
                 "program": "final_empty_class.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "final_empty_class.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "final_empty_class.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "final_empty_class.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "final_empty_class.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "final_empty_class.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "final_empty_class.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "final_empty_class.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "final_empty_class.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/float_pont_format_1-expected.txt b/ets2panda/test/parser/ets/float_pont_format_1-expected.txt
index 9f2fe9f579e2b6d087e390e8b2c2c35c7604715b..5b032d949903bebcf4bb4140f5838d799466ac8f 100644
--- a/ets2panda/test/parser/ets/float_pont_format_1-expected.txt
+++ b/ets2panda/test/parser/ets/float_pont_format_1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/float_pont_format_2-expected.txt b/ets2panda/test/parser/ets/float_pont_format_2-expected.txt
index d5bb53cff2705650e73548937916e1c5f978b70a..897cb93b49869f840e13ac1299682e65b72bf823 100644
--- a/ets2panda/test/parser/ets/float_pont_format_2-expected.txt
+++ b/ets2panda/test/parser/ets/float_pont_format_2-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/float_pont_format_3-expected.txt b/ets2panda/test/parser/ets/float_pont_format_3-expected.txt
index 308d54d6812195ea2e1dc5a9e64764e1f10efdca..268f943971e4d4658d50363db8074866b7db8cc6 100644
--- a/ets2panda/test/parser/ets/float_pont_format_3-expected.txt
+++ b/ets2panda/test/parser/ets/float_pont_format_3-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/float_pont_format_4-expected.txt b/ets2panda/test/parser/ets/float_pont_format_4-expected.txt
index 74f0a097569b3fe15a51970117fb1071e3473d82..0987812d1e62d301476b119ecb005f3dd0774f30 100644
--- a/ets2panda/test/parser/ets/float_pont_format_4-expected.txt
+++ b/ets2panda/test/parser/ets/float_pont_format_4-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/float_pont_format_5-expected.txt b/ets2panda/test/parser/ets/float_pont_format_5-expected.txt
index b5eabd70ccbfa03924454e007db137be7ca813f2..54e743a1d857f7e327d93b66011f773c5d2ea5f8 100644
--- a/ets2panda/test/parser/ets/float_pont_format_5-expected.txt
+++ b/ets2panda/test/parser/ets/float_pont_format_5-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_5.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/float_pont_format_6-expected.txt b/ets2panda/test/parser/ets/float_pont_format_6-expected.txt
index fc847947e0103fbdc940c9c0f02e6fcc12d4a48b..1e3167ef881dd52c5b53f75f06c81463eda30821 100644
--- a/ets2panda/test/parser/ets/float_pont_format_6-expected.txt
+++ b/ets2panda/test/parser/ets/float_pont_format_6-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_6.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/float_pont_format_7-expected.txt b/ets2panda/test/parser/ets/float_pont_format_7-expected.txt
index 632e2de9ed39a392508d0b8e9d166b1aa445e8db..db2b0c06a26942035bb175c49bd1997b85fbf0fd 100644
--- a/ets2panda/test/parser/ets/float_pont_format_7-expected.txt
+++ b/ets2panda/test/parser/ets/float_pont_format_7-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/float_pont_format_8-expected.txt b/ets2panda/test/parser/ets/float_pont_format_8-expected.txt
index a11a9162bac7f684d96234c2d191327922c302ad..d9a246070937365bdf4d5289a3fa4225431115e5 100644
--- a/ets2panda/test/parser/ets/float_pont_format_8-expected.txt
+++ b/ets2panda/test/parser/ets/float_pont_format_8-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_pont_format_8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_pont_format_8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_pont_format_8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_pont_format_8.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/float_separator_1-expected.txt b/ets2panda/test/parser/ets/float_separator_1-expected.txt
index 81c9d0875e70b4a9c1b01c1d0b962b0c35d9fd65..ba1b66b845340ce873b3e8c42d862b835aa94716 100644
--- a/ets2panda/test/parser/ets/float_separator_1-expected.txt
+++ b/ets2panda/test/parser/ets/float_separator_1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_separator_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "float_separator_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_separator_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "float_separator_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_separator_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "float_separator_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "float_separator_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "float_separator_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/folder_import_index/index-expected.txt b/ets2panda/test/parser/ets/folder_import_index/index-expected.txt
index b3fd2b5adb26dfcb388f48994f9d304a619c95d4..88a6e48ba7f2f9160eb5c85330f2b658c521e8da 100644
--- a/ets2panda/test/parser/ets/folder_import_index/index-expected.txt
+++ b/ets2panda/test/parser/ets/folder_import_index/index-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "index.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "index.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "index.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "index.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "index.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "index.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "index.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "index.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/for_of-expected.txt b/ets2panda/test/parser/ets/for_of-expected.txt
index 4b94ee693eeb05f672ae40d54e21b725b9a46111..cbcf8ea3bb14fb8233057662261c9e46bb965e13 100644
--- a/ets2panda/test/parser/ets/for_of-expected.txt
+++ b/ets2panda/test/parser/ets/for_of-expected.txt
@@ -24,226 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "for_of.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "for_of.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 17,
-                                  "program": "for_of.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 18,
-                                  "program": "for_of.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 2,
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 20,
-                                  "program": "for_of.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 21,
-                                  "program": "for_of.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3,
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 23,
-                                  "program": "for_of.ets"
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 24,
-                                  "program": "for_of.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 16,
-                              "program": "for_of.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 25,
-                              "program": "for_of.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "for_of.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 25,
-                            "program": "for_of.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "for_of.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 25,
-                          "program": "for_of.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "for_of.ets"
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 25,
-                      "program": "for_of.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "for_of.ets"
-                  },
-                  "end": {
-                    "line": 17,
-                    "column": 25,
-                    "program": "for_of.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "for_of.ets"
-                },
-                "end": {
-                  "line": 17,
-                  "column": 25,
-                  "program": "for_of.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "for_of.ets"
-              },
-              "end": {
-                "line": 17,
-                "column": 25,
-                "program": "for_of.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -358,7 +138,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 25,
+                "column": 16,
                 "program": "for_of.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/for_with_break-expected.txt b/ets2panda/test/parser/ets/for_with_break-expected.txt
index d60aa7ae34c2038dc61776642b5e2854d11774c0..b3c602e498d8ad76b047d5db49261ec8e0ddc83a 100644
--- a/ets2panda/test/parser/ets/for_with_break-expected.txt
+++ b/ets2panda/test/parser/ets/for_with_break-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "for_with_break.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "for_with_break.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "for_with_break.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "for_with_break.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "for_with_break.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "for_with_break.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "for_with_break.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "for_with_break.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/forofUnboxing-expected.txt b/ets2panda/test/parser/ets/forofUnboxing-expected.txt
index cdbdae00b3d135db2dba22af95ec078e75343af8..11d30bed7d33384805659b5906fae0f902e36c9e 100644
--- a/ets2panda/test/parser/ets/forofUnboxing-expected.txt
+++ b/ets2panda/test/parser/ets/forofUnboxing-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "forofUnboxing.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "forofUnboxing.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "forofUnboxing.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "forofUnboxing.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "forofUnboxing.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "forofUnboxing.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "forofUnboxing.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "forofUnboxing.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -490,7 +384,7 @@
                                       },
                                       "end": {
                                         "line": 18,
-                                        "column": 35,
+                                        "column": 43,
                                         "program": "forofUnboxing.ets"
                                       }
                                     }
@@ -600,7 +494,7 @@
                                       },
                                       "end": {
                                         "line": 18,
-                                        "column": 57,
+                                        "column": 65,
                                         "program": "forofUnboxing.ets"
                                       }
                                     }
@@ -710,7 +604,7 @@
                                       },
                                       "end": {
                                         "line": 18,
-                                        "column": 79,
+                                        "column": 87,
                                         "program": "forofUnboxing.ets"
                                       }
                                     }
diff --git a/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt b/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt
index bebea4af249a492082897b29680597d6e93c24a3..fe33970813475367e7cba42a8bf147709268260b 100644
--- a/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt
+++ b/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt
@@ -396,112 +396,6 @@
                 "program": "funcParamWithOptionalParam.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "funcParamWithOptionalParam.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "funcParamWithOptionalParam.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "funcParamWithOptionalParam.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "funcParamWithOptionalParam.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "funcParamWithOptionalParam.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "funcParamWithOptionalParam.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "funcParamWithOptionalParam.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "funcParamWithOptionalParam.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/function-expected.txt b/ets2panda/test/parser/ets/function-expected.txt
index 47f01ee73d014e6bc4880842dc09f7be7c22ab8f..93cc8be9a37a76d1fcbf8d1b6eb33aa224e5672d 100644
--- a/ets2panda/test/parser/ets/function-expected.txt
+++ b/ets2panda/test/parser/ets/function-expected.txt
@@ -130,339 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "int2str",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 34,
-                              "column": 5,
-                              "program": "function.ets"
-                            },
-                            "end": {
-                              "line": 34,
-                              "column": 12,
-                              "program": "function.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrowFunctionExpression",
-                          "function": {
-                            "type": "ScriptFunction",
-                            "id": null,
-                            "generator": false,
-                            "async": false,
-                            "expression": false,
-                            "params": [
-                              {
-                                "type": "ETSParameterExpression",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "i",
-                                  "typeAnnotation": {
-                                    "type": "ETSPrimitiveType",
-                                    "loc": {
-                                      "start": {
-                                        "line": 34,
-                                        "column": 39,
-                                        "program": "function.ets"
-                                      },
-                                      "end": {
-                                        "line": 34,
-                                        "column": 42,
-                                        "program": "function.ets"
-                                      }
-                                    }
-                                  },
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 34,
-                                      "column": 36,
-                                      "program": "function.ets"
-                                    },
-                                    "end": {
-                                      "line": 34,
-                                      "column": 42,
-                                      "program": "function.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 34,
-                                    "column": 36,
-                                    "program": "function.ets"
-                                  },
-                                  "end": {
-                                    "line": 34,
-                                    "column": 42,
-                                    "program": "function.ets"
-                                  }
-                                }
-                              }
-                            ],
-                            "returnType": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "String",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 34,
-                                      "column": 45,
-                                      "program": "function.ets"
-                                    },
-                                    "end": {
-                                      "line": 34,
-                                      "column": 51,
-                                      "program": "function.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 34,
-                                    "column": 45,
-                                    "program": "function.ets"
-                                  },
-                                  "end": {
-                                    "line": 34,
-                                    "column": 54,
-                                    "program": "function.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 34,
-                                  "column": 45,
-                                  "program": "function.ets"
-                                },
-                                "end": {
-                                  "line": 34,
-                                  "column": 54,
-                                  "program": "function.ets"
-                                }
-                              }
-                            },
-                            "body": {
-                              "type": "BlockStatement",
-                              "statements": [
-                                {
-                                  "type": "ReturnStatement",
-                                  "argument": {
-                                    "type": "StringLiteral",
-                                    "value": "",
-                                    "loc": {
-                                      "start": {
-                                        "line": 35,
-                                        "column": 12,
-                                        "program": "function.ets"
-                                      },
-                                      "end": {
-                                        "line": 35,
-                                        "column": 14,
-                                        "program": "function.ets"
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 35,
-                                      "column": 5,
-                                      "program": "function.ets"
-                                    },
-                                    "end": {
-                                      "line": 35,
-                                      "column": 15,
-                                      "program": "function.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 34,
-                                  "column": 55,
-                                  "program": "function.ets"
-                                },
-                                "end": {
-                                  "line": 36,
-                                  "column": 2,
-                                  "program": "function.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 34,
-                                "column": 35,
-                                "program": "function.ets"
-                              },
-                              "end": {
-                                "line": 36,
-                                "column": 2,
-                                "program": "function.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 34,
-                              "column": 35,
-                              "program": "function.ets"
-                            },
-                            "end": {
-                              "line": 36,
-                              "column": 2,
-                              "program": "function.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 34,
-                            "column": 5,
-                            "program": "function.ets"
-                          },
-                          "end": {
-                            "line": 36,
-                            "column": 2,
-                            "program": "function.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 34,
-                          "column": 5,
-                          "program": "function.ets"
-                        },
-                        "end": {
-                          "line": 36,
-                          "column": 2,
-                          "program": "function.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 34,
-                      "column": 5,
-                      "program": "function.ets"
-                    },
-                    "end": {
-                      "line": 36,
-                      "column": 2,
-                      "program": "function.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 34,
-                    "column": 5,
-                    "program": "function.ets"
-                  },
-                  "end": {
-                    "line": 36,
-                    "column": 2,
-                    "program": "function.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 34,
-                  "column": 5,
-                  "program": "function.ets"
-                },
-                "end": {
-                  "line": 36,
-                  "column": 2,
-                  "program": "function.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 34,
-                "column": 5,
-                "program": "function.ets"
-              },
-              "end": {
-                "line": 36,
-                "column": 2,
-                "program": "function.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
@@ -1810,8 +1477,8 @@
                 "program": "function.ets"
               },
               "end": {
-                "line": 36,
-                "column": 2,
+                "line": 34,
+                "column": 35,
                 "program": "function.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt
index b96de3632a9402342be0cdb1ec8d2add729fb27a..b6a97fbba20cc3d7e23b8fbbcdf2175bc3320f0e 100644
--- a/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt
+++ b/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt
@@ -422,112 +422,6 @@
                 "program": "function_implicit_return_type5.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_implicit_return_type5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_implicit_return_type5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_implicit_return_type5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_implicit_return_type5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_implicit_return_type5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_implicit_return_type5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "function_implicit_return_type5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "function_implicit_return_type5.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/function_implicit_return_type6-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type6-expected.txt
index 03954a64fd53173f2e18b48ab1ce79e5a6a05766..87f232e9c9860687391a914a9d118f659715b15a 100644
--- a/ets2panda/test/parser/ets/function_implicit_return_type6-expected.txt
+++ b/ets2panda/test/parser/ets/function_implicit_return_type6-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_implicit_return_type6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_implicit_return_type6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_implicit_return_type6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_implicit_return_type6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_implicit_return_type6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_implicit_return_type6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "function_implicit_return_type6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "function_implicit_return_type6.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt
index 0962ccef9ceffe50004a461e66b0d385ca7a56cf..2e2007c5810331498430711d3ba8bf74a9c3115a 100644
--- a/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt
+++ b/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_implicit_return_type8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_implicit_return_type8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_implicit_return_type8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_implicit_return_type8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_implicit_return_type8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_implicit_return_type8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "function_implicit_return_type8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "function_implicit_return_type8.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt
index 66d7eac05862b05a8e4bf6a7b2db9257f9e674d3..84bd1575d90286413d0a0ee56cf69802cb4a1a19 100644
--- a/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt
+++ b/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt
@@ -364,112 +364,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_implicit_return_type9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "function_implicit_return_type9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_implicit_return_type9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "function_implicit_return_type9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_implicit_return_type9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "function_implicit_return_type9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "function_implicit_return_type9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "function_implicit_return_type9.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt
index 96a72b4e642db5692c3862ec2d5a00d40e70c26a..7dcbf282e5478e4fb773eacf6daca091a07980df 100644
--- a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt
+++ b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt
@@ -1699,1229 +1699,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "CallExpression",
-                        "callee": {
-                          "type": "Identifier",
-                          "name": "alma",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 1,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "arguments": [
-                          {
-                            "type": "TSAsExpression",
-                            "expression": {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 6,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 7,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            },
-                            "typeAnnotation": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "number",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 11,
-                                      "program": "genericDefaultParam_1.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 17,
-                                      "program": "genericDefaultParam_1.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 11,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 18,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 11,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 18,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 6,
-                                "program": "genericDefaultParam_1.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 7,
-                                "program": "genericDefaultParam_1.ets"
-                              }
-                            }
-                          }
-                        ],
-                        "optional": false,
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 1,
-                            "program": "genericDefaultParam_1.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 18,
-                            "program": "genericDefaultParam_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 1,
-                          "program": "genericDefaultParam_1.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 18,
-                          "program": "genericDefaultParam_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "CallExpression",
-                        "callee": {
-                          "type": "Identifier",
-                          "name": "alma",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 1,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "arguments": [
-                          {
-                            "type": "TSAsExpression",
-                            "expression": {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 14,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 15,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            },
-                            "typeAnnotation": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "number",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 21,
-                                      "column": 19,
-                                      "program": "genericDefaultParam_1.ets"
-                                    },
-                                    "end": {
-                                      "line": 21,
-                                      "column": 25,
-                                      "program": "genericDefaultParam_1.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 19,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 26,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 19,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 26,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 14,
-                                "program": "genericDefaultParam_1.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 15,
-                                "program": "genericDefaultParam_1.ets"
-                              }
-                            }
-                          }
-                        ],
-                        "optional": false,
-                        "typeParameters": {
-                          "type": "TSTypeParameterInstantiation",
-                          "params": [
-                            {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "number",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 21,
-                                      "column": 6,
-                                      "program": "genericDefaultParam_1.ets"
-                                    },
-                                    "end": {
-                                      "line": 21,
-                                      "column": 12,
-                                      "program": "genericDefaultParam_1.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 6,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 13,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 6,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 13,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 13,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 1,
-                            "program": "genericDefaultParam_1.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 26,
-                            "program": "genericDefaultParam_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 1,
-                          "program": "genericDefaultParam_1.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 26,
-                          "program": "genericDefaultParam_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "CallExpression",
-                        "callee": {
-                          "type": "Identifier",
-                          "name": "alma",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 1,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "arguments": [
-                          {
-                            "type": "StringLiteral",
-                            "value": "alma",
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 14,
-                                "program": "genericDefaultParam_1.ets"
-                              },
-                              "end": {
-                                "line": 22,
-                                "column": 20,
-                                "program": "genericDefaultParam_1.ets"
-                              }
-                            }
-                          }
-                        ],
-                        "optional": false,
-                        "typeParameters": {
-                          "type": "TSTypeParameterInstantiation",
-                          "params": [
-                            {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "string",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 6,
-                                      "program": "genericDefaultParam_1.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 12,
-                                      "program": "genericDefaultParam_1.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 22,
-                                    "column": 6,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 22,
-                                    "column": 13,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 6,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 13,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 13,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 1,
-                            "program": "genericDefaultParam_1.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 21,
-                            "program": "genericDefaultParam_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 1,
-                          "program": "genericDefaultParam_1.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 21,
-                          "program": "genericDefaultParam_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c1",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 31,
-                              "column": 5,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 31,
-                              "column": 7,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "C2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 31,
-                                    "column": 14,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 31,
-                                    "column": 16,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "typeParams": {
-                                "type": "TSTypeParameterInstantiation",
-                                "params": [
-                                  {
-                                    "type": "ETSTypeReference",
-                                    "part": {
-                                      "type": "ETSTypeReferencePart",
-                                      "name": {
-                                        "type": "Identifier",
-                                        "name": "number",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 31,
-                                            "column": 17,
-                                            "program": "genericDefaultParam_1.ets"
-                                          },
-                                          "end": {
-                                            "line": 31,
-                                            "column": 23,
-                                            "program": "genericDefaultParam_1.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 31,
-                                          "column": 17,
-                                          "program": "genericDefaultParam_1.ets"
-                                        },
-                                        "end": {
-                                          "line": 31,
-                                          "column": 24,
-                                          "program": "genericDefaultParam_1.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 31,
-                                        "column": 17,
-                                        "program": "genericDefaultParam_1.ets"
-                                      },
-                                      "end": {
-                                        "line": 31,
-                                        "column": 24,
-                                        "program": "genericDefaultParam_1.ets"
-                                      }
-                                    }
-                                  }
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 31,
-                                    "column": 16,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 31,
-                                    "column": 24,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 31,
-                                  "column": 14,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 32,
-                                  "column": 4,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 31,
-                                "column": 14,
-                                "program": "genericDefaultParam_1.ets"
-                              },
-                              "end": {
-                                "line": 32,
-                                "column": 4,
-                                "program": "genericDefaultParam_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 31,
-                              "column": 10,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 32,
-                              "column": 4,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 31,
-                            "column": 5,
-                            "program": "genericDefaultParam_1.ets"
-                          },
-                          "end": {
-                            "line": 32,
-                            "column": 4,
-                            "program": "genericDefaultParam_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 31,
-                          "column": 5,
-                          "program": "genericDefaultParam_1.ets"
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 4,
-                          "program": "genericDefaultParam_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 32,
-                              "column": 5,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 32,
-                              "column": 7,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "C2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 32,
-                                    "column": 14,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 32,
-                                    "column": 16,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "typeParams": {
-                                "type": "TSTypeParameterInstantiation",
-                                "params": [
-                                  {
-                                    "type": "ETSTypeReference",
-                                    "part": {
-                                      "type": "ETSTypeReferencePart",
-                                      "name": {
-                                        "type": "Identifier",
-                                        "name": "number",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 32,
-                                            "column": 17,
-                                            "program": "genericDefaultParam_1.ets"
-                                          },
-                                          "end": {
-                                            "line": 32,
-                                            "column": 23,
-                                            "program": "genericDefaultParam_1.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 32,
-                                          "column": 17,
-                                          "program": "genericDefaultParam_1.ets"
-                                        },
-                                        "end": {
-                                          "line": 32,
-                                          "column": 24,
-                                          "program": "genericDefaultParam_1.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 32,
-                                        "column": 17,
-                                        "program": "genericDefaultParam_1.ets"
-                                      },
-                                      "end": {
-                                        "line": 32,
-                                        "column": 24,
-                                        "program": "genericDefaultParam_1.ets"
-                                      }
-                                    }
-                                  },
-                                  {
-                                    "type": "ETSTypeReference",
-                                    "part": {
-                                      "type": "ETSTypeReferencePart",
-                                      "name": {
-                                        "type": "Identifier",
-                                        "name": "string",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 32,
-                                            "column": 25,
-                                            "program": "genericDefaultParam_1.ets"
-                                          },
-                                          "end": {
-                                            "line": 32,
-                                            "column": 31,
-                                            "program": "genericDefaultParam_1.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 32,
-                                          "column": 25,
-                                          "program": "genericDefaultParam_1.ets"
-                                        },
-                                        "end": {
-                                          "line": 32,
-                                          "column": 32,
-                                          "program": "genericDefaultParam_1.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 32,
-                                        "column": 25,
-                                        "program": "genericDefaultParam_1.ets"
-                                      },
-                                      "end": {
-                                        "line": 32,
-                                        "column": 32,
-                                        "program": "genericDefaultParam_1.ets"
-                                      }
-                                    }
-                                  }
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 32,
-                                    "column": 16,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 32,
-                                    "column": 32,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 32,
-                                  "column": 14,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 33,
-                                  "column": 4,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 32,
-                                "column": 14,
-                                "program": "genericDefaultParam_1.ets"
-                              },
-                              "end": {
-                                "line": 33,
-                                "column": 4,
-                                "program": "genericDefaultParam_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 32,
-                              "column": 10,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 33,
-                              "column": 4,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 32,
-                            "column": 5,
-                            "program": "genericDefaultParam_1.ets"
-                          },
-                          "end": {
-                            "line": 33,
-                            "column": 4,
-                            "program": "genericDefaultParam_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 5,
-                          "program": "genericDefaultParam_1.ets"
-                        },
-                        "end": {
-                          "line": 33,
-                          "column": 4,
-                          "program": "genericDefaultParam_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c3",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 33,
-                              "column": 5,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 33,
-                              "column": 7,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "C2",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 33,
-                                    "column": 14,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 33,
-                                    "column": 16,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "typeParams": {
-                                "type": "TSTypeParameterInstantiation",
-                                "params": [
-                                  {
-                                    "type": "ETSTypeReference",
-                                    "part": {
-                                      "type": "ETSTypeReferencePart",
-                                      "name": {
-                                        "type": "Identifier",
-                                        "name": "number",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 33,
-                                            "column": 17,
-                                            "program": "genericDefaultParam_1.ets"
-                                          },
-                                          "end": {
-                                            "line": 33,
-                                            "column": 23,
-                                            "program": "genericDefaultParam_1.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 33,
-                                          "column": 17,
-                                          "program": "genericDefaultParam_1.ets"
-                                        },
-                                        "end": {
-                                          "line": 33,
-                                          "column": 24,
-                                          "program": "genericDefaultParam_1.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 33,
-                                        "column": 17,
-                                        "program": "genericDefaultParam_1.ets"
-                                      },
-                                      "end": {
-                                        "line": 33,
-                                        "column": 24,
-                                        "program": "genericDefaultParam_1.ets"
-                                      }
-                                    }
-                                  },
-                                  {
-                                    "type": "ETSTypeReference",
-                                    "part": {
-                                      "type": "ETSTypeReferencePart",
-                                      "name": {
-                                        "type": "Identifier",
-                                        "name": "Object",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 33,
-                                            "column": 25,
-                                            "program": "genericDefaultParam_1.ets"
-                                          },
-                                          "end": {
-                                            "line": 33,
-                                            "column": 31,
-                                            "program": "genericDefaultParam_1.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 33,
-                                          "column": 25,
-                                          "program": "genericDefaultParam_1.ets"
-                                        },
-                                        "end": {
-                                          "line": 33,
-                                          "column": 32,
-                                          "program": "genericDefaultParam_1.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 33,
-                                        "column": 25,
-                                        "program": "genericDefaultParam_1.ets"
-                                      },
-                                      "end": {
-                                        "line": 33,
-                                        "column": 32,
-                                        "program": "genericDefaultParam_1.ets"
-                                      }
-                                    }
-                                  },
-                                  {
-                                    "type": "ETSTypeReference",
-                                    "part": {
-                                      "type": "ETSTypeReferencePart",
-                                      "name": {
-                                        "type": "Identifier",
-                                        "name": "number",
-                                        "decorators": [],
-                                        "loc": {
-                                          "start": {
-                                            "line": 33,
-                                            "column": 33,
-                                            "program": "genericDefaultParam_1.ets"
-                                          },
-                                          "end": {
-                                            "line": 33,
-                                            "column": 39,
-                                            "program": "genericDefaultParam_1.ets"
-                                          }
-                                        }
-                                      },
-                                      "loc": {
-                                        "start": {
-                                          "line": 33,
-                                          "column": 33,
-                                          "program": "genericDefaultParam_1.ets"
-                                        },
-                                        "end": {
-                                          "line": 33,
-                                          "column": 40,
-                                          "program": "genericDefaultParam_1.ets"
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 33,
-                                        "column": 33,
-                                        "program": "genericDefaultParam_1.ets"
-                                      },
-                                      "end": {
-                                        "line": 33,
-                                        "column": 40,
-                                        "program": "genericDefaultParam_1.ets"
-                                      }
-                                    }
-                                  }
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 33,
-                                    "column": 16,
-                                    "program": "genericDefaultParam_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 33,
-                                    "column": 40,
-                                    "program": "genericDefaultParam_1.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 33,
-                                  "column": 14,
-                                  "program": "genericDefaultParam_1.ets"
-                                },
-                                "end": {
-                                  "line": 34,
-                                  "column": 1,
-                                  "program": "genericDefaultParam_1.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 33,
-                                "column": 14,
-                                "program": "genericDefaultParam_1.ets"
-                              },
-                              "end": {
-                                "line": 34,
-                                "column": 1,
-                                "program": "genericDefaultParam_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 33,
-                              "column": 10,
-                              "program": "genericDefaultParam_1.ets"
-                            },
-                            "end": {
-                              "line": 34,
-                              "column": 1,
-                              "program": "genericDefaultParam_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 33,
-                            "column": 5,
-                            "program": "genericDefaultParam_1.ets"
-                          },
-                          "end": {
-                            "line": 34,
-                            "column": 1,
-                            "program": "genericDefaultParam_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 33,
-                          "column": 5,
-                          "program": "genericDefaultParam_1.ets"
-                        },
-                        "end": {
-                          "line": 34,
-                          "column": 1,
-                          "program": "genericDefaultParam_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 20,
-                      "column": 1,
-                      "program": "genericDefaultParam_1.ets"
-                    },
-                    "end": {
-                      "line": 34,
-                      "column": 1,
-                      "program": "genericDefaultParam_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 20,
-                    "column": 1,
-                    "program": "genericDefaultParam_1.ets"
-                  },
-                  "end": {
-                    "line": 34,
-                    "column": 1,
-                    "program": "genericDefaultParam_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 20,
-                  "column": 1,
-                  "program": "genericDefaultParam_1.ets"
-                },
-                "end": {
-                  "line": 34,
-                  "column": 1,
-                  "program": "genericDefaultParam_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 20,
-                "column": 1,
-                "program": "genericDefaultParam_1.ets"
-              },
-              "end": {
-                "line": 34,
-                "column": 1,
-                "program": "genericDefaultParam_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt
index e5fc0bf4fc8a89766dc9f5a0d0342d681685369c..6a104a46e2bba92641927579bc78b083111b2466 100644
--- a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt
+++ b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt
@@ -130,179 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "CallExpression",
-                        "callee": {
-                          "type": "Identifier",
-                          "name": "alma",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 1,
-                              "program": "genericDefaultParam_3.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "genericDefaultParam_3.ets"
-                            }
-                          }
-                        },
-                        "arguments": [
-                          {
-                            "type": "StringLiteral",
-                            "value": "alma",
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 6,
-                                "program": "genericDefaultParam_3.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 12,
-                                "program": "genericDefaultParam_3.ets"
-                              }
-                            }
-                          }
-                        ],
-                        "optional": false,
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 1,
-                            "program": "genericDefaultParam_3.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 13,
-                            "program": "genericDefaultParam_3.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 1,
-                          "program": "genericDefaultParam_3.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 13,
-                          "program": "genericDefaultParam_3.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 20,
-                      "column": 1,
-                      "program": "genericDefaultParam_3.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 13,
-                      "program": "genericDefaultParam_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 20,
-                    "column": 1,
-                    "program": "genericDefaultParam_3.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 13,
-                    "program": "genericDefaultParam_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 20,
-                  "column": 1,
-                  "program": "genericDefaultParam_3.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 13,
-                  "program": "genericDefaultParam_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 20,
-                "column": 1,
-                "program": "genericDefaultParam_3.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 13,
-                "program": "genericDefaultParam_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generic_function-expected.txt b/ets2panda/test/parser/ets/generic_function-expected.txt
index e71bef29a18747605358d10ba1c7766ecc007b97..7671eb2bbb309847e67dbf9ba6b8cf4bf7b943d1 100644
--- a/ets2panda/test/parser/ets/generic_function-expected.txt
+++ b/ets2panda/test/parser/ets/generic_function-expected.txt
@@ -397,112 +397,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_function.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_function.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_function.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_function.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generic_resolve-expected.txt b/ets2panda/test/parser/ets/generic_resolve-expected.txt
index f02345ea4ed851fcd136de2d56cce7d9cb04b859..2d5e9048470555d92798a5fb21398a4b728d200c 100644
--- a/ets2panda/test/parser/ets/generic_resolve-expected.txt
+++ b/ets2panda/test/parser/ets/generic_resolve-expected.txt
@@ -1471,112 +1471,6 @@
                 "program": "generic_resolve.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_resolve.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generic_resolve.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_resolve.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generic_resolve.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_resolve.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generic_resolve.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_resolve.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generic_resolve.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/generics_2-expected.txt b/ets2panda/test/parser/ets/generics_2-expected.txt
index f7a4fc92f11da4e66de04d8a0ece744f1bfbd4ff..c0254ab959b5ce0a6523294b461e162b33c4a929 100644
--- a/ets2panda/test/parser/ets/generics_2-expected.txt
+++ b/ets2panda/test/parser/ets/generics_2-expected.txt
@@ -1250,7 +1250,7 @@
                           },
                           "end": {
                             "line": 26,
-                            "column": 20,
+                            "column": 34,
                             "program": "generics_2.ets"
                           }
                         }
@@ -1583,112 +1583,6 @@
                 "program": "generics_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/generics_3-expected.txt b/ets2panda/test/parser/ets/generics_3-expected.txt
index 49f6186bb1b89fcfe8f29e6630ccecbbfb68973f..97817de66f29b0c2fa72275bc1d95583a5b65c8e 100644
--- a/ets2panda/test/parser/ets/generics_3-expected.txt
+++ b/ets2panda/test/parser/ets/generics_3-expected.txt
@@ -260,112 +260,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_4-expected.txt b/ets2panda/test/parser/ets/generics_4-expected.txt
index 130c4a1f9422d1795fa937b71e7a95b693b6fc03..26c5250aeb431453d17b50ea202c25ad35d932bd 100644
--- a/ets2panda/test/parser/ets/generics_4-expected.txt
+++ b/ets2panda/test/parser/ets/generics_4-expected.txt
@@ -292,112 +292,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_5-expected.txt b/ets2panda/test/parser/ets/generics_5-expected.txt
index c9ec195c163b9bafa42ad88ca7dd0eabc330370b..7be724fd6f922eb726636a5de61f3e6fb50343b0 100644
--- a/ets2panda/test/parser/ets/generics_5-expected.txt
+++ b/ets2panda/test/parser/ets/generics_5-expected.txt
@@ -228,112 +228,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_5.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_6-expected.txt b/ets2panda/test/parser/ets/generics_6-expected.txt
index 0f2f38d503080642009f90d6c12f10d415099b6d..b8d201ca183d095d0470c2129d3bfd881527d620 100644
--- a/ets2panda/test/parser/ets/generics_6-expected.txt
+++ b/ets2panda/test/parser/ets/generics_6-expected.txt
@@ -464,112 +464,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_6.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_7-expected.txt b/ets2panda/test/parser/ets/generics_7-expected.txt
index 42af81815f72739dfa5d3a74db8d228cbb892c71..7ec9c766aedb1397f98a31c2a0c7873c99c20908 100644
--- a/ets2panda/test/parser/ets/generics_7-expected.txt
+++ b/ets2panda/test/parser/ets/generics_7-expected.txt
@@ -464,112 +464,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_recursive-expected.txt b/ets2panda/test/parser/ets/generics_recursive-expected.txt
index c3cf4af3a7530fe6ed7863f3779b8e9ce56e021b..7ef44ea32d584702d027062754b5a4235c9db123 100644
--- a/ets2panda/test/parser/ets/generics_recursive-expected.txt
+++ b/ets2panda/test/parser/ets/generics_recursive-expected.txt
@@ -3217,112 +3217,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_recursive.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_recursive.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_recursive.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_recursive.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_recursive.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_recursive.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_recursive.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_recursive.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_1-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_1-expected.txt
index 71d04ce4580716a770f5fb7a129b70a1cc1430ec..4cd7c938207eddece0961f050de27dda114c54cd 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_1-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_1-expected.txt
@@ -339,112 +339,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt
index 786a63eb29ea91b485a3ac5445b397d1d29d987c..8e465cf3655e9a2dee6250b27a328aeeff49b980 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_10.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_10.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_10.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_10.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_10.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_10.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_10.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_10.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt
index f9da1689fbb11791d11ea4cbc84e9edaff6dd5f8..a509ad98cd8795db694789713545f83403f3d6f8 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt
@@ -1221,112 +1221,6 @@
                 "program": "generics_type_param_constraint_11.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_11.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_11.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_11.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_11.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_11.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_11.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_11.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_11.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt
index f5b5c47471ba5050000374aef0995b647b196061..557cab7d954c76f90953a1ec0376a476e99280ec 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt
@@ -1181,112 +1181,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_12.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_12.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_12.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_12.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_12.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_12.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_12.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_12.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_2-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_2-expected.txt
index a0fa5c44246fdb579c2ea3c473fc0ed27a71bc09..d282155c8160020a9a9dcaeedae4df446352ec0f 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_2-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_2-expected.txt
@@ -338,112 +338,6 @@
                 "program": "generics_type_param_constraint_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_3-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_3-expected.txt
index 296a7f0dd7875c978bb49fcf3cc8ca20621a83be..905cace25c4d09cfc779e5f4a1a277faaeea3029 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_3-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_3-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt
index b1d6295cfb9f2b4cf656afc72ae3611697a1d64e..b46f34ced631750381d34d36d7e4eb6c19c88a2a 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt
@@ -728,112 +728,6 @@
                 "program": "generics_type_param_constraint_4.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_4.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt
index babbbd84dec056a4a5cf5b44f31a23fa6ed7567e..45ebb3e92eb9e5baa388064664501ab1b83314ba 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt
@@ -1024,112 +1024,6 @@
                 "program": "generics_type_param_constraint_5.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_5.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_6-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_6-expected.txt
index 9b38405bea036abb29ef2ab2498df047e7fb3d3b..eca962bbd4ee4c93a3cdde5c11739c75d4c1681d 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_6-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_6-expected.txt
@@ -371,112 +371,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_6.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_7-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_7-expected.txt
index 9018e47953a733bd42fd170f580917a0e750d2e7..f7217abad41645017bc216cf3e1bf2277b7eb8c5 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_7-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_7-expected.txt
@@ -339,112 +339,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_9-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_9-expected.txt
index 188cabf31a1212decd3c76bcc3892c2efa7e93fb..0c14c91ebfeb88ccef2a04610c9eee4a74143497 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_9-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_9-expected.txt
@@ -808,112 +808,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "generics_type_param_constraint_9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "generics_type_param_constraint_9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "generics_type_param_constraint_9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "generics_type_param_constraint_9.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/getterOverride-expected.txt b/ets2panda/test/parser/ets/getterOverride-expected.txt
index f0a3f223783a11df6890c565095fd071a7af373a..bd42860e16b01e2c343137f192d3590cc7b66a1f 100644
--- a/ets2panda/test/parser/ets/getterOverride-expected.txt
+++ b/ets2panda/test/parser/ets/getterOverride-expected.txt
@@ -719,112 +719,6 @@
                 "program": "getterOverride.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "getterOverride.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "getterOverride.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "getterOverride.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "getterOverride.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "getterOverride.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "getterOverride.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "getterOverride.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "getterOverride.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt b/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt
index 844ee1f9c1e0d62da110c6a42dee25f9a490f372..6e8363be3e390f939739741a775a661b90f5bc1a 100644
--- a/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt
+++ b/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt
@@ -2071,112 +2071,6 @@
                 "program": "getter_setter_access_modifiers.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "getter_setter_access_modifiers.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "getter_setter_access_modifiers.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "getter_setter_access_modifiers.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "getter_setter_access_modifiers.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "getter_setter_access_modifiers.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "getter_setter_access_modifiers.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "getter_setter_access_modifiers.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "getter_setter_access_modifiers.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt
index 3d009e987b6d8d3b7ffa1c6f8b015bbca18b21e4..d2d1a7b66a19fca78971a2485a9e42ebfccb4aa6 100644
--- a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt
+++ b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt
@@ -1063,112 +1063,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "globalVarInLambdaInStatic.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "globalVarInLambdaInStatic.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "globalVarInLambdaInStatic.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "globalVarInLambdaInStatic.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "globalVarInLambdaInStatic.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "globalVarInLambdaInStatic.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "globalVarInLambdaInStatic.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "globalVarInLambdaInStatic.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/global_const_vars3-expected.txt b/ets2panda/test/parser/ets/global_const_vars3-expected.txt
index 8a741aaeb08344d5584706f4f72348aa1029fc3d..7ef767883164d68fb050a4a11990cd1e4a9d0f9f 100644
--- a/ets2panda/test/parser/ets/global_const_vars3-expected.txt
+++ b/ets2panda/test/parser/ets/global_const_vars3-expected.txt
@@ -638,112 +638,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "global_const_vars3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "global_const_vars3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "global_const_vars3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "global_const_vars3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "global_const_vars3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "global_const_vars3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "global_const_vars3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "global_const_vars3.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/identifier-expected.txt b/ets2panda/test/parser/ets/identifier-expected.txt
index a6f4417feaf3bf84b559af5943d39dacf4861777..73640128af002983549ede64fa8a03ee2d7a2634 100644
--- a/ets2panda/test/parser/ets/identifier-expected.txt
+++ b/ets2panda/test/parser/ets/identifier-expected.txt
@@ -130,305 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "simple_ident",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "identifier.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 17,
-                              "program": "identifier.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 25,
-                              "program": "identifier.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 26,
-                              "program": "identifier.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "identifier.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 26,
-                            "program": "identifier.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "identifier.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 26,
-                          "program": "identifier.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "_underscore_ident",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "identifier.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 22,
-                              "program": "identifier.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 2,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 30,
-                              "program": "identifier.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 31,
-                              "program": "identifier.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "identifier.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 31,
-                            "program": "identifier.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "identifier.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 31,
-                          "program": "identifier.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "$dollar_ident",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "identifier.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 18,
-                              "program": "identifier.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 3,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 26,
-                              "program": "identifier.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 27,
-                              "program": "identifier.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "identifier.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 27,
-                            "program": "identifier.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "identifier.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 27,
-                          "program": "identifier.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "identifier.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 27,
-                      "program": "identifier.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "identifier.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 27,
-                    "program": "identifier.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "identifier.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 27,
-                  "program": "identifier.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "identifier.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 27,
-                "program": "identifier.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -479,7 +180,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 26,
+                "column": 25,
                 "program": "identifier.ets"
               }
             }
@@ -534,7 +235,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 31,
+                "column": 30,
                 "program": "identifier.ets"
               }
             }
@@ -589,7 +290,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 27,
+                "column": 26,
                 "program": "identifier.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/if-expected.txt b/ets2panda/test/parser/ets/if-expected.txt
index f9582adc857969e3e62d8cf30c2fc3c2e23144a0..8ace447bd694a7d00b8d9ed25419aa76822945c9 100644
--- a/ets2panda/test/parser/ets/if-expected.txt
+++ b/ets2panda/test/parser/ets/if-expected.txt
@@ -3128,112 +3128,6 @@
                 "program": "if.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "if.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "if.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "if.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "if.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "if.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "if.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "if.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "if.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/ifs-expected.txt b/ets2panda/test/parser/ets/ifs-expected.txt
index 58b0d3984c329486a555780f03f15513d1a3313b..810a495289bbd29211b5fcc419456782c8cbd7e9 100644
--- a/ets2panda/test/parser/ets/ifs-expected.txt
+++ b/ets2panda/test/parser/ets/ifs-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ifs.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "ifs.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ifs.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "ifs.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ifs.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "ifs.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "ifs.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "ifs.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_conts-expected.txt b/ets2panda/test/parser/ets/import_conts-expected.txt
index baf26b45e81df4d7626e76f2dedc33697dd56e26..86a4368b7a4bc2ca09d653ec190f3f4b49ca4313 100644
--- a/ets2panda/test/parser/ets/import_conts-expected.txt
+++ b/ets2panda/test/parser/ets/import_conts-expected.txt
@@ -253,112 +253,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_conts.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_conts.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_conts.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_conts.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_conts.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_conts.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_conts.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_conts.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_folder-expected.txt b/ets2panda/test/parser/ets/import_folder-expected.txt
index 2b3a2754d3f6ecf8a6caee54f521973e273693b2..2eee771e75cf049c7c7c94a764fa856d842798ef 100644
--- a/ets2panda/test/parser/ets/import_folder-expected.txt
+++ b/ets2panda/test/parser/ets/import_folder-expected.txt
@@ -194,196 +194,6 @@
                 "program": "import_folder.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "CallExpression",
-                        "callee": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "all",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 1,
-                                "program": "import_folder.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 4,
-                                "program": "import_folder.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "Identifier",
-                            "name": "ad",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 5,
-                                "program": "import_folder.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 7,
-                                "program": "import_folder.ets"
-                              }
-                            }
-                          },
-                          "computed": false,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 1,
-                              "program": "import_folder.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 7,
-                              "program": "import_folder.ets"
-                            }
-                          }
-                        },
-                        "arguments": [],
-                        "optional": false,
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 1,
-                            "program": "import_folder.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 9,
-                            "program": "import_folder.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 1,
-                          "program": "import_folder.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 10,
-                          "program": "import_folder.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 1,
-                      "program": "import_folder.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 10,
-                      "program": "import_folder.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 1,
-                    "program": "import_folder.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 10,
-                    "program": "import_folder.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 1,
-                  "program": "import_folder.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 10,
-                  "program": "import_folder.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 1,
-                "program": "import_folder.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 10,
-                "program": "import_folder.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/check_exported_2-expected.txt b/ets2panda/test/parser/ets/import_tests/check_exported_2-expected.txt
index 904d5fb0767c9b86234f1a9a9cd11b9f99248eca..2d41441dd084070186d0d34bb31b60d0078156dc 100644
--- a/ets2panda/test/parser/ets/import_tests/check_exported_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/check_exported_2-expected.txt
@@ -195,112 +195,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "check_exported_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "check_exported_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "check_exported_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "check_exported_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "check_exported_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "check_exported_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "check_exported_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "check_exported_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/check_exported_3-expected.txt b/ets2panda/test/parser/ets/import_tests/check_exported_3-expected.txt
index c1ce9f969b578478af0852d5bd9ccba41d2688bb..9b132b4048f8860c9ce5573af15eca9410918a56 100644
--- a/ets2panda/test/parser/ets/import_tests/check_exported_3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/check_exported_3-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "check_exported_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "check_exported_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "check_exported_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "check_exported_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "check_exported_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "check_exported_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "check_exported_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "check_exported_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/check_exported_default_class-expected.txt b/ets2panda/test/parser/ets/import_tests/check_exported_default_class-expected.txt
index f7a571b353721a648eed1b861bb6501b704e5bf1..db6961a878dff3b2346a57dab0a84ace148987f7 100644
--- a/ets2panda/test/parser/ets/import_tests/check_exported_default_class-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/check_exported_default_class-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "check_exported_default_class.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "check_exported_default_class.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "check_exported_default_class.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "check_exported_default_class.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "check_exported_default_class.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "check_exported_default_class.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "check_exported_default_class.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "check_exported_default_class.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/default_import-expected.txt b/ets2panda/test/parser/ets/import_tests/default_import-expected.txt
index fe7c3e9a0c7fabb245fe2a45328c5923a80b3ab6..86f2b6877c4d7d8a003308bc3829f949725bc440 100644
--- a/ets2panda/test/parser/ets/import_tests/default_import-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/default_import-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_import.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_import.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_import.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_import.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_import.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_import.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "default_import.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "default_import.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/diamond/test1-expected.txt b/ets2panda/test/parser/ets/import_tests/diamond/test1-expected.txt
index e081d86b4d00e6d0971f2b92dbe5be408a0dcfa2..72ec305a42c012b89bf4c0bcbdb576d67d6d61cc 100644
--- a/ets2panda/test/parser/ets/import_tests/diamond/test1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/diamond/test1-expected.txt
@@ -188,112 +188,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/diamond/test2-expected.txt b/ets2panda/test/parser/ets/import_tests/diamond/test2-expected.txt
index c4a28c662d76eb1184fe7ff7e2c67b5773981c8e..92c971aac0746c488ea64dad7796165da53bc26a 100644
--- a/ets2panda/test/parser/ets/import_tests/diamond/test2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/diamond/test2-expected.txt
@@ -212,178 +212,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "foo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "test2.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 15,
-                              "program": "test2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "bar",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 18,
-                              "program": "test2.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 21,
-                              "program": "test2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "test2.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 21,
-                            "program": "test2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "test2.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 21,
-                          "program": "test2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 12,
-                      "program": "test2.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 21,
-                      "program": "test2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 12,
-                    "program": "test2.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 21,
-                    "program": "test2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 12,
-                  "program": "test2.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 21,
-                  "program": "test2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 12,
-                "program": "test2.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 21,
-                "program": "test2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/diamond/test3-expected.txt b/ets2panda/test/parser/ets/import_tests/diamond/test3-expected.txt
index d3f7c60275f9c9dceba68af75ab7b66d14df59ed..9ced877171c55dc0149eba2447c75e208caeaa5e 100644
--- a/ets2panda/test/parser/ets/import_tests/diamond/test3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/diamond/test3-expected.txt
@@ -212,178 +212,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "goo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "test3.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 15,
-                              "program": "test3.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "bar",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 18,
-                              "program": "test3.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 21,
-                              "program": "test3.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "test3.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 21,
-                            "program": "test3.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "test3.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 21,
-                          "program": "test3.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 12,
-                      "program": "test3.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 21,
-                      "program": "test3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 12,
-                    "program": "test3.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 21,
-                    "program": "test3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 12,
-                  "program": "test3.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 21,
-                  "program": "test3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 12,
-                "program": "test3.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 21,
-                "program": "test3.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/diamond/test4-expected.txt b/ets2panda/test/parser/ets/import_tests/diamond/test4-expected.txt
index 4873ef0acaa7b1a608648a486a9a12bea277d9ca..269896147112a17607bd03c242ed4c1bb057a4df 100644
--- a/ets2panda/test/parser/ets/import_tests/diamond/test4-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/diamond/test4-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "bar",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "test4.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "test4.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 18,
-                              "program": "test4.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 19,
-                              "program": "test4.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "test4.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 19,
-                            "program": "test4.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "test4.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 19,
-                          "program": "test4.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "test4.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 19,
-                      "program": "test4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "test4.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 19,
-                    "program": "test4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "test4.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 19,
-                  "program": "test4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "test4.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 19,
-                "program": "test4.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/duplicated/classdef-expected.txt b/ets2panda/test/parser/ets/import_tests/duplicated/classdef-expected.txt
index 6deca414cf36e7e33e514171fe456b4efe93e27a..df94e395c22878e29896a74b0c2f6ab84f791d03 100644
--- a/ets2panda/test/parser/ets/import_tests/duplicated/classdef-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/duplicated/classdef-expected.txt
@@ -284,112 +284,6 @@
                 "program": "classdef.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "classdef.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "classdef.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "classdef.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "classdef.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "classdef.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "classdef.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "classdef.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "classdef.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt b/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt
index 50233e3a7d4830ab9b1fc93697914f22abe62f53..dac14d3bec14258556dc4fd01ef112056434b453 100644
--- a/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt
@@ -212,112 +212,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "extdef.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "extdef.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "extdef.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "extdef.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "extdef.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "extdef.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "extdef.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "extdef.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/duplicated/extusedef-expected.txt b/ets2panda/test/parser/ets/import_tests/duplicated/extusedef-expected.txt
index 8dc2532cec12496b56fcc7c5ce5152dba6c2c00c..24611dbef054ac6ab0a0f04d57f85b220a53c9a8 100644
--- a/ets2panda/test/parser/ets/import_tests/duplicated/extusedef-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/duplicated/extusedef-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "extusedef.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "extusedef.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "extusedef.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "extusedef.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "extusedef.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "extusedef.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "extusedef.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "extusedef.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/export_type_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/export_type_alias-expected.txt
index 1434bcf65def0f992e97148a70d258573c3c5048..459aab93df39cf7b799b735ed575529e06d8384d 100644
--- a/ets2panda/test/parser/ets/import_tests/export_type_alias-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/export_type_alias-expected.txt
@@ -410,112 +410,6 @@
                 "program": "export_type_alias.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_type_alias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_type_alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_type_alias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_type_alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_type_alias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_type_alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "export_type_alias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "export_type_alias.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/folderWithoutIndexOrPackage/separate_module-expected.txt b/ets2panda/test/parser/ets/import_tests/folderWithoutIndexOrPackage/separate_module-expected.txt
index 55bfea0bcf35c0f231c9a640f172b4b547a020da..a230fb461443dc6a0e86318e1472424c3a42ad48 100644
--- a/ets2panda/test/parser/ets/import_tests/folderWithoutIndexOrPackage/separate_module-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/folderWithoutIndexOrPackage/separate_module-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "separate_module.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 13,
-                              "program": "separate_module.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 10,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 22,
-                              "program": "separate_module.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 24,
-                              "program": "separate_module.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "separate_module.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 24,
-                            "program": "separate_module.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "separate_module.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 24,
-                          "program": "separate_module.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "separate_module.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 24,
-                      "program": "separate_module.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "separate_module.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 24,
-                    "program": "separate_module.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "separate_module.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 24,
-                  "program": "separate_module.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "separate_module.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 24,
-                "program": "separate_module.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -351,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 24,
+                "column": 22,
                 "program": "separate_module.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt
index 0ca3ab585f4a84d73238d562a9b19c80097d8186..4f3746120eef3d4b7e558c0f4ad6b970cb1d99ff 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt
@@ -652,241 +652,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "goo1",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 28,
-                              "column": 5,
-                              "program": "export.ets"
-                            },
-                            "end": {
-                              "line": 28,
-                              "column": 9,
-                              "program": "export.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 10,
-                          "loc": {
-                            "start": {
-                              "line": 28,
-                              "column": 12,
-                              "program": "export.ets"
-                            },
-                            "end": {
-                              "line": 28,
-                              "column": 14,
-                              "program": "export.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 28,
-                            "column": 5,
-                            "program": "export.ets"
-                          },
-                          "end": {
-                            "line": 28,
-                            "column": 14,
-                            "program": "export.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 5,
-                          "program": "export.ets"
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 14,
-                          "program": "export.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "goo2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 30,
-                              "column": 12,
-                              "program": "export.ets"
-                            },
-                            "end": {
-                              "line": 30,
-                              "column": 16,
-                              "program": "export.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 10,
-                          "loc": {
-                            "start": {
-                              "line": 30,
-                              "column": 19,
-                              "program": "export.ets"
-                            },
-                            "end": {
-                              "line": 30,
-                              "column": 21,
-                              "program": "export.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 30,
-                            "column": 12,
-                            "program": "export.ets"
-                          },
-                          "end": {
-                            "line": 30,
-                            "column": 21,
-                            "program": "export.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 12,
-                          "program": "export.ets"
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 21,
-                          "program": "export.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 28,
-                      "column": 5,
-                      "program": "export.ets"
-                    },
-                    "end": {
-                      "line": 30,
-                      "column": 21,
-                      "program": "export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 28,
-                    "column": 5,
-                    "program": "export.ets"
-                  },
-                  "end": {
-                    "line": 30,
-                    "column": 21,
-                    "program": "export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 28,
-                  "column": 5,
-                  "program": "export.ets"
-                },
-                "end": {
-                  "line": 30,
-                  "column": 21,
-                  "program": "export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 28,
-                "column": 5,
-                "program": "export.ets"
-              },
-              "end": {
-                "line": 30,
-                "column": 21,
-                "program": "export.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt
index 80b3629c7c7d965636807d3b78f22c13224a9fa1..89d44f0d23b0c2a456c3b1bc415db869bd9823a3 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_alias_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_alias_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_alias_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_alias_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_alias_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_alias_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_alias_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_alias_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt
index 0ac5d41a7aafdb4b432533e6e6990d44e71075b0..d056f359ef0d6176b0a59b9c0ed58d4986ce5b7d 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt
@@ -171,112 +171,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_alias_and_without_alias_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_alias_and_without_alias_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_alias_and_without_alias_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_alias_and_without_alias_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_alias_and_without_alias_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_alias_and_without_alias_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_alias_and_without_alias_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_alias_and_without_alias_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt
index 30b22642eb2fc129100e17f6eac5bba1b89ade8c..9304c6f83e2abf147be88b628a4d7e65e264f41a 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt
@@ -253,112 +253,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_alias_and_without_alias_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_alias_and_without_alias_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_alias_and_without_alias_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_alias_and_without_alias_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_alias_and_without_alias_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_alias_and_without_alias_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_alias_and_without_alias_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_alias_and_without_alias_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt
index 3327cfbf56e50c20cb4985fa3024bc0775847460..bf006ec60a7e3c5c19767ef84d289805498996fb 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt
@@ -253,112 +253,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_alias_and_without_alias_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_alias_and_without_alias_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_alias_and_without_alias_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_alias_and_without_alias_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_alias_and_without_alias_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_alias_and_without_alias_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_alias_and_without_alias_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_alias_and_without_alias_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_all-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all-expected.txt
index 0512196c6653fc1de7055d04514064d46cd794ea..dcec61044e5a4c78b505a0d308be746d911445da 100755
--- a/ets2panda/test/parser/ets/import_tests/import_all-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_all-expected.txt
@@ -260,582 +260,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_all.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_all.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "all",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 9,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 12,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 16,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_all.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 16,
-                                "program": "import_all.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "all",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 17,
-                                    "program": "import_all.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 20,
-                                    "program": "import_all.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "dbl",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 21,
-                                    "program": "import_all.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 24,
-                                    "program": "import_all.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 17,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 24,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_all.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 54,
-                              "program": "import_all.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_all.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 54,
-                            "program": "import_all.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_all.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 54,
-                          "program": "import_all.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "import_all.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "import_all.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "all",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 9,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 12,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 16,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 9,
-                                "program": "import_all.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 16,
-                                "program": "import_all.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "all",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 17,
-                                    "program": "import_all.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 20,
-                                    "program": "import_all.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "flt",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 21,
-                                    "program": "import_all.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 24,
-                                    "program": "import_all.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 17,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 24,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "import_all.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 53,
-                              "program": "import_all.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "import_all.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 53,
-                            "program": "import_all.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "import_all.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 53,
-                          "program": "import_all.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "z",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "import_all.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "import_all.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "sub",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 9,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 12,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 13,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 16,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 9,
-                                "program": "import_all.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 16,
-                                "program": "import_all.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "StringLiteral",
-                              "value": "foo",
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 17,
-                                  "program": "import_all.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 22,
-                                  "program": "import_all.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 9,
-                              "program": "import_all.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 52,
-                              "program": "import_all.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "import_all.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 52,
-                            "program": "import_all.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "import_all.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 52,
-                          "program": "import_all.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 5,
-                      "program": "import_all.ets"
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 52,
-                      "program": "import_all.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 5,
-                    "program": "import_all.ets"
-                  },
-                  "end": {
-                    "line": 21,
-                    "column": 52,
-                    "program": "import_all.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 5,
-                  "program": "import_all.ets"
-                },
-                "end": {
-                  "line": 21,
-                  "column": 52,
-                  "program": "import_all.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 5,
-                "program": "import_all.ets"
-              },
-              "end": {
-                "line": 21,
-                "column": 52,
-                "program": "import_all.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt
index 494c9892e094aa21b5cdc17bebf736508366c3c7..1e46f75f3e0fb21e5809d4073e80b4cb1951902b 100644
--- a/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_all_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_all_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_all_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_all_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_all_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_all_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_all_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_all_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_all_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_alias_1-expected.txt
index bbac32e282efda6098b2f941a4e5c264a5b42427..764f0c51b68165bee712a36b57fba2ce7205c209 100644
--- a/ets2panda/test/parser/ets/import_tests/import_all_alias_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_all_alias_1-expected.txt
@@ -195,449 +195,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "import_all_alias_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "import_all_alias_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "Test",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 9,
-                                  "program": "import_all_alias_1.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 13,
-                                  "program": "import_all_alias_1.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 14,
-                                  "program": "import_all_alias_1.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 17,
-                                  "program": "import_all_alias_1.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 9,
-                                "program": "import_all_alias_1.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 17,
-                                "program": "import_all_alias_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "Test",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 18,
-                                    "program": "import_all_alias_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 22,
-                                    "program": "import_all_alias_1.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "dbl",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 23,
-                                    "program": "import_all_alias_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 26,
-                                    "program": "import_all_alias_1.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 18,
-                                  "program": "import_all_alias_1.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 26,
-                                  "program": "import_all_alias_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "import_all_alias_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 56,
-                              "program": "import_all_alias_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "import_all_alias_1.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 56,
-                            "program": "import_all_alias_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "import_all_alias_1.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 56,
-                          "program": "import_all_alias_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_all_alias_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_all_alias_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "Test",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 9,
-                                  "program": "import_all_alias_1.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_all_alias_1.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 14,
-                                  "program": "import_all_alias_1.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 17,
-                                  "program": "import_all_alias_1.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_all_alias_1.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 17,
-                                "program": "import_all_alias_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "Test",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 18,
-                                    "program": "import_all_alias_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 22,
-                                    "program": "import_all_alias_1.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "flt",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 23,
-                                    "program": "import_all_alias_1.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 26,
-                                    "program": "import_all_alias_1.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 18,
-                                  "program": "import_all_alias_1.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 26,
-                                  "program": "import_all_alias_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_all_alias_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 55,
-                              "program": "import_all_alias_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_all_alias_1.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 55,
-                            "program": "import_all_alias_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_all_alias_1.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 55,
-                          "program": "import_all_alias_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "import_all_alias_1.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 55,
-                      "program": "import_all_alias_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "import_all_alias_1.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 55,
-                    "program": "import_all_alias_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "import_all_alias_1.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 55,
-                  "program": "import_all_alias_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "import_all_alias_1.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 55,
-                "program": "import_all_alias_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_all_type_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_type_alias-expected.txt
index 24b5da6c5c9ee76b673587617546589b2dfd6a2f..7fe547cd247f116f59458108c961dfde4de1cff2 100644
--- a/ets2panda/test/parser/ets/import_tests/import_all_type_alias-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_all_type_alias-expected.txt
@@ -195,256 +195,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "test_var",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "import_all_type_alias.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 13,
-                              "program": "import_all_type_alias.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "TSQualifiedName",
-                                "left": {
-                                  "type": "Identifier",
-                                  "name": "all",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 20,
-                                      "program": "import_all_type_alias.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 23,
-                                      "program": "import_all_type_alias.ets"
-                                    }
-                                  }
-                                },
-                                "right": {
-                                  "type": "Identifier",
-                                  "name": "test_class",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 24,
-                                      "program": "import_all_type_alias.ets"
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 34,
-                                      "program": "import_all_type_alias.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 22,
-                                    "column": 20,
-                                    "program": "import_all_type_alias.ets"
-                                  },
-                                  "end": {
-                                    "line": 22,
-                                    "column": 35,
-                                    "program": "import_all_type_alias.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 20,
-                                  "program": "import_all_type_alias.ets"
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 35,
-                                  "program": "import_all_type_alias.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 20,
-                                "program": "import_all_type_alias.ets"
-                              },
-                              "end": {
-                                "line": 22,
-                                "column": 35,
-                                "program": "import_all_type_alias.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 16,
-                              "program": "import_all_type_alias.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 37,
-                              "program": "import_all_type_alias.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "import_all_type_alias.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 37,
-                            "program": "import_all_type_alias.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "import_all_type_alias.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 37,
-                          "program": "import_all_type_alias.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 22,
-                      "column": 5,
-                      "program": "import_all_type_alias.ets"
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 37,
-                      "program": "import_all_type_alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 22,
-                    "column": 5,
-                    "program": "import_all_type_alias.ets"
-                  },
-                  "end": {
-                    "line": 22,
-                    "column": 37,
-                    "program": "import_all_type_alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 22,
-                  "column": 5,
-                  "program": "import_all_type_alias.ets"
-                },
-                "end": {
-                  "line": 22,
-                  "column": 37,
-                  "program": "import_all_type_alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 22,
-                "column": 5,
-                "program": "import_all_type_alias.ets"
-              },
-              "end": {
-                "line": 22,
-                "column": 37,
-                "program": "import_all_type_alias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_diff_paths-expected.txt b/ets2panda/test/parser/ets/import_tests/import_diff_paths-expected.txt
index 9eac1209f5719de8ecd660c4ca834cc0d42ad4df..e5d6fdf188400f63813ea00d8aa5422558a8fa12 100644
--- a/ets2panda/test/parser/ets/import_tests/import_diff_paths-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_diff_paths-expected.txt
@@ -188,112 +188,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_diff_paths.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_diff_paths.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_diff_paths.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_diff_paths.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_diff_paths.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_diff_paths.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_diff_paths.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_diff_paths.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension-expected.txt b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension-expected.txt
index a49ac592e7b83f05cfdf92b141d4c11baa2f342e..4c30518d189e4baf519c802d733e069fcae0694b 100644
--- a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension-expected.txt
@@ -188,112 +188,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_extension.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_extension.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_extension.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_extension.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_extension.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_extension.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_extension.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_extension.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_1-expected.txt
index 97000141398b23745ed9279ad05142301d0b00b6..971d99db1f3dac3bde73ed10d84a1e19d714713a 100644
--- a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_1-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "foo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "import_extension_1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "import_extension_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 123,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 18,
-                              "program": "import_extension_1.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 21,
-                              "program": "import_extension_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "import_extension_1.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 21,
-                            "program": "import_extension_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "import_extension_1.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 21,
-                          "program": "import_extension_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "import_extension_1.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 21,
-                      "program": "import_extension_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "import_extension_1.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 21,
-                    "program": "import_extension_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "import_extension_1.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 21,
-                  "program": "import_extension_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "import_extension_1.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 21,
-                "program": "import_extension_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_2-expected.txt
index 78421e2796cf3b4c5d96333c698235e7ee201e2f..99b1152c5ed2280ea9912d1421dec38d8fac0769 100644
--- a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_2-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "goo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "import_extension_2.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "import_extension_2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 321,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 18,
-                              "program": "import_extension_2.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 21,
-                              "program": "import_extension_2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "import_extension_2.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 21,
-                            "program": "import_extension_2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "import_extension_2.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 21,
-                          "program": "import_extension_2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "import_extension_2.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 21,
-                      "program": "import_extension_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "import_extension_2.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 21,
-                    "program": "import_extension_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "import_extension_2.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 21,
-                  "program": "import_extension_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "import_extension_2.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 21,
-                "program": "import_extension_2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_function_overload-expected.txt b/ets2panda/test/parser/ets/import_tests/import_function_overload-expected.txt
index 0cf4c3ee71834fcabb0256eaa8b959ea1ef91787..3cd6ea4481e4b4f65f5505236dc75fe8c51cc9c1 100644
--- a/ets2panda/test/parser/ets/import_tests/import_function_overload-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_function_overload-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_function_overload.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_function_overload.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_function_overload.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_function_overload.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_function_overload.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_function_overload.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_function_overload.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_function_overload.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_interface_test-expected.txt b/ets2panda/test/parser/ets/import_tests/import_interface_test-expected.txt
index 9f694dad62382396ab2576a9b6ad1eef454018ae..419da8bc78cf58efa9144b459a6073e9ba49b690 100644
--- a/ets2panda/test/parser/ets/import_tests/import_interface_test-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_interface_test-expected.txt
@@ -559,112 +559,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_interface_test.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_interface_test.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_interface_test.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_interface_test.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_interface_test.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_interface_test.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_interface_test.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_interface_test.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_interface_test_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_interface_test_1-expected.txt
index 9aabe9aaffd9f6b1ab66c382bcb0c52c1258059c..c71913ab54ffd3d2e190d3f3883c1b3840384106 100644
--- a/ets2panda/test/parser/ets/import_tests/import_interface_test_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_interface_test_1-expected.txt
@@ -284,112 +284,6 @@
                 "program": "import_interface_test_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_interface_test_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_interface_test_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_interface_test_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_interface_test_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_interface_test_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_interface_test_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_interface_test_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_interface_test_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_interface_test_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_interface_test_2-expected.txt
index 593631d9cabac9b8af005d8fae3e670d54c738f5..b2028f6bcdb64a6b391b3838b293d0547cbb1d38 100644
--- a/ets2panda/test/parser/ets/import_tests/import_interface_test_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_interface_test_2-expected.txt
@@ -582,112 +582,6 @@
                 "program": "import_interface_test_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_interface_test_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_interface_test_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_interface_test_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_interface_test_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_interface_test_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_interface_test_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_interface_test_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_interface_test_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt
index a5502177bd8a8ed9c1ea5c8f6083363317989fd1..e96eb43dfc651cb8c581e09e55bce11ea1e3ff9b 100644
--- a/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_max_as_alias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_max_as_alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_max_as_alias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_max_as_alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_max_as_alias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_max_as_alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_max_as_alias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_max_as_alias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_name_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_name_1-expected.txt
index 441a88ed809a23b38f632ffc76c3691d8d8d7fc2..3096de97b95747d67c76b0bdb71f1ad7edb2fa72 100755
--- a/ets2panda/test/parser/ets/import_tests/import_name_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_name_1-expected.txt
@@ -310,313 +310,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "import_name_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "import_name_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 9,
-                                "program": "import_name_1.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 12,
-                                "program": "import_name_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "Identifier",
-                              "name": "dbl",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 13,
-                                  "program": "import_name_1.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 16,
-                                  "program": "import_name_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "import_name_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 46,
-                              "program": "import_name_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "import_name_1.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 46,
-                            "program": "import_name_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "import_name_1.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 46,
-                          "program": "import_name_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_name_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_name_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_name_1.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 12,
-                                "program": "import_name_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "Identifier",
-                              "name": "flt",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_name_1.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 16,
-                                  "program": "import_name_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_name_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 45,
-                              "program": "import_name_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_name_1.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 45,
-                            "program": "import_name_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_name_1.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 45,
-                          "program": "import_name_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "import_name_1.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 45,
-                      "program": "import_name_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "import_name_1.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 45,
-                    "program": "import_name_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "import_name_1.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 45,
-                  "program": "import_name_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "import_name_1.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 45,
-                "program": "import_name_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_name_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_name_alias_1-expected.txt
index 3f0ce318a407a3d1378cf4cca0acc7856f73f0b2..96de5e271cdaee02f015a404719ae63ea0b2cddb 100755
--- a/ets2panda/test/parser/ets/import_tests/import_name_alias_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_name_alias_1-expected.txt
@@ -310,313 +310,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "import_name_alias_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "import_name_alias_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "Foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 9,
-                                "program": "import_name_alias_1.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 12,
-                                "program": "import_name_alias_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "Identifier",
-                              "name": "dbl",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 13,
-                                  "program": "import_name_alias_1.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 16,
-                                  "program": "import_name_alias_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "import_name_alias_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 46,
-                              "program": "import_name_alias_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "import_name_alias_1.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 46,
-                            "program": "import_name_alias_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "import_name_alias_1.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 46,
-                          "program": "import_name_alias_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_name_alias_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_name_alias_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "Foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_name_alias_1.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 12,
-                                "program": "import_name_alias_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "Identifier",
-                              "name": "flt",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_name_alias_1.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 16,
-                                  "program": "import_name_alias_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_name_alias_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 45,
-                              "program": "import_name_alias_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_name_alias_1.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 45,
-                            "program": "import_name_alias_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_name_alias_1.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 45,
-                          "program": "import_name_alias_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "import_name_alias_1.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 45,
-                      "program": "import_name_alias_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "import_name_alias_1.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 45,
-                    "program": "import_name_alias_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "import_name_alias_1.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 45,
-                  "program": "import_name_alias_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "import_name_alias_1.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 45,
-                "program": "import_name_alias_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_1-expected.txt
index b8c92a8154767282519beaf7a77c25957a66c79e..74fc5481f1acba4997f4a5c98d3d304a3f86730e 100644
--- a/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_1-expected.txt
@@ -495,177 +495,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "imported_module_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 13,
-                              "program": "imported_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 2,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 21,
-                              "program": "imported_module_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 22,
-                              "program": "imported_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "imported_module_1.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 22,
-                            "program": "imported_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "imported_module_1.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22,
-                          "program": "imported_module_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 12,
-                      "program": "imported_module_1.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 22,
-                      "program": "imported_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 12,
-                    "program": "imported_module_1.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 22,
-                    "program": "imported_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 12,
-                  "program": "imported_module_1.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 22,
-                  "program": "imported_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 12,
-                "program": "imported_module_1.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 22,
-                "program": "imported_module_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -787,7 +616,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 22,
+                "column": 21,
                 "program": "imported_module_1.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_2-expected.txt
index ec74e488484f2c53cd1d475730122d26ddac68de..d66e18d0d7e91049966e93041058ce009868bf5e 100644
--- a/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_2-expected.txt
@@ -495,177 +495,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "imported_module_2.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 13,
-                              "program": "imported_module_2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 3,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 21,
-                              "program": "imported_module_2.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 22,
-                              "program": "imported_module_2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "imported_module_2.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 22,
-                            "program": "imported_module_2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "imported_module_2.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22,
-                          "program": "imported_module_2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 12,
-                      "program": "imported_module_2.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 22,
-                      "program": "imported_module_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 12,
-                    "program": "imported_module_2.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 22,
-                    "program": "imported_module_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 12,
-                  "program": "imported_module_2.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 22,
-                  "program": "imported_module_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 12,
-                "program": "imported_module_2.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 22,
-                "program": "imported_module_2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -787,7 +616,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 22,
+                "column": 21,
                 "program": "imported_module_2.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/import_tests/import_relative_path-expected.txt b/ets2panda/test/parser/ets/import_tests/import_relative_path-expected.txt
index 59fab91e687c631b9b500fdde5ad4119e955a361..ff37805124b83829c130308a648bc1c05ebed568 100755
--- a/ets2panda/test/parser/ets/import_tests/import_relative_path-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_relative_path-expected.txt
@@ -195,449 +195,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "import_relative_path.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "import_relative_path.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "all",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 9,
-                                  "program": "import_relative_path.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 12,
-                                  "program": "import_relative_path.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 13,
-                                  "program": "import_relative_path.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 16,
-                                  "program": "import_relative_path.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 9,
-                                "program": "import_relative_path.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 16,
-                                "program": "import_relative_path.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "all",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 17,
-                                    "program": "import_relative_path.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 20,
-                                    "program": "import_relative_path.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "dbl",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 21,
-                                    "program": "import_relative_path.ets"
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 24,
-                                    "program": "import_relative_path.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 17,
-                                  "program": "import_relative_path.ets"
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 24,
-                                  "program": "import_relative_path.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "import_relative_path.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 54,
-                              "program": "import_relative_path.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "import_relative_path.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 54,
-                            "program": "import_relative_path.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "import_relative_path.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 54,
-                          "program": "import_relative_path.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_relative_path.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_relative_path.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "all",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 9,
-                                  "program": "import_relative_path.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 12,
-                                  "program": "import_relative_path.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_relative_path.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 16,
-                                  "program": "import_relative_path.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_relative_path.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 16,
-                                "program": "import_relative_path.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "all",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 17,
-                                    "program": "import_relative_path.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 20,
-                                    "program": "import_relative_path.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "flt",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 21,
-                                    "program": "import_relative_path.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 24,
-                                    "program": "import_relative_path.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 17,
-                                  "program": "import_relative_path.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 24,
-                                  "program": "import_relative_path.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_relative_path.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 53,
-                              "program": "import_relative_path.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_relative_path.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 53,
-                            "program": "import_relative_path.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_relative_path.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 53,
-                          "program": "import_relative_path.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "import_relative_path.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 53,
-                      "program": "import_relative_path.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "import_relative_path.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 53,
-                    "program": "import_relative_path.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "import_relative_path.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 53,
-                  "program": "import_relative_path.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "import_relative_path.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 53,
-                "program": "import_relative_path.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_several_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_1-expected.txt
index 09a851a8c5c9e5ccdd50aec83247c5d24d39bf7c..dbb0145f0cfa204a49c8ee194d16a531d80c1da9 100755
--- a/ets2panda/test/parser/ets/import_tests/import_several_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_several_1-expected.txt
@@ -376,313 +376,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "import_several_1.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "import_several_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 9,
-                                "program": "import_several_1.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 12,
-                                "program": "import_several_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "Identifier",
-                              "name": "dbl",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "import_several_1.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 16,
-                                  "program": "import_several_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "import_several_1.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 46,
-                              "program": "import_several_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "import_several_1.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 46,
-                            "program": "import_several_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "import_several_1.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 46,
-                          "program": "import_several_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "import_several_1.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "import_several_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 9,
-                                "program": "import_several_1.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 12,
-                                "program": "import_several_1.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "Identifier",
-                              "name": "flt",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 13,
-                                  "program": "import_several_1.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 16,
-                                  "program": "import_several_1.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 9,
-                              "program": "import_several_1.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 45,
-                              "program": "import_several_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "import_several_1.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 45,
-                            "program": "import_several_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "import_several_1.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 45,
-                          "program": "import_several_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 20,
-                      "column": 5,
-                      "program": "import_several_1.ets"
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 45,
-                      "program": "import_several_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 20,
-                    "column": 5,
-                    "program": "import_several_1.ets"
-                  },
-                  "end": {
-                    "line": 21,
-                    "column": 45,
-                    "program": "import_several_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 20,
-                  "column": 5,
-                  "program": "import_several_1.ets"
-                },
-                "end": {
-                  "line": 21,
-                  "column": 45,
-                  "program": "import_several_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 20,
-                "column": 5,
-                "program": "import_several_1.ets"
-              },
-              "end": {
-                "line": 21,
-                "column": 45,
-                "program": "import_several_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_several_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_2-expected.txt
index 2019883103987e51539caa85ced8cee8f9e0d998..34e4882f53db3b7fa7c37ba1c139233a3a90a346 100755
--- a/ets2panda/test/parser/ets/import_tests/import_several_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_several_2-expected.txt
@@ -261,212 +261,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_several_2.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_several_2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_several_2.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 12,
-                                "program": "import_several_2.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3.14,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_several_2.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 17,
-                                  "program": "import_several_2.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_several_2.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 18,
-                              "program": "import_several_2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_several_2.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 18,
-                            "program": "import_several_2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_several_2.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 18,
-                          "program": "import_several_2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 5,
-                      "program": "import_several_2.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 18,
-                      "program": "import_several_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 5,
-                    "program": "import_several_2.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 18,
-                    "program": "import_several_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 5,
-                  "program": "import_several_2.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 18,
-                  "program": "import_several_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 5,
-                "program": "import_several_2.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 18,
-                "program": "import_several_2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_several_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_3-expected.txt
index 2314d139200a580b50d5408a8411a428a1c54894..8c1e2375f6c9c37b4386a59e9f9bed43b6c5341f 100755
--- a/ets2panda/test/parser/ets/import_tests/import_several_3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_several_3-expected.txt
@@ -277,381 +277,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_several_3.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_several_3.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_several_3.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 12,
-                                "program": "import_several_3.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "all",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 13,
-                                    "program": "import_several_3.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 16,
-                                    "program": "import_several_3.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "dbl",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 17,
-                                    "program": "import_several_3.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 20,
-                                    "program": "import_several_3.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_several_3.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 20,
-                                  "program": "import_several_3.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_several_3.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 50,
-                              "program": "import_several_3.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_several_3.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 50,
-                            "program": "import_several_3.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_several_3.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 50,
-                          "program": "import_several_3.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "import_several_3.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "import_several_3.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 9,
-                                "program": "import_several_3.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 12,
-                                "program": "import_several_3.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "all",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 13,
-                                    "program": "import_several_3.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 16,
-                                    "program": "import_several_3.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "flt",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 17,
-                                    "program": "import_several_3.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 20,
-                                    "program": "import_several_3.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "import_several_3.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 20,
-                                  "program": "import_several_3.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "import_several_3.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 49,
-                              "program": "import_several_3.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "import_several_3.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 49,
-                            "program": "import_several_3.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "import_several_3.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 49,
-                          "program": "import_several_3.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 5,
-                      "program": "import_several_3.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 49,
-                      "program": "import_several_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 5,
-                    "program": "import_several_3.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 49,
-                    "program": "import_several_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 5,
-                  "program": "import_several_3.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 49,
-                  "program": "import_several_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 5,
-                "program": "import_several_3.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 49,
-                "program": "import_several_3.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_several_4-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_4-expected.txt
index e85388d010496098b9f54eee47106ac3f69a4eea..1ef99fb7823570e3df1418fd06dc400d85daa8b8 100644
--- a/ets2panda/test/parser/ets/import_tests/import_several_4-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_several_4-expected.txt
@@ -277,415 +277,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_several_4.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_several_4.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_several_4.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 12,
-                                "program": "import_several_4.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "Test",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 13,
-                                    "program": "import_several_4.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 17,
-                                    "program": "import_several_4.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "dbl",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 18,
-                                    "program": "import_several_4.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 21,
-                                    "program": "import_several_4.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_several_4.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 21,
-                                  "program": "import_several_4.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_several_4.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 51,
-                              "program": "import_several_4.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_several_4.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 51,
-                            "program": "import_several_4.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_several_4.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 51,
-                          "program": "import_several_4.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "import_several_4.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "import_several_4.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "Test",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 9,
-                                  "program": "import_several_4.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "import_several_4.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 14,
-                                  "program": "import_several_4.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 17,
-                                  "program": "import_several_4.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 9,
-                                "program": "import_several_4.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 17,
-                                "program": "import_several_4.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "Test",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 18,
-                                    "program": "import_several_4.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 22,
-                                    "program": "import_several_4.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "flt",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 23,
-                                    "program": "import_several_4.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 26,
-                                    "program": "import_several_4.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 18,
-                                  "program": "import_several_4.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 26,
-                                  "program": "import_several_4.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "import_several_4.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 55,
-                              "program": "import_several_4.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "import_several_4.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 55,
-                            "program": "import_several_4.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "import_several_4.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 55,
-                          "program": "import_several_4.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 5,
-                      "program": "import_several_4.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 55,
-                      "program": "import_several_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 5,
-                    "program": "import_several_4.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 55,
-                    "program": "import_several_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 5,
-                  "program": "import_several_4.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 55,
-                  "program": "import_several_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 5,
-                "program": "import_several_4.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 55,
-                "program": "import_several_4.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_several_5-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_5-expected.txt
index 8e12cf33784a3961aaeb81513fc6c3309834a192..3bda1f005048ae713f5f96b6bed8020b04b06d19 100755
--- a/ets2panda/test/parser/ets/import_tests/import_several_5-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_several_5-expected.txt
@@ -277,381 +277,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_several_5.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_several_5.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "Foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_several_5.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 12,
-                                "program": "import_several_5.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "all",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 13,
-                                    "program": "import_several_5.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 16,
-                                    "program": "import_several_5.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "dbl",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 17,
-                                    "program": "import_several_5.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 20,
-                                    "program": "import_several_5.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_several_5.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 20,
-                                  "program": "import_several_5.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_several_5.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 50,
-                              "program": "import_several_5.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_several_5.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 50,
-                            "program": "import_several_5.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_several_5.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 50,
-                          "program": "import_several_5.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "import_several_5.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "import_several_5.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "Foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 9,
-                                "program": "import_several_5.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 12,
-                                "program": "import_several_5.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "all",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 13,
-                                    "program": "import_several_5.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 16,
-                                    "program": "import_several_5.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "flt",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 17,
-                                    "program": "import_several_5.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 20,
-                                    "program": "import_several_5.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "import_several_5.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 20,
-                                  "program": "import_several_5.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "import_several_5.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 49,
-                              "program": "import_several_5.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "import_several_5.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 49,
-                            "program": "import_several_5.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "import_several_5.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 49,
-                          "program": "import_several_5.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 5,
-                      "program": "import_several_5.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 49,
-                      "program": "import_several_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 5,
-                    "program": "import_several_5.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 49,
-                    "program": "import_several_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 5,
-                  "program": "import_several_5.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 49,
-                  "program": "import_several_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 5,
-                "program": "import_several_5.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 49,
-                "program": "import_several_5.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_several_6-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_6-expected.txt
index d675fc952602bde8b39fe1c7c82f45c6046e48c1..b38ab1f783d60d23fc0777fdce7f41762a79d522 100644
--- a/ets2panda/test/parser/ets/import_tests/import_several_6-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_several_6-expected.txt
@@ -277,415 +277,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "import_several_6.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "import_several_6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "Foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "import_several_6.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 12,
-                                "program": "import_several_6.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "Test",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 13,
-                                    "program": "import_several_6.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 17,
-                                    "program": "import_several_6.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "dbl",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 18,
-                                    "program": "import_several_6.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 21,
-                                    "program": "import_several_6.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "import_several_6.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 21,
-                                  "program": "import_several_6.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "import_several_6.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 51,
-                              "program": "import_several_6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "import_several_6.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 51,
-                            "program": "import_several_6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "import_several_6.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 51,
-                          "program": "import_several_6.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "import_several_6.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "import_several_6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "Test",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 9,
-                                  "program": "import_several_6.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "import_several_6.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "foo",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 14,
-                                  "program": "import_several_6.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 17,
-                                  "program": "import_several_6.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 9,
-                                "program": "import_several_6.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 17,
-                                "program": "import_several_6.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "Test",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 18,
-                                    "program": "import_several_6.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 22,
-                                    "program": "import_several_6.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "flt",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 23,
-                                    "program": "import_several_6.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 26,
-                                    "program": "import_several_6.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 18,
-                                  "program": "import_several_6.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 26,
-                                  "program": "import_several_6.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "import_several_6.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 55,
-                              "program": "import_several_6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "import_several_6.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 55,
-                            "program": "import_several_6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "import_several_6.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 55,
-                          "program": "import_several_6.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 5,
-                      "program": "import_several_6.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 55,
-                      "program": "import_several_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 5,
-                    "program": "import_several_6.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 55,
-                    "program": "import_several_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 5,
-                  "program": "import_several_6.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 55,
-                  "program": "import_several_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 5,
-                "program": "import_several_6.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 55,
-                "program": "import_several_6.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_several_7-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_7-expected.txt
index 473fb64084bb9d96b59f5261efa54cea30ee5dfe..814262395ac800e319bab1b5f190226daf290715 100755
--- a/ets2panda/test/parser/ets/import_tests/import_several_7-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_several_7-expected.txt
@@ -359,313 +359,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "import_several_7.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "import_several_7.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "Foo",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 9,
-                                "program": "import_several_7.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 12,
-                                "program": "import_several_7.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "Identifier",
-                              "name": "dbl",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "import_several_7.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 16,
-                                  "program": "import_several_7.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "import_several_7.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 46,
-                              "program": "import_several_7.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "import_several_7.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 46,
-                            "program": "import_several_7.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "import_several_7.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 46,
-                          "program": "import_several_7.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "y",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "import_several_7.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "import_several_7.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "FOO",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 9,
-                                "program": "import_several_7.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 12,
-                                "program": "import_several_7.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "Identifier",
-                              "name": "flt",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 13,
-                                  "program": "import_several_7.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 16,
-                                  "program": "import_several_7.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 9,
-                              "program": "import_several_7.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 45,
-                              "program": "import_several_7.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "import_several_7.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 45,
-                            "program": "import_several_7.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "import_several_7.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 45,
-                          "program": "import_several_7.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 20,
-                      "column": 5,
-                      "program": "import_several_7.ets"
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 45,
-                      "program": "import_several_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 20,
-                    "column": 5,
-                    "program": "import_several_7.ets"
-                  },
-                  "end": {
-                    "line": 21,
-                    "column": 45,
-                    "program": "import_several_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 20,
-                  "column": 5,
-                  "program": "import_several_7.ets"
-                },
-                "end": {
-                  "line": 21,
-                  "column": 45,
-                  "program": "import_several_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 20,
-                "column": 5,
-                "program": "import_several_7.ets"
-              },
-              "end": {
-                "line": 21,
-                "column": 45,
-                "program": "import_several_7.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt b/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt
index 5b900073a4e5e092f33cd43833d4bcdb93e02fa6..44f07e2a5cb6c040ae45af6b56291c2c7dbafb35 100644
--- a/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_ts_file.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_ts_file.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_ts_file.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_ts_file.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_ts_file.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_ts_file.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_ts_file.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_ts_file.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/internals-expected.txt b/ets2panda/test/parser/ets/import_tests/internals-expected.txt
index c51d22528db2d5282cde8b7d9191776efd0ef75d..40948fe966751a659967bc20513291e9b8967d5c 100644
--- a/ets2panda/test/parser/ets/import_tests/internals-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/internals-expected.txt
@@ -645,112 +645,6 @@
                 "program": "internals.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "internals.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "internals.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "internals.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "internals.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "internals.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "internals.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "internals.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "internals.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/modules/class_default_module-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/class_default_module-expected.txt
index b602ac88fe219d7bdf37402da55f24e6553df0c5..441bf4be5ce409eaa7c38456a0ae083895994875 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/class_default_module-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/class_default_module-expected.txt
@@ -284,112 +284,6 @@
                 "program": "class_default_module.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_default_module.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "class_default_module.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_default_module.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "class_default_module.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_default_module.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "class_default_module.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "class_default_module.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "class_default_module.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt
index 74fdb5881a929824833ddc019b76a9566aaa06ff..79552fca719fbbd68849e5793809672935c309b0 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_export.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "default_export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_export.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "default_export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_export.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "default_export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "default_export.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "default_export.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt
index b9a936d13d3a5a7ceed82c913f2f0bbe2200f3e3..47a86080b25f022445a6a180a763178429f5ef28 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "missing_default_export.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "missing_default_export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "missing_default_export.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "missing_default_export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "missing_default_export.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "missing_default_export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "missing_default_export.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "missing_default_export.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/modules/module1/src/re_export_file-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/module1/src/re_export_file-expected.txt
index 60057f22d931d320ce8a7d690053ef7a3e3dcaed..902ba1bf41a4b3151429919cd0bae9f6c2b05347 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/module1/src/re_export_file-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/module1/src/re_export_file-expected.txt
@@ -226,112 +226,6 @@
                 "program": "re_export_file.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_file.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_file.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_file.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_file.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_file.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_file.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_file.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_file.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/modules/module2/src/import_file-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/module2/src/import_file-expected.txt
index b421f27ae2a04f8a49c0a7a72cc285a00304cea2..35678ad76db380b9bfe361a89c036e1e20c4fbc9 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/module2/src/import_file-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/module2/src/import_file-expected.txt
@@ -211,112 +211,6 @@
                 "program": "import_file.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_file.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_file.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_file.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_file.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_file.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_file.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_file.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_file.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/modules/module2/src/re_export_file_2-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/module2/src/re_export_file_2-expected.txt
index 79b65f81de4bbd2b2007f95a09d9877766089f86..376668ede0ef310fdf3d2d3de5ad6e6dce83cfeb 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/module2/src/re_export_file_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/module2/src/re_export_file_2-expected.txt
@@ -226,112 +226,6 @@
                 "program": "re_export_file_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_file_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_file_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_file_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_file_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_file_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_file_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_file_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_file_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/modules/test_lib1-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/test_lib1-expected.txt
index 607628cb22d7878633bbe0eb86b5a418e764ec61..f3df1acd4b3d044cf1bc27f8bd2b2e992add3331 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/test_lib1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/test_lib1-expected.txt
@@ -284,112 +284,6 @@
                 "program": "test_lib1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_lib1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_lib1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_lib1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_lib1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_lib1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_lib1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test_lib1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test_lib1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/modules/test_lib2-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/test_lib2-expected.txt
index 82ef58e5f927d2bf59b67449aacc00d7b871033e..6da84fcce42c00b6d1d3c4f943c3e93e72277b83 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/test_lib2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/test_lib2-expected.txt
@@ -212,112 +212,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_lib2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_lib2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_lib2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_lib2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_lib2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_lib2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test_lib2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test_lib2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import1/import1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import1/import1-expected.txt
index 204f21af2b46e95d2845334ad7f30cce08a98ec7..48f9684e3273af17a9d3046f3a545643a85117b7 100644
--- a/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import1/import1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import1/import1-expected.txt
@@ -152,112 +152,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import2/import2-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import2/import2-expected.txt
index 2360ded76c84ad64192cbca557b9f092aedd47c5..f429b842cfc6a4fcf185c33742c8e6307651e241 100644
--- a/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import2/import2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import2/import2-expected.txt
@@ -152,112 +152,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/import_package_with_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/import_package_with_alias-expected.txt
index 02c7f65e52b8f3a347b5f80bf8fe2714659f0621..ca092e3c944f33441e497730a54c1132b02cbdf5 100644
--- a/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/import_package_with_alias-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/import_package_with_alias-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_package_with_alias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_package_with_alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_package_with_alias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_package_with_alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_package_with_alias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_package_with_alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_package_with_alias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_package_with_alias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/package/package_module-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/package/package_module-expected.txt
index 17f316a00e0263cc97cdba39017bd19f16ae0f31..526b4372e719749df80b7ce86d644c023ee970bb 100644
--- a/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/package/package_module-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/package/package_module-expected.txt
@@ -56,177 +56,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "foo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 12,
-                              "program": "package_module.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 15,
-                              "program": "package_module.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 2,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 18,
-                              "program": "package_module.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 19,
-                              "program": "package_module.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 12,
-                            "program": "package_module.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 19,
-                            "program": "package_module.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 12,
-                          "program": "package_module.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 19,
-                          "program": "package_module.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 12,
-                      "program": "package_module.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 19,
-                      "program": "package_module.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 12,
-                    "program": "package_module.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 19,
-                    "program": "package_module.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 12,
-                  "program": "package_module.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 19,
-                  "program": "package_module.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 12,
-                "program": "package_module.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 19,
-                "program": "package_module.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/package_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/package_module_1-expected.txt
index 8e4ded4ec92842b06dbee0da05cc2c98851f24d7..1a938e8adf3c7ac6a30e8e4bb4d1ee0f48d1b231 100755
--- a/ets2panda/test/parser/ets/import_tests/packages/package_module_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/package_module_1-expected.txt
@@ -88,112 +88,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/package_module_2-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/package_module_2-expected.txt
index b9265122a087f8ceb2b398c807552ed849862512..77015b06c7bd585fc387ff1a9d214c77fb536e5d 100755
--- a/ets2panda/test/parser/ets/import_tests/packages/package_module_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/package_module_2-expected.txt
@@ -88,112 +88,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/subpackage-1/package_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/subpackage-1/package_module_1-expected.txt
index 5e0a7c449aad9118245f6030c15ccebf69e3d4b0..ff49cabbfcf34065e2eb85cd10685033d3ed56bf 100644
--- a/ets2panda/test/parser/ets/import_tests/packages/subpackage-1/package_module_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/subpackage-1/package_module_1-expected.txt
@@ -120,177 +120,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "foo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 15,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 3,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 18,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 19,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "package_module_1.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 19,
-                            "program": "package_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "package_module_1.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 19,
-                          "program": "package_module_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 12,
-                      "program": "package_module_1.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 19,
-                      "program": "package_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 12,
-                    "program": "package_module_1.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 19,
-                    "program": "package_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 12,
-                  "program": "package_module_1.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 19,
-                  "program": "package_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 12,
-                "program": "package_module_1.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 19,
-                "program": "package_module_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/subpackage-2/package_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/subpackage-2/package_module_1-expected.txt
index 5b43722f627b7c9ec25f11ddfc816df1c75ce15a..377c6237a5a4656fdc48fab2755e4bb76b94710a 100644
--- a/ets2panda/test/parser/ets/import_tests/packages/subpackage-2/package_module_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/subpackage-2/package_module_1-expected.txt
@@ -120,177 +120,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "foo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 15,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 2,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 18,
-                              "program": "package_module_1.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 19,
-                              "program": "package_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "package_module_1.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 19,
-                            "program": "package_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "package_module_1.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 19,
-                          "program": "package_module_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 12,
-                      "program": "package_module_1.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 19,
-                      "program": "package_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 12,
-                    "program": "package_module_1.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 19,
-                    "program": "package_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 12,
-                  "program": "package_module_1.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 19,
-                  "program": "package_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 12,
-                "program": "package_module_1.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 19,
-                "program": "package_module_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/subpackage/package_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/subpackage/package_module_1-expected.txt
index 3f008d9aa283a73cb5d8b4887fb5ebb108c17145..993b5e0fffd1711d85ab1635d112e2f5fd146435 100644
--- a/ets2panda/test/parser/ets/import_tests/packages/subpackage/package_module_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/subpackage/package_module_1-expected.txt
@@ -120,112 +120,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "package_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "package_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "package_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "package_module_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_1-expected.txt
index b19bfadc5653a609b5219ad3a5acabfbfa400a2c..e28fd307035f372061e093e621b51189ec13c975 100755
--- a/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_1-expected.txt
@@ -120,241 +120,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 12,
-                              "program": "subpackage_module_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 13,
-                              "program": "subpackage_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "SubpackageB",
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 24,
-                              "program": "subpackage_module_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 37,
-                              "program": "subpackage_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 12,
-                            "program": "subpackage_module_1.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 37,
-                            "program": "subpackage_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 12,
-                          "program": "subpackage_module_1.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 37,
-                          "program": "subpackage_module_1.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 12,
-                              "program": "subpackage_module_2.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 13,
-                              "program": "subpackage_module_2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "SubpackageB",
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 24,
-                              "program": "subpackage_module_2.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 37,
-                              "program": "subpackage_module_2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 12,
-                            "program": "subpackage_module_2.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 37,
-                            "program": "subpackage_module_2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 12,
-                          "program": "subpackage_module_2.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 37,
-                          "program": "subpackage_module_2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 12,
-                      "program": "subpackage_module_1.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 37,
-                      "program": "subpackage_module_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 12,
-                    "program": "subpackage_module_1.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 37,
-                    "program": "subpackage_module_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 12,
-                  "program": "subpackage_module_1.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 37,
-                  "program": "subpackage_module_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 12,
-                "program": "subpackage_module_1.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 37,
-                "program": "subpackage_module_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -437,7 +202,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 37,
+                "column": 24,
                 "program": "subpackage_module_1.ets"
               }
             }
@@ -524,7 +289,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 37,
+                "column": 24,
                 "program": "subpackage_module_2.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_2-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_2-expected.txt
index 9f29a276abaa3322524a895282989a7d8d1fdd29..cf9678bc5ccd66e408990f10bb144228c73504e6 100755
--- a/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_2-expected.txt
@@ -120,241 +120,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 12,
-                              "program": "subpackage_module_2.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 13,
-                              "program": "subpackage_module_2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "SubpackageB",
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 24,
-                              "program": "subpackage_module_2.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 37,
-                              "program": "subpackage_module_2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 12,
-                            "program": "subpackage_module_2.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 37,
-                            "program": "subpackage_module_2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 12,
-                          "program": "subpackage_module_2.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 37,
-                          "program": "subpackage_module_2.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 12,
-                              "program": "subpackage_module_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 13,
-                              "program": "subpackage_module_1.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "SubpackageB",
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 24,
-                              "program": "subpackage_module_1.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 37,
-                              "program": "subpackage_module_1.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 12,
-                            "program": "subpackage_module_1.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 37,
-                            "program": "subpackage_module_1.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 12,
-                          "program": "subpackage_module_1.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 37,
-                          "program": "subpackage_module_1.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 12,
-                      "program": "subpackage_module_2.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 37,
-                      "program": "subpackage_module_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 12,
-                    "program": "subpackage_module_2.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 37,
-                    "program": "subpackage_module_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 12,
-                  "program": "subpackage_module_2.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 37,
-                  "program": "subpackage_module_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 12,
-                "program": "subpackage_module_2.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 37,
-                "program": "subpackage_module_2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -437,7 +202,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 37,
+                "column": 24,
                 "program": "subpackage_module_2.ets"
               }
             }
@@ -524,7 +289,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 37,
+                "column": 24,
                 "program": "subpackage_module_1.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/Line-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/Line-expected.txt
index 82c7624d21e9343b1eec8f9d1cd597f0c5cdef27..9f22cdc955e38128f7f86ac61978d6e81d6f550f 100644
--- a/ets2panda/test/parser/ets/import_tests/relative_import/Line-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/relative_import/Line-expected.txt
@@ -895,112 +895,6 @@
                 "program": "Line.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Line.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Line.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Line.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Line.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Line.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Line.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "Line.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "Line.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt
index 498c660f4894eda3664549fda18acbee9883b4ed..19ced72284b46a7289bc566d1aa55683f39f22d6 100644
--- a/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt
@@ -1096,112 +1096,6 @@
                 "program": "Point.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Point.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "Point.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Point.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "Point.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Point.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "Point.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "Point.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "Point.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/alias1-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/alias1-expected.txt
index fac134a05d48f00fe88405beb716a7e750d959b8..95d6fbe29518fa9773a9f36d32db03932050d6aa 100644
--- a/ets2panda/test/parser/ets/import_tests/relative_import/alias1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/relative_import/alias1-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "alias1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "alias1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "alias1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "alias1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "alias1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "alias1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "alias1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "alias1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt
index f4b19a9cc32e04b915830a8274cf2c837ed69619..ed448ce1a49c8e4fd754b5c1565eb135a0552dd6 100644
--- a/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt
@@ -391,177 +391,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "goo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "alias2.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "alias2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 18,
-                              "program": "alias2.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 19,
-                              "program": "alias2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "alias2.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 19,
-                            "program": "alias2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "alias2.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 19,
-                          "program": "alias2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "alias2.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 19,
-                      "program": "alias2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "alias2.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 19,
-                    "program": "alias2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "alias2.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 19,
-                  "program": "alias2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "alias2.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 19,
-                "program": "alias2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/import_tests/repeat-expected.txt b/ets2panda/test/parser/ets/import_tests/repeat-expected.txt
index 97dba6b459ba83cb2fe079e38f5c3e5d94b9ca26..24811af07c32e605ca582ef7a57b89bd22babe47 100644
--- a/ets2panda/test/parser/ets/import_tests/repeat-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/repeat-expected.txt
@@ -651,112 +651,6 @@
                 "program": "repeat.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "repeat.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "repeat.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "repeat.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "repeat.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "repeat.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "repeat.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "repeat.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "repeat.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder1/file1-expected.txt b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder1/file1-expected.txt
index 5e37cd77ff532a31bc3668ed8735b75c87fda038..543d053ba28c766691abf2917e5f687e4ca75a7f 100644
--- a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder1/file1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder1/file1-expected.txt
@@ -211,112 +211,6 @@
                 "program": "file1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "file1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "file1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "file1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "file1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "file1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "file1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "file1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "file1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder2/file2-expected.txt b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder2/file2-expected.txt
index f062113c00570e375ec8680b7a618aaeadc4786e..9c165186303d99d80f2f2c5b156ce872ff1bcff8 100644
--- a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder2/file2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder2/file2-expected.txt
@@ -366,112 +366,6 @@
                 "program": "file2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "file2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "file2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "file2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "file2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "file2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "file2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "file2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "file2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder3/file3-expected.txt b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder3/file3-expected.txt
index 2028cb3692a80c7dd42ee3dafcbc1bd87df4d8c7..2f67b5729d14707414f6dada8b08b551c6d7a9b5 100644
--- a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder3/file3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder3/file3-expected.txt
@@ -284,112 +284,6 @@
                 "program": "file3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "file3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "file3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "file3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "file3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "file3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "file3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "file3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "file3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/import_tests/type/type-expected.txt b/ets2panda/test/parser/ets/import_tests/type/type-expected.txt
index 0bf85f15bd30c8019f3cf3304b0554a6f7b9b0a8..b818946448ee6accd85d32d5fb778c968ddd7e16 100644
--- a/ets2panda/test/parser/ets/import_tests/type/type-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/type/type-expected.txt
@@ -284,112 +284,6 @@
                 "program": "type.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "type.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/index_expressions-expected.txt b/ets2panda/test/parser/ets/index_expressions-expected.txt
index 4fbdc5871f6e5333b3cdd89a1abf683970bfcbf8..88266ffcc866b4e961dfde206d125e20cb52f464 100644
--- a/ets2panda/test/parser/ets/index_expressions-expected.txt
+++ b/ets2panda/test/parser/ets/index_expressions-expected.txt
@@ -130,537 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "index_expressions.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "index_expressions.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewArrayInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSPrimitiveType",
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 13,
-                                "program": "index_expressions.ets"
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 16,
-                                "program": "index_expressions.ets"
-                              }
-                            }
-                          },
-                          "dimension": {
-                            "type": "NumberLiteral",
-                            "value": 5,
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 17,
-                                "program": "index_expressions.ets"
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 18,
-                                "program": "index_expressions.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "index_expressions.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 19,
-                              "program": "index_expressions.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "index_expressions.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 19,
-                            "program": "index_expressions.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "index_expressions.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 19,
-                          "program": "index_expressions.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "index_expressions.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "index_expressions.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "a",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 9,
-                                "program": "index_expressions.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 10,
-                                "program": "index_expressions.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "NumberLiteral",
-                            "value": 0,
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 11,
-                                "program": "index_expressions.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 12,
-                                "program": "index_expressions.ets"
-                              }
-                            }
-                          },
-                          "computed": true,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "index_expressions.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 13,
-                              "program": "index_expressions.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "index_expressions.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 13,
-                            "program": "index_expressions.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "index_expressions.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 13,
-                          "program": "index_expressions.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "index_expressions.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "index_expressions.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "a",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "index_expressions.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 10,
-                                "program": "index_expressions.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "Identifier",
-                            "name": "b",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 11,
-                                "program": "index_expressions.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 12,
-                                "program": "index_expressions.ets"
-                              }
-                            }
-                          },
-                          "computed": true,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "index_expressions.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 13,
-                              "program": "index_expressions.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "index_expressions.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 13,
-                            "program": "index_expressions.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "index_expressions.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 13,
-                          "program": "index_expressions.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "index_expressions.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "index_expressions.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "a",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 9,
-                                "program": "index_expressions.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 10,
-                                "program": "index_expressions.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "a",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 11,
-                                  "program": "index_expressions.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 12,
-                                  "program": "index_expressions.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "b",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "index_expressions.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 14,
-                                  "program": "index_expressions.ets"
-                                }
-                              }
-                            },
-                            "computed": true,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 11,
-                                "program": "index_expressions.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 15,
-                                "program": "index_expressions.ets"
-                              }
-                            }
-                          },
-                          "computed": true,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "index_expressions.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 16,
-                              "program": "index_expressions.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "index_expressions.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 16,
-                            "program": "index_expressions.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "index_expressions.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 16,
-                          "program": "index_expressions.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "index_expressions.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 16,
-                      "program": "index_expressions.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "index_expressions.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 16,
-                    "program": "index_expressions.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "index_expressions.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 16,
-                  "program": "index_expressions.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "index_expressions.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 16,
-                "program": "index_expressions.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt b/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt
index ca446caa965f7c7b3364089e8d5fae3f286d75f6..4ef01fff766cf0041f0a7bfd90ec83a328cf6936 100644
--- a/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt
+++ b/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt
@@ -760,112 +760,6 @@
                 "program": "infer_overriding_method_return_type.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "infer_overriding_method_return_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "infer_overriding_method_return_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "infer_overriding_method_return_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "infer_overriding_method_return_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "infer_overriding_method_return_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "infer_overriding_method_return_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "infer_overriding_method_return_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "infer_overriding_method_return_type.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/inferingEntryPointReturn-expected.txt b/ets2panda/test/parser/ets/inferingEntryPointReturn-expected.txt
index 96fb840b5b3618264015239d67f932738c059f26..8a57f96ea3e7a375976983386a9cde7b808a5478 100644
--- a/ets2panda/test/parser/ets/inferingEntryPointReturn-expected.txt
+++ b/ets2panda/test/parser/ets/inferingEntryPointReturn-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "inferingEntryPointReturn.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "inferingEntryPointReturn.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "inferingEntryPointReturn.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "inferingEntryPointReturn.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "inferingEntryPointReturn.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "inferingEntryPointReturn.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "inferingEntryPointReturn.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "inferingEntryPointReturn.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/inheritance-expected.txt b/ets2panda/test/parser/ets/inheritance-expected.txt
index 69cb334eff055899cfb83d9c939163076e7402e3..abaf6243aa666a3e715e4db7945badb809d7d1a0 100644
--- a/ets2panda/test/parser/ets/inheritance-expected.txt
+++ b/ets2panda/test/parser/ets/inheritance-expected.txt
@@ -1374,112 +1374,6 @@
                 "program": "inheritance.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "inheritance.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "inheritance.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "inheritance.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "inheritance.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "inheritance.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "inheritance.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "inheritance.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "inheritance.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/inheritance2-expected.txt b/ets2panda/test/parser/ets/inheritance2-expected.txt
index 4c8c56e2b4eec72b9de72d9fb92465510504398b..ccd6c7db22b16063ff64fb9ff37659017c28977e 100644
--- a/ets2panda/test/parser/ets/inheritance2-expected.txt
+++ b/ets2panda/test/parser/ets/inheritance2-expected.txt
@@ -782,112 +782,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "inheritance2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "inheritance2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "inheritance2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "inheritance2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "inheritance2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "inheritance2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "inheritance2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "inheritance2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/instanceof-expected.txt b/ets2panda/test/parser/ets/instanceof-expected.txt
index 965bcf0e21e7ce96e2fdef916165612044bdb2d4..a5d9e69c37d008cd5bf29afe00c4731e5135ed67 100644
--- a/ets2panda/test/parser/ets/instanceof-expected.txt
+++ b/ets2panda/test/parser/ets/instanceof-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "instanceof.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "instanceof.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "instanceof.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "instanceof.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "instanceof.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "instanceof.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "instanceof.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "instanceof.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt b/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt
index eaa6f0cc5c79522247b787a806ea314dddc515e1..eab6ad31bc6b36e06a8ce0e50ece96b9a48bbc35 100644
--- a/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt
+++ b/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt
@@ -517,112 +517,6 @@
                 "program": "interfaceMethodWithOptional.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interfaceMethodWithOptional.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interfaceMethodWithOptional.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interfaceMethodWithOptional.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interfaceMethodWithOptional.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interfaceMethodWithOptional.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interfaceMethodWithOptional.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "interfaceMethodWithOptional.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "interfaceMethodWithOptional.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt b/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt
index 10dd605a01810226dab6eef8596ff86b3db19b17..7eeb1250a572d25a5b246c46672e7cb19033402d 100644
--- a/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt
+++ b/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt
@@ -269,112 +269,6 @@
                 "program": "interface_abstract_noreturn_function.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interface_abstract_noreturn_function.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interface_abstract_noreturn_function.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interface_abstract_noreturn_function.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interface_abstract_noreturn_function.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interface_abstract_noreturn_function.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interface_abstract_noreturn_function.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "interface_abstract_noreturn_function.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "interface_abstract_noreturn_function.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/interface_method_default_body-expected.txt b/ets2panda/test/parser/ets/interface_method_default_body-expected.txt
index e10d00f2da2979a0e7909a0738c43d9003ea5b17..2c0e1de8642859fa32f5de389c25c6e0d36e03d3 100644
--- a/ets2panda/test/parser/ets/interface_method_default_body-expected.txt
+++ b/ets2panda/test/parser/ets/interface_method_default_body-expected.txt
@@ -857,112 +857,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interface_method_default_body.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interface_method_default_body.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interface_method_default_body.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interface_method_default_body.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interface_method_default_body.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interface_method_default_body.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "interface_method_default_body.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "interface_method_default_body.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/interfaces-expected.txt b/ets2panda/test/parser/ets/interfaces-expected.txt
index febebe6ca5d01ff351879f52be08fc2b7762e786..ccdb19aae76d2dd43d6a31ba6e6a174f33151c0f 100644
--- a/ets2panda/test/parser/ets/interfaces-expected.txt
+++ b/ets2panda/test/parser/ets/interfaces-expected.txt
@@ -1338,112 +1338,6 @@
                 "program": "interfaces.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interfaces.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "interfaces.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interfaces.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "interfaces.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interfaces.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "interfaces.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "interfaces.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "interfaces.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/internalParsing-expected.txt b/ets2panda/test/parser/ets/internalParsing-expected.txt
index 4cbb574041bed105eb8763ef8d98edc4f6939cd5..c311a8836b158e6b23a9508a59fa188d03423665 100644
--- a/ets2panda/test/parser/ets/internalParsing-expected.txt
+++ b/ets2panda/test/parser/ets/internalParsing-expected.txt
@@ -701,112 +701,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "internalParsing.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "internalParsing.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "internalParsing.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "internalParsing.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "internalParsing.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "internalParsing.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "internalParsing.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "internalParsing.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt
index 3573d9c4fceab6c5e7d5d7d3d045a4b551bf2fef..6668be3c6119e8483083ebc31c12e739b172d6e6 100644
--- a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt
+++ b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt
@@ -938,112 +938,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "internalProtectedParsing.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "internalProtectedParsing.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "internalProtectedParsing.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "internalProtectedParsing.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "internalProtectedParsing.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "internalProtectedParsing.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "internalProtectedParsing.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "internalProtectedParsing.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt b/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt
index b9996b3d47ef437d726a3c63d753bf2ae867d2f8..2b4b6d51a49a69ec3029b47c0f7d56df789c50df 100644
--- a/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt
+++ b/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "labeledDoWhileStatement.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "labeledDoWhileStatement.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "labeledDoWhileStatement.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "labeledDoWhileStatement.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "labeledDoWhileStatement.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "labeledDoWhileStatement.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "labeledDoWhileStatement.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "labeledDoWhileStatement.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/labeledForStatement-expected.txt b/ets2panda/test/parser/ets/labeledForStatement-expected.txt
index efcc9ab144353bbd87bc4ca522e3896c9eab057a..3475426fa8a59ba2439b1459d3db553cd3b003a7 100644
--- a/ets2panda/test/parser/ets/labeledForStatement-expected.txt
+++ b/ets2panda/test/parser/ets/labeledForStatement-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "labeledForStatement.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "labeledForStatement.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "labeledForStatement.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "labeledForStatement.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "labeledForStatement.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "labeledForStatement.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "labeledForStatement.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "labeledForStatement.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt b/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt
index efb4dff00aec0ef347b3ffb0532fb993c00ff536..4dfe97c1b18b333cfb0d6f99d2c361576dceda2f 100644
--- a/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt
+++ b/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "labeledSwitchStatement.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "labeledSwitchStatement.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "labeledSwitchStatement.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "labeledSwitchStatement.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "labeledSwitchStatement.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "labeledSwitchStatement.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "labeledSwitchStatement.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "labeledSwitchStatement.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt b/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt
index 60ace5f7efc8dce9681e9cf696fbbb308cb34a0d..6ce3b6806150ffcddc0530c6863cdffa023e1283 100644
--- a/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt
+++ b/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "labeledWhileStatement.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "labeledWhileStatement.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "labeledWhileStatement.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "labeledWhileStatement.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "labeledWhileStatement.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "labeledWhileStatement.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "labeledWhileStatement.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "labeledWhileStatement.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda-expected.txt b/ets2panda/test/parser/ets/lambda-expected.txt
index 8c34609e1dbd5009bb9e82e9f73aa4dedbda0f50..f077906d35940764b05b555b661808069f25c85f 100644
--- a/ets2panda/test/parser/ets/lambda-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda-lambda-expected.txt b/ets2panda/test/parser/ets/lambda-lambda-expected.txt
index d52afdced451344b4b56bba188f395537b76b8f5..6f0bbea9627a291adf467cd482f5d954513f34af 100644
--- a/ets2panda/test/parser/ets/lambda-lambda-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-lambda-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-lambda.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-lambda.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-lambda.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-lambda.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-lambda.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-lambda.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-lambda.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-lambda.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt
index 57d9f461f6f75fdadc70329ec250d58c80c4ca33..30e94b6d644e0d9e5a0f2dae536c5e15cc187791 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt
@@ -214,112 +214,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-alias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-alias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-alias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-alias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-alias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt
index 9bd55797c7576e9a434070355b9ae59e42c37e15..7c5e90e0e287b66bf5b8eda73ebd77505627f955 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-arg-no-type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-arg-no-type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-arg-no-type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-arg-no-type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-arg-no-type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-arg-no-type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-arg-no-type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-arg-no-type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt
index d25ca49fb4bb3c7dfe9fb41f9ae1eeecffe82eb1..acfd5a4e9bb82f23e5c77b93e80881688cdad36f 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt
index 5c5a6f6e0d778a2de5b98c3f63239b5cb2b0cbed..09578cea9c74280239c6ea21b2c49b42ca6048f6 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-no-ret-type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-no-ret-type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-no-ret-type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-no-ret-type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-no-ret-type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-no-ret-type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-no-ret-type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-no-ret-type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt
index 1aaf04ee6bea199660e493c11f993fa00967acd6..338c5b8f71b4c2caf7d854900379bc8cca969e47 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-overloaded-2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-overloaded-2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-overloaded-2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-overloaded-2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-overloaded-2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-overloaded-2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-overloaded-2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-overloaded-2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt
index 5553b71d0c2515b7b1e0b40f2bee4b1d47a7e212..44a908fd244e1123f3196794b25abae89d8b9cac 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt
@@ -1254,112 +1254,6 @@
                 "program": "lambda-type-inference-overloaded-3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-overloaded-3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda-type-inference-overloaded-3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-overloaded-3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda-type-inference-overloaded-3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-overloaded-3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda-type-inference-overloaded-3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-overloaded-3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda-type-inference-overloaded-3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt
index cd8cffa34e7c1c39d34ca4c7ea13f2dacfaa38dd..6d807492ec6d9963080c81dcfe416b71e860fa77 100644
--- a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt
@@ -787,112 +787,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaAsFunctionParam.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaAsFunctionParam.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaAsFunctionParam.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaAsFunctionParam.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaAsFunctionParam.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaAsFunctionParam.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaAsFunctionParam.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaAsFunctionParam.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt
index 3e81d35081cf8151f8bb5293cd33886c2cc0651a..2b0005497395db91680ca3247c028e4d62a53986 100644
--- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaExpressionWithoutBlockStatement.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaExpressionWithoutBlockStatement.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaExpressionWithoutBlockStatement.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaExpressionWithoutBlockStatement.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaExpressionWithoutBlockStatement.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaExpressionWithoutBlockStatement.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaExpressionWithoutBlockStatement.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaExpressionWithoutBlockStatement.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt
index a90efdab4838975d65cefc00f798c60a49128773..50b689374c6d0798d7aeb44e1a14ccaec9156431 100644
--- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt
index 287a55a2f24fa86a8fbafa6c9d5daff46da17949..2236479653a9b150370eb82527494b273e989d7d 100644
--- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaExpressionWithoutBlockStatementVoid.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaExpressionWithoutBlockStatementVoid.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaExpressionWithoutBlockStatementVoid.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaExpressionWithoutBlockStatementVoid.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaExpressionWithoutBlockStatementVoid.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaExpressionWithoutBlockStatementVoid.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaExpressionWithoutBlockStatementVoid.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaExpressionWithoutBlockStatementVoid.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt
index 9e1921d21836e472966c35eedcc66629c7a82c52..6be887fd9e7efd360d39653bf88e37ce33899c5b 100644
--- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda_import_alias_1-2-expected.txt b/ets2panda/test/parser/ets/lambda_import_alias_1-2-expected.txt
index a2c4abe493b3e3379af374134c208575875c66c1..1750f12742f70dae2a2446ecedff9e82799758e5 100644
--- a/ets2panda/test/parser/ets/lambda_import_alias_1-2-expected.txt
+++ b/ets2panda/test/parser/ets/lambda_import_alias_1-2-expected.txt
@@ -306,212 +306,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "createA",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "lambda_import_alias_1-2.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 19,
-                              "program": "lambda_import_alias_1-2.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "lib",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 31,
-                                "program": "lambda_import_alias_1-2.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 34,
-                                "program": "lambda_import_alias_1-2.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "Identifier",
-                            "name": "createA",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 35,
-                                "program": "lambda_import_alias_1-2.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 42,
-                                "program": "lambda_import_alias_1-2.ets"
-                              }
-                            }
-                          },
-                          "computed": false,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 31,
-                              "program": "lambda_import_alias_1-2.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 42,
-                              "program": "lambda_import_alias_1-2.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "lambda_import_alias_1-2.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 42,
-                            "program": "lambda_import_alias_1-2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "lambda_import_alias_1-2.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 42,
-                          "program": "lambda_import_alias_1-2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 12,
-                      "program": "lambda_import_alias_1-2.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 42,
-                      "program": "lambda_import_alias_1-2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 12,
-                    "program": "lambda_import_alias_1-2.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 42,
-                    "program": "lambda_import_alias_1-2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 12,
-                  "program": "lambda_import_alias_1-2.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 42,
-                  "program": "lambda_import_alias_1-2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 12,
-                "program": "lambda_import_alias_1-2.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 42,
-                "program": "lambda_import_alias_1-2.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -610,7 +404,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 42,
+                "column": 31,
                 "program": "lambda_import_alias_1-2.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/lambda_import_alias_1-3-expected.txt b/ets2panda/test/parser/ets/lambda_import_alias_1-3-expected.txt
index c1be66990a345fd34a12aa15c84f550bf48fec5a..76014aeaac7df183ef92ae1996f9d70414ae7115 100644
--- a/ets2panda/test/parser/ets/lambda_import_alias_1-3-expected.txt
+++ b/ets2panda/test/parser/ets/lambda_import_alias_1-3-expected.txt
@@ -285,112 +285,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_import_alias_1-3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_import_alias_1-3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_import_alias_1-3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_import_alias_1-3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_import_alias_1-3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_import_alias_1-3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_import_alias_1-3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_import_alias_1-3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/lambda_import_alias_1-expected.txt b/ets2panda/test/parser/ets/lambda_import_alias_1-expected.txt
index b7cd2b9060f84ca38c48e1f6b8c89063bcd14c05..4b91ecd5a11b7fe471683228c4988ea42148fdc2 100644
--- a/ets2panda/test/parser/ets/lambda_import_alias_1-expected.txt
+++ b/ets2panda/test/parser/ets/lambda_import_alias_1-expected.txt
@@ -194,112 +194,6 @@
                 "program": "lambda_import_alias_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_import_alias_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_import_alias_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_import_alias_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_import_alias_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_import_alias_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_import_alias_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_import_alias_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_import_alias_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt
index 0707e523d50e52b9d74a30956a79eefd8dc2ebf0..a6e8f6ab0e2cf5fc1240487603ef9be77fb93183 100644
--- a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt
+++ b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt
@@ -539,112 +539,6 @@
                 "program": "lambda_optional_param_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_optional_param_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "lambda_optional_param_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_optional_param_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "lambda_optional_param_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_optional_param_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "lambda_optional_param_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_optional_param_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "lambda_optional_param_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/launch-expected.txt b/ets2panda/test/parser/ets/launch-expected.txt
index 98f6cb3e8d7ccb09f01aaa78414b968c635190a2..18f651b0dd9e66ef1f3de0bc58a3dd362479bdf0 100755
--- a/ets2panda/test/parser/ets/launch-expected.txt
+++ b/ets2panda/test/parser/ets/launch-expected.txt
@@ -807,112 +807,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "launch.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "launch.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt b/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt
index 2bfacd379989b5bb601ef60354cd31bce5912291..ea1090699fef3afb7b9477cb63ccc45eb2e64e4f 100644
--- a/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt
+++ b/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt
@@ -188,112 +188,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch_function_returning_void.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch_function_returning_void.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch_function_returning_void.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch_function_returning_void.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch_function_returning_void.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch_function_returning_void.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "launch_function_returning_void.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "launch_function_returning_void.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/launch_ret-expected.txt b/ets2panda/test/parser/ets/launch_ret-expected.txt
index 6ad6445449696982d4f54ebed15c59c35e4553ed..b6e5cb729dcbaa194601809749ec8cb713e1673b 100644
--- a/ets2panda/test/parser/ets/launch_ret-expected.txt
+++ b/ets2panda/test/parser/ets/launch_ret-expected.txt
@@ -188,112 +188,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch_ret.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch_ret.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch_ret.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch_ret.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch_ret.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch_ret.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "launch_ret.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "launch_ret.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/launch_super-expected.txt b/ets2panda/test/parser/ets/launch_super-expected.txt
index 960994031d187b04b75188ebb2bd26881785b413..0eafb598f42ed9f05b9eb07f348890ba7d55d77d 100755
--- a/ets2panda/test/parser/ets/launch_super-expected.txt
+++ b/ets2panda/test/parser/ets/launch_super-expected.txt
@@ -972,112 +972,6 @@
                 "program": "launch_super.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch_super.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch_super.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch_super.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch_super.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch_super.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch_super.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "launch_super.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "launch_super.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/launch_this_callee-expected.txt b/ets2panda/test/parser/ets/launch_this_callee-expected.txt
index f4c5f717d454547ffd6f529c51a238f5556bb6a4..d6a39b0dee0b6202fa957e41fe292932ddb11bdb 100755
--- a/ets2panda/test/parser/ets/launch_this_callee-expected.txt
+++ b/ets2panda/test/parser/ets/launch_this_callee-expected.txt
@@ -2168,112 +2168,6 @@
                 "program": "launch_this_callee.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch_this_callee.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "launch_this_callee.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch_this_callee.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "launch_this_callee.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch_this_callee.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "launch_this_callee.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "launch_this_callee.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "launch_this_callee.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt b/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt
index 6702a2fd77bad51045c22353d2454aa08597508b..f8b8ac310e968288bab9733471896fd7b8ccf190 100644
--- a/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt
+++ b/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt
@@ -391,310 +391,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "res",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "launch_with_call_expression.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 8,
-                              "program": "launch_with_call_expression.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "launch",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 11,
-                                "program": "launch_with_call_expression.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 17,
-                                "program": "launch_with_call_expression.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "MemberExpression",
-                              "object": {
-                                "type": "Identifier",
-                                "name": "C",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 36,
-                                    "program": "launch_with_call_expression.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 37,
-                                    "program": "launch_with_call_expression.ets"
-                                  }
-                                }
-                              },
-                              "property": {
-                                "type": "Identifier",
-                                "name": "foo",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 38,
-                                    "program": "launch_with_call_expression.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 41,
-                                    "program": "launch_with_call_expression.ets"
-                                  }
-                                }
-                              },
-                              "computed": false,
-                              "optional": false,
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 36,
-                                  "program": "launch_with_call_expression.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 41,
-                                  "program": "launch_with_call_expression.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "typeParameters": {
-                            "type": "TSTypeParameterInstantiation",
-                            "params": [
-                              {
-                                "type": "ETSPrimitiveType",
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 18,
-                                    "program": "launch_with_call_expression.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 22,
-                                    "program": "launch_with_call_expression.ets"
-                                  }
-                                }
-                              },
-                              {
-                                "type": "ETSFunctionType",
-                                "params": [],
-                                "returnType": {
-                                  "type": "ETSPrimitiveType",
-                                  "loc": {
-                                    "start": {
-                                      "line": 21,
-                                      "column": 30,
-                                      "program": "launch_with_call_expression.ets"
-                                    },
-                                    "end": {
-                                      "line": 21,
-                                      "column": 34,
-                                      "program": "launch_with_call_expression.ets"
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 21,
-                                    "column": 24,
-                                    "program": "launch_with_call_expression.ets"
-                                  },
-                                  "end": {
-                                    "line": 21,
-                                    "column": 34,
-                                    "program": "launch_with_call_expression.ets"
-                                  }
-                                }
-                              }
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 17,
-                                "program": "launch_with_call_expression.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 35,
-                                "program": "launch_with_call_expression.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 11,
-                              "program": "launch_with_call_expression.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 42,
-                              "program": "launch_with_call_expression.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "launch_with_call_expression.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 42,
-                            "program": "launch_with_call_expression.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "launch_with_call_expression.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 42,
-                          "program": "launch_with_call_expression.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 21,
-                      "column": 5,
-                      "program": "launch_with_call_expression.ets"
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 42,
-                      "program": "launch_with_call_expression.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 21,
-                    "column": 5,
-                    "program": "launch_with_call_expression.ets"
-                  },
-                  "end": {
-                    "line": 21,
-                    "column": 42,
-                    "program": "launch_with_call_expression.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 21,
-                  "column": 5,
-                  "program": "launch_with_call_expression.ets"
-                },
-                "end": {
-                  "line": 21,
-                  "column": 42,
-                  "program": "launch_with_call_expression.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 21,
-                "column": 5,
-                "program": "launch_with_call_expression.ets"
-              },
-              "end": {
-                "line": 21,
-                "column": 42,
-                "program": "launch_with_call_expression.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -825,13 +521,13 @@
                     },
                     "loc": {
                       "start": {
-                        "line": 1,
-                        "column": 1,
+                        "line": 21,
+                        "column": 24,
                         "program": "launch_with_call_expression.ets"
                       },
                       "end": {
-                        "line": 1,
-                        "column": 1,
+                        "line": 21,
+                        "column": 34,
                         "program": "launch_with_call_expression.ets"
                       }
                     }
diff --git a/ets2panda/test/parser/ets/literals-expected.txt b/ets2panda/test/parser/ets/literals-expected.txt
index 080be2aefb44adf85841a1d9a39a0c1b34644dd6..27a83b54c8e8e7c0a4fdd1d3072aab550e16b9c5 100644
--- a/ets2panda/test/parser/ets/literals-expected.txt
+++ b/ets2panda/test/parser/ets/literals-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "literals.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "literals.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "literals.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "literals.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "literals.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "literals.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "literals.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "literals.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/main_entry_point_1-expected.txt b/ets2panda/test/parser/ets/main_entry_point_1-expected.txt
index 4d5a07a4a6c6b1ba3c25e6e7979dd9fc02cf0cec..bafd675769dea57af4f2c28da859b0b4f3816e16 100644
--- a/ets2panda/test/parser/ets/main_entry_point_1-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/main_entry_point_6-expected.txt b/ets2panda/test/parser/ets/main_entry_point_6-expected.txt
index e439d324dca500bb4fcff5bcd8a6e7eace490062..cf4fa2fb69cd79a539b7109ab1363360a31eede1 100644
--- a/ets2panda/test/parser/ets/main_entry_point_6-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_6-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_6.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/main_entry_point_7-expected.txt b/ets2panda/test/parser/ets/main_entry_point_7-expected.txt
index cda558b8dc0537a14192d298cd8681db771edf5a..1f72bae2a170f2b37f9bf6d3bf75675efafef6a6 100644
--- a/ets2panda/test/parser/ets/main_entry_point_7-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_7-expected.txt
@@ -566,112 +566,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/main_entry_point_8-expected.txt b/ets2panda/test/parser/ets/main_entry_point_8-expected.txt
index 7311fff7cce367bcba0e348bb49ceecd10946cc4..801f977a0f78c0be151ab87ee891d99816819353 100644
--- a/ets2panda/test/parser/ets/main_entry_point_8-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_8-expected.txt
@@ -103,112 +103,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_8.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/main_entry_point_9-expected.txt b/ets2panda/test/parser/ets/main_entry_point_9-expected.txt
index e85777b713203b266d528eddb12cc01be4a2a726..bde2af802180de7785a1c87ef813b53e2ec90366 100644
--- a/ets2panda/test/parser/ets/main_entry_point_9-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_9-expected.txt
@@ -167,112 +167,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "main_entry_point_9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "main_entry_point_9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "main_entry_point_9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "main_entry_point_9.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/method_empty-expected.txt b/ets2panda/test/parser/ets/method_empty-expected.txt
index 5ff7ee0eee07263bcac725be1b039594da031c82..2aa1937aa9b6966371e52f614314a07c847d9769 100644
--- a/ets2panda/test/parser/ets/method_empty-expected.txt
+++ b/ets2panda/test/parser/ets/method_empty-expected.txt
@@ -744,112 +744,6 @@
                 "program": "method_empty.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "method_empty.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "method_empty.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "method_empty.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "method_empty.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "method_empty.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "method_empty.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "method_empty.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "method_empty.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt
index 4561f88dd7897809fb825e34532f644242ff28fb..7c705c2bc3605bc1de5441fadc28c844cd5ba863 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt
@@ -389,112 +389,6 @@
                 "program": "method_modifier_check_14.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "method_modifier_check_14.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "method_modifier_check_14.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "method_modifier_check_14.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "method_modifier_check_14.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "method_modifier_check_14.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "method_modifier_check_14.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "method_modifier_check_14.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "method_modifier_check_14.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt
index 5d6ec8c4db0c98d8582d06fb198c703dcf62ea51..94df8bb62d7366d3c9fc97e4c6e09ddd605d9981 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt
@@ -389,112 +389,6 @@
                 "program": "method_modifier_check_8.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "method_modifier_check_8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "method_modifier_check_8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "method_modifier_check_8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "method_modifier_check_8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "method_modifier_check_8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "method_modifier_check_8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "method_modifier_check_8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "method_modifier_check_8.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt b/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt
index d725fa573773763295b826476c29318a1018b597..1c7308b1d944849bc07cdf81e965f69b93f38c20 100644
--- a/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt
+++ b/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "native_function_with_return_type.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "native_function_with_return_type.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "native_function_with_return_type.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "native_function_with_return_type.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "native_function_with_return_type.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "native_function_with_return_type.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "native_function_with_return_type.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "native_function_with_return_type.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/new_expressions-expected.txt b/ets2panda/test/parser/ets/new_expressions-expected.txt
index 6db9674498b57a136862d8e815df3a8acabed9f2..473d74aede1b19f842b8d1cb6156c9d53117645c 100644
--- a/ets2panda/test/parser/ets/new_expressions-expected.txt
+++ b/ets2panda/test/parser/ets/new_expressions-expected.txt
@@ -180,112 +180,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "new_expressions.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "new_expressions.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "new_expressions.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "new_expressions.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "new_expressions.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "new_expressions.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "new_expressions.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "new_expressions.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/new_object_3-expected.txt b/ets2panda/test/parser/ets/new_object_3-expected.txt
index 645a973ec72579fc8603404ce0a1e3340affa298..6c273533ba7931e0e4284fb58372b9b6a2009365 100644
--- a/ets2panda/test/parser/ets/new_object_3-expected.txt
+++ b/ets2panda/test/parser/ets/new_object_3-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "new_object_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "new_object_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "new_object_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "new_object_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "new_object_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "new_object_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "new_object_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "new_object_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/null-expected.txt b/ets2panda/test/parser/ets/null-expected.txt
index 9364cf0b91ec54ecc3b486ba81981e8884f0f2d3..ac873862525e83f630b373be22b1ebe7ac7d9f27 100644
--- a/ets2panda/test/parser/ets/null-expected.txt
+++ b/ets2panda/test/parser/ets/null-expected.txt
@@ -179,288 +179,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "null.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "null.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NullLiteral",
-                          "value": null,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 22,
-                              "program": "null.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 26,
-                              "program": "null.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "null.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 26,
-                            "program": "null.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "null.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 26,
-                          "program": "null.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "null.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "null.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "cls",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 19,
-                                    "program": "null.ets"
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 22,
-                                    "program": "null.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 19,
-                                  "program": "null.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 23,
-                                  "program": "null.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 19,
-                                "program": "null.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 23,
-                                "program": "null.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 15,
-                              "program": "null.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 25,
-                              "program": "null.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "null.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 25,
-                            "program": "null.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "null.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 25,
-                          "program": "null.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 5,
-                      "program": "null.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 25,
-                      "program": "null.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 5,
-                    "program": "null.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 25,
-                    "program": "null.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 5,
-                  "program": "null.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 25,
-                  "program": "null.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 5,
-                "program": "null.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 25,
-                "program": "null.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -575,7 +293,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 26,
+                "column": 22,
                 "program": "null.ets"
               }
             }
@@ -662,7 +380,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 25,
+                "column": 15,
                 "program": "null.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/null_valid-expected.txt b/ets2panda/test/parser/ets/null_valid-expected.txt
index 9166813212379f31c8edf637f5ad1d0713fba549..d827ecc044694580046b3522e4e86f147d5ce8e2 100644
--- a/ets2panda/test/parser/ets/null_valid-expected.txt
+++ b/ets2panda/test/parser/ets/null_valid-expected.txt
@@ -130,178 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "o",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "null_valid.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "null_valid.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "n",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 25,
-                              "program": "null_valid.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 26,
-                              "program": "null_valid.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "null_valid.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 26,
-                            "program": "null_valid.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "null_valid.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 26,
-                          "program": "null_valid.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "null_valid.ets"
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 26,
-                      "program": "null_valid.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "null_valid.ets"
-                  },
-                  "end": {
-                    "line": 17,
-                    "column": 26,
-                    "program": "null_valid.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "null_valid.ets"
-                },
-                "end": {
-                  "line": 17,
-                  "column": 26,
-                  "program": "null_valid.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "null_valid.ets"
-              },
-              "end": {
-                "line": 17,
-                "column": 26,
-                "program": "null_valid.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -472,7 +300,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 26,
+                "column": 25,
                 "program": "null_valid.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt b/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt
index ccbb04f900ff7535b5d2f82c771d30d34aaf1d04..406d3b197ec4a397fc78f92321db8cedadfefd4b 100644
--- a/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt
+++ b/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt
@@ -959,112 +959,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullableGenericSignature.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullableGenericSignature.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullableGenericSignature.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullableGenericSignature.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullableGenericSignature.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullableGenericSignature.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "nullableGenericSignature.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "nullableGenericSignature.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/nullable_union_array-expected.txt b/ets2panda/test/parser/ets/nullable_union_array-expected.txt
index 284320e7ef5a4547d1fdcc8127b68b1ed59c950a..6a5118592bbbe2de994889545fac0b15c7351526 100644
--- a/ets2panda/test/parser/ets/nullable_union_array-expected.txt
+++ b/ets2panda/test/parser/ets/nullable_union_array-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullable_union_array.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "nullable_union_array.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullable_union_array.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "nullable_union_array.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullable_union_array.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "nullable_union_array.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "nullable_union_array.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "nullable_union_array.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/object-expected.txt b/ets2panda/test/parser/ets/object-expected.txt
index d1dd4a7434113cc4c22dffb1c09d7c35d9a754d5..a62b288d8314c3bac3b203e3f9da1baf519b3bc3 100644
--- a/ets2panda/test/parser/ets/object-expected.txt
+++ b/ets2panda/test/parser/ets/object-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "object.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "object.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "object.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "object.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "object.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "object.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "object.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "object.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/optional_field_class-expected.txt b/ets2panda/test/parser/ets/optional_field_class-expected.txt
index 884726ec67f1d7c676fdc406a85076f9fe02fcb7..bec8d86957f42a9ed9faf8412a0f331b4fcde1a1 100644
--- a/ets2panda/test/parser/ets/optional_field_class-expected.txt
+++ b/ets2panda/test/parser/ets/optional_field_class-expected.txt
@@ -522,112 +522,6 @@
                 "program": "optional_field_class.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "optional_field_class.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "optional_field_class.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "optional_field_class.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "optional_field_class.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "optional_field_class.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "optional_field_class.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "optional_field_class.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "optional_field_class.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/optional_field_interface-expected.txt b/ets2panda/test/parser/ets/optional_field_interface-expected.txt
index 48d94b4fe45117d403dcf19852242f23febd2228..ce71e3dcbcfa1876f9c5d6daf6dd771de26530d6 100644
--- a/ets2panda/test/parser/ets/optional_field_interface-expected.txt
+++ b/ets2panda/test/parser/ets/optional_field_interface-expected.txt
@@ -1455,112 +1455,6 @@
                 "program": "optional_field_interface.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "optional_field_interface.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "optional_field_interface.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "optional_field_interface.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "optional_field_interface.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "optional_field_interface.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "optional_field_interface.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "optional_field_interface.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "optional_field_interface.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt b/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt
index 6ec896614451779f06a647d3001d2b95e22b6b65..77794800bc20c1f475e2697b082e70c47f2911c1 100644
--- a/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt
+++ b/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt
@@ -1818,112 +1818,6 @@
                 "program": "optional_field_interfaceUnion.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "optional_field_interfaceUnion.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "optional_field_interfaceUnion.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "optional_field_interfaceUnion.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "optional_field_interfaceUnion.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "optional_field_interfaceUnion.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "optional_field_interfaceUnion.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "optional_field_interfaceUnion.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "optional_field_interfaceUnion.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt
index 27cb8be9b1400a21d61fe1589743f6fc5dcc1d41..b90618064efda3a517a114b3f5cf2f5aa34aaf42 100644
--- a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt
+++ b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt
@@ -820,112 +820,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "optional_union_paramter.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "optional_union_paramter.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "optional_union_paramter.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "optional_union_paramter.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "optional_union_paramter.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "optional_union_paramter.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "optional_union_paramter.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "optional_union_paramter.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/override-expected.txt b/ets2panda/test/parser/ets/override-expected.txt
index 5f5fa18a95a7572e5dfbd2baf306097b9e472172..85fcdfe8e6ccfa13dc88527a51fb7d897ef797b4 100644
--- a/ets2panda/test/parser/ets/override-expected.txt
+++ b/ets2panda/test/parser/ets/override-expected.txt
@@ -1536,112 +1536,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "override.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "override.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "override.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "override.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "override.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt b/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt
index 01d3b387bae7c3faac2170034ec0588f41264e36..9dfd261bbf5f55b9387e3c69f75e867103a3d128 100644
--- a/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt
+++ b/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt
@@ -898,112 +898,6 @@
                 "program": "overrideStaticFunc.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "overrideStaticFunc.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "overrideStaticFunc.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "overrideStaticFunc.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "overrideStaticFunc.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "overrideStaticFunc.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "overrideStaticFunc.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "overrideStaticFunc.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "overrideStaticFunc.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt b/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt
index 0f165ffb93e070580d052f5249c74fd804bb1910..640592877099715fca4353f48ca413afc35b388e 100644
--- a/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt
+++ b/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt
@@ -24,370 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "parentheses_expression_value.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "parentheses_expression_value.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "parentheses_expression_value.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 10,
-                              "program": "parentheses_expression_value.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "parentheses_expression_value.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 10,
-                            "program": "parentheses_expression_value.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "parentheses_expression_value.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 10,
-                          "program": "parentheses_expression_value.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "parentheses_expression_value.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "parentheses_expression_value.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "parentheses_expression_value.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "parentheses_expression_value.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "parentheses_expression_value.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "parentheses_expression_value.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "parentheses_expression_value.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "parentheses_expression_value.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "parentheses_expression_value.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "parentheses_expression_value.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "parentheses_expression_value.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 14,
-                              "program": "parentheses_expression_value.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "parentheses_expression_value.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 14,
-                            "program": "parentheses_expression_value.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "parentheses_expression_value.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 14,
-                          "program": "parentheses_expression_value.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "parentheses_expression_value.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "parentheses_expression_value.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "parentheses_expression_value.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 12,
-                              "program": "parentheses_expression_value.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "parentheses_expression_value.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 12,
-                            "program": "parentheses_expression_value.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "parentheses_expression_value.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 12,
-                          "program": "parentheses_expression_value.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "parentheses_expression_value.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 12,
-                      "program": "parentheses_expression_value.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "parentheses_expression_value.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 12,
-                    "program": "parentheses_expression_value.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "parentheses_expression_value.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 12,
-                  "program": "parentheses_expression_value.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "parentheses_expression_value.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 12,
-                "program": "parentheses_expression_value.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/predefined_types-expected.txt b/ets2panda/test/parser/ets/predefined_types-expected.txt
index b3365f114b02b19c4041382d2096dbaf0febcb92..ca20e82b471c3121a95147d214ad9ef35b98e246 100644
--- a/ets2panda/test/parser/ets/predefined_types-expected.txt
+++ b/ets2panda/test/parser/ets/predefined_types-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "predefined_types.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "predefined_types.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "predefined_types.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "predefined_types.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "predefined_types.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "predefined_types.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "predefined_types.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "predefined_types.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/promiseCasting-expected.txt b/ets2panda/test/parser/ets/promiseCasting-expected.txt
index 50bd7d4c96988f5f1295d7e6773656e6f3204402..f863af2769690165fca41013b5ce5472ec0f2de3 100644
--- a/ets2panda/test/parser/ets/promiseCasting-expected.txt
+++ b/ets2panda/test/parser/ets/promiseCasting-expected.txt
@@ -299,177 +299,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "fs",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "promiseCasting.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 7,
-                              "program": "promiseCasting.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 16,
-                              "program": "promiseCasting.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 18,
-                              "program": "promiseCasting.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "promiseCasting.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 18,
-                            "program": "promiseCasting.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "promiseCasting.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 18,
-                          "program": "promiseCasting.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 21,
-                      "column": 5,
-                      "program": "promiseCasting.ets"
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 18,
-                      "program": "promiseCasting.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 21,
-                    "column": 5,
-                    "program": "promiseCasting.ets"
-                  },
-                  "end": {
-                    "line": 21,
-                    "column": 18,
-                    "program": "promiseCasting.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 21,
-                  "column": 5,
-                  "program": "promiseCasting.ets"
-                },
-                "end": {
-                  "line": 21,
-                  "column": 18,
-                  "program": "promiseCasting.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 21,
-                "column": 5,
-                "program": "promiseCasting.ets"
-              },
-              "end": {
-                "line": 21,
-                "column": 18,
-                "program": "promiseCasting.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -616,7 +445,7 @@
               },
               "end": {
                 "line": 21,
-                "column": 18,
+                "column": 16,
                 "program": "promiseCasting.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt
index d880e44da02be96a02a58c5c1ab4a7b7a8070c0a..38091e4ee2a8568aac8f3cddd7163fbd9e5da824 100644
--- a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt
+++ b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt
@@ -1238,112 +1238,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "proxyVoidGeneration.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "proxyVoidGeneration.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "proxyVoidGeneration.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "proxyVoidGeneration.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "proxyVoidGeneration.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "proxyVoidGeneration.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "proxyVoidGeneration.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "proxyVoidGeneration.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/proxy_method-expected.txt b/ets2panda/test/parser/ets/proxy_method-expected.txt
index 390eb558a4cd9f9aacb3638bc7c63186b21b38d2..440c07bd580fe7c2f18f087b4ed6c814db4c4f27 100644
--- a/ets2panda/test/parser/ets/proxy_method-expected.txt
+++ b/ets2panda/test/parser/ets/proxy_method-expected.txt
@@ -730,112 +730,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "proxy_method.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "proxy_method.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "proxy_method.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "proxy_method.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "proxy_method.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "proxy_method.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "proxy_method.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "proxy_method.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt
index 2fca16dd7e70cfa625c1b79bc03edd83fc49363b..2473b9264178888def3df76d7d272c9b8e495d95 100644
--- a/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt
@@ -130,177 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "foo",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 12,
-                              "program": "A.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "A.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "AAA",
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 26,
-                              "program": "A.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 31,
-                              "program": "A.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 12,
-                            "program": "A.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 31,
-                            "program": "A.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 12,
-                          "program": "A.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 31,
-                          "program": "A.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 12,
-                      "program": "A.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 31,
-                      "program": "A.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 12,
-                    "program": "A.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 31,
-                    "program": "A.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 12,
-                  "program": "A.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 31,
-                  "program": "A.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 12,
-                "program": "A.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 31,
-                "program": "A.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -383,7 +212,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 31,
+                "column": 26,
                 "program": "A.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/re_export/diamond/B-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/B-expected.txt
index 24713712a1f95a57c2ffad2445e70f9dde3d767e..91b075678e291df895c6bf88ee3451c3a8739bb7 100644
--- a/ets2panda/test/parser/ets/re_export/diamond/B-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/diamond/B-expected.txt
@@ -226,112 +226,6 @@
                 "program": "B.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "B.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "B.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "B.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "B.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "B.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "B.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "B.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "B.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/diamond/B2-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/B2-expected.txt
index 170b501699dd0914db6810cc7c55b1de451b931e..26bc3efaa2821532481d914b764f80b2f26ace1e 100644
--- a/ets2panda/test/parser/ets/re_export/diamond/B2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/diamond/B2-expected.txt
@@ -226,112 +226,6 @@
                 "program": "B2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "B2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "B2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "B2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "B2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "B2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "B2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "B2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "B2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/diamond/C-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/C-expected.txt
index 8f29d8d90e0e591f7ea8517e23959d0a84d00664..9afc61f3dd7206fee271a23e1d45d9cd940b5762 100644
--- a/ets2panda/test/parser/ets/re_export/diamond/C-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/diamond/C-expected.txt
@@ -226,112 +226,6 @@
                 "program": "C.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "C.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "C.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "C.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "C.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "C.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "C.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "C.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "C.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/diamond/C2-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/C2-expected.txt
index 8b7e3421bcae8cc831818bc0063bcd06dadf6142..c357910a823005b2aad9ea3ba71f8a70244e09b5 100644
--- a/ets2panda/test/parser/ets/re_export/diamond/C2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/diamond/C2-expected.txt
@@ -226,112 +226,6 @@
                 "program": "C2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "C2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "C2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "C2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "C2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "C2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "C2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "C2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "C2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/diamond/D-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/D-expected.txt
index 6f5a5dd555396b47702203802319c82cb8c7f0a6..8b1496f9743f7b53fe3430f981ba084c491af8c1 100644
--- a/ets2panda/test/parser/ets/re_export/diamond/D-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/diamond/D-expected.txt
@@ -154,112 +154,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "D.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "D.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "D.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "D.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "D.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "D.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "D.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "D.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/diamond/D2-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/D2-expected.txt
index cb0d70915ce63f450d16e08f2bc89f4bdacc05e8..093b4662e7c48891b592fd43d3d424524486acf7 100644
--- a/ets2panda/test/parser/ets/re_export/diamond/D2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/diamond/D2-expected.txt
@@ -154,112 +154,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "D2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "D2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "D2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "D2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "D2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "D2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "D2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "D2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/export-expected.txt b/ets2panda/test/parser/ets/re_export/export-expected.txt
index d218cf7bf7594e936f8f78cb6aaab3f85df6f2df..114d87e8972f045f8d386ddd648d090d75c172c8 100644
--- a/ets2panda/test/parser/ets/re_export/export-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/export-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "export.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "export.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/export_2-expected.txt b/ets2panda/test/parser/ets/re_export/export_2-expected.txt
index cafb9dafffdc9a5d9bc1184ba2dc5484796ff6bb..67d328167072dd3a2560cfc9434a53ce5291397b 100644
--- a/ets2panda/test/parser/ets/re_export/export_2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/export_2-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "export_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "export_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/export_3-expected.txt b/ets2panda/test/parser/ets/re_export/export_3-expected.txt
index de4fbdc68df939a991a6da987b3638bba15d596a..b30a8e409c81c9c1322244d4ef9261bc6d4284c8 100644
--- a/ets2panda/test/parser/ets/re_export/export_3-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/export_3-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "export_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "export_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/folder/export-expected.txt b/ets2panda/test/parser/ets/re_export/folder/export-expected.txt
index d218cf7bf7594e936f8f78cb6aaab3f85df6f2df..114d87e8972f045f8d386ddd648d090d75c172c8 100644
--- a/ets2panda/test/parser/ets/re_export/folder/export-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folder/export-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "export.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "export.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt b/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt
index d218cf7bf7594e936f8f78cb6aaab3f85df6f2df..114d87e8972f045f8d386ddd648d090d75c172c8 100644
--- a/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "export.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "export.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/folder/re_export_6-expected.txt b/ets2panda/test/parser/ets/re_export/folder/re_export_6-expected.txt
index 042a982b661cebfdfa5038637fab284b877f3822..72671dd84c7bd4a3c34e263f56569bafedfe9b11 100644
--- a/ets2panda/test/parser/ets/re_export/folder/re_export_6-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folder/re_export_6-expected.txt
@@ -209,112 +209,6 @@
                 "program": "re_export_6.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_6.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/folder/re_export_7-expected.txt b/ets2panda/test/parser/ets/re_export/folder/re_export_7-expected.txt
index 6bc6c8229c25f3f81b2f3e035a67a2da16140aac..82c95dd007a68df1598a0687c9c3ed7be70effb9 100644
--- a/ets2panda/test/parser/ets/re_export/folder/re_export_7-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folder/re_export_7-expected.txt
@@ -209,112 +209,6 @@
                 "program": "re_export_7.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_7.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/folderIndex/index-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex/index-expected.txt
index f263b06b260aaf0b63fe1d07c9576e9af178fc38..49e8388dda12d70a01d825348bf63086086f066a 100644
--- a/ets2panda/test/parser/ets/re_export/folderIndex/index-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folderIndex/index-expected.txt
@@ -226,112 +226,6 @@
                 "program": "index.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "index.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "index.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "index.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "index.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "index.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "index.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "index.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "index.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/folderIndex/test-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex/test-expected.txt
index 3cd598a0971f8e9965894b05462e0513048ba320..8f89981654515fe3a867f84276c0ac015d8c8f0a 100644
--- a/ets2panda/test/parser/ets/re_export/folderIndex/test-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folderIndex/test-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/folderIndex2/index-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex2/index-expected.txt
index 724113400b76eba9c8bac4da5e76ea6e457a2aae..8c4dbd9cf07857a90ede99d00cc652cd4d411133 100644
--- a/ets2panda/test/parser/ets/re_export/folderIndex2/index-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folderIndex2/index-expected.txt
@@ -323,112 +323,6 @@
                 "program": "index.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "index.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "index.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "index.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "index.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "index.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "index.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "index.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "index.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt
index ce641d8b5c84227d786692f1829fdb681d2c0f32..b8f687aa6d95c870d525bf3641753a37bcb24abe 100644
--- a/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt
@@ -645,112 +645,6 @@
                 "program": "key.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "key.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "key.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "key.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "key.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "key.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "key.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "key.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "key.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/import-expected.txt b/ets2panda/test/parser/ets/re_export/import-expected.txt
index 5fff7bf409fb41c29fb80cd151588e835d01ee5f..f03fac891667c50b96fb50a718c784c1681d310a 100644
--- a/ets2panda/test/parser/ets/re_export/import-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_10-expected.txt b/ets2panda/test/parser/ets/re_export/import_10-expected.txt
index a4098ad70b375c18e9a6a34a0508ffb8c2894e73..d028cca6fc15413935cbd88544cc7ce84ec1bf28 100644
--- a/ets2panda/test/parser/ets/re_export/import_10-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_10-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_10.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_10.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_10.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_10.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_10.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_10.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_10.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_10.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_11-expected.txt b/ets2panda/test/parser/ets/re_export/import_11-expected.txt
index 30a6ebf358b8ad2649133d95d973ff7a813e902f..b4b7ff6311cd922a15b0f6eb7ff64d6a2f5afef4 100644
--- a/ets2panda/test/parser/ets/re_export/import_11-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_11-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_11.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_11.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_11.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_11.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_11.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_11.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_11.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_11.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_12-expected.txt b/ets2panda/test/parser/ets/re_export/import_12-expected.txt
index 4388c55b713fa047b510eeef7a54ea0b734014e0..6ce6d66efa995bbfb291e0fb29c8317df086115a 100644
--- a/ets2panda/test/parser/ets/re_export/import_12-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_12-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_12.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_12.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_12.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_12.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_12.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_12.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_12.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_12.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_13-expected.txt b/ets2panda/test/parser/ets/re_export/import_13-expected.txt
index 4d098558335306401a1384aebed1761bef8e9432..83869b328fbd8e71241d6c034e63d925bd21f5ce 100644
--- a/ets2panda/test/parser/ets/re_export/import_13-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_13-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_13.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_13.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_13.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_13.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_13.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_13.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_13.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_13.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_14-expected.txt b/ets2panda/test/parser/ets/re_export/import_14-expected.txt
index dbacd9840b38dee273bab37118e1826c23c4af7d..2c06d08a3906cfe471077782eec80ff256157df5 100644
--- a/ets2panda/test/parser/ets/re_export/import_14-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_14-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_14.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_14.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_14.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_14.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_14.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_14.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_14.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_14.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_15-expected.txt b/ets2panda/test/parser/ets/re_export/import_15-expected.txt
index f13f3a48df89520aa10a340e71753c3ecce12e8f..267b658306a3a80508f25606bef8171c3b8a4523 100644
--- a/ets2panda/test/parser/ets/re_export/import_15-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_15-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_15.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_15.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_15.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_15.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_15.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_15.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_15.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_15.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_2-expected.txt b/ets2panda/test/parser/ets/re_export/import_2-expected.txt
index 2189edea677c2394ee661970e9b7464046e87d66..0fad370ee2af546f53ba53a0b2742344fa281af5 100644
--- a/ets2panda/test/parser/ets/re_export/import_2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_2-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_3-expected.txt b/ets2panda/test/parser/ets/re_export/import_3-expected.txt
index bf23ed8851d2b62bc9c31490ecdc2bccb2f6383f..679e35cecb9fbd68df53e505b71a182828d59b1f 100644
--- a/ets2panda/test/parser/ets/re_export/import_3-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_3-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_6-expected.txt b/ets2panda/test/parser/ets/re_export/import_6-expected.txt
index 85d2235752732e9fff52e10f5b0ffff27ab15bb4..799cdc863590c5f4068f1eabd3e3ce7b88a44ebb 100644
--- a/ets2panda/test/parser/ets/re_export/import_6-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_6-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_6.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_7-expected.txt b/ets2panda/test/parser/ets/re_export/import_7-expected.txt
index 7969d5840b2167a7d0aabb56f00f1db32c378c56..d2cf438c5304739980217e6a344840c34ba2be44 100644
--- a/ets2panda/test/parser/ets/re_export/import_7-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_7-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_8-expected.txt b/ets2panda/test/parser/ets/re_export/import_8-expected.txt
index def3925024de857a919049cac08736a1bd47b931..aa93142609deb10cfa250acd2b11eab85ea0d544 100644
--- a/ets2panda/test/parser/ets/re_export/import_8-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_8-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_8.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_9-expected.txt b/ets2panda/test/parser/ets/re_export/import_9-expected.txt
index 86ad70b08d40f0b4a41ea90753595a130fd857f6..9b4e0a3b5e9270dc2e9d432e677ae5a727c50aea 100644
--- a/ets2panda/test/parser/ets/re_export/import_9-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_9-expected.txt
@@ -106,112 +106,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_9.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/re_export/import_index-expected.txt b/ets2panda/test/parser/ets/re_export/import_index-expected.txt
index fda7032574b823dfb5ab1c357d21b962570a6f60..d0c01a4f973971ef5fe9521ea9cf6e78797020ed 100644
--- a/ets2panda/test/parser/ets/re_export/import_index-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_index-expected.txt
@@ -194,196 +194,6 @@
                 "program": "import_index.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "CallExpression",
-                        "callee": {
-                          "type": "MemberExpression",
-                          "object": {
-                            "type": "Identifier",
-                            "name": "all",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 1,
-                                "program": "import_index.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 4,
-                                "program": "import_index.ets"
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "Identifier",
-                            "name": "ad",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 5,
-                                "program": "import_index.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 7,
-                                "program": "import_index.ets"
-                              }
-                            }
-                          },
-                          "computed": false,
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 1,
-                              "program": "import_index.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 7,
-                              "program": "import_index.ets"
-                            }
-                          }
-                        },
-                        "arguments": [],
-                        "optional": false,
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 1,
-                            "program": "import_index.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 9,
-                            "program": "import_index.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 1,
-                          "program": "import_index.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 10,
-                          "program": "import_index.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 1,
-                      "program": "import_index.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 10,
-                      "program": "import_index.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 1,
-                    "program": "import_index.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 10,
-                    "program": "import_index.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 1,
-                  "program": "import_index.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 10,
-                  "program": "import_index.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 1,
-                "program": "import_index.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 10,
-                "program": "import_index.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/import_index_2-expected.txt b/ets2panda/test/parser/ets/re_export/import_index_2-expected.txt
index a09cb3c6ef0403e7e27033ca4884c13e013607df..f50ba4cad3ff6f0a783533281f33e9be7fcba161 100644
--- a/ets2panda/test/parser/ets/re_export/import_index_2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_index_2-expected.txt
@@ -211,162 +211,6 @@
                 "program": "import_index_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "CallExpression",
-                        "callee": {
-                          "type": "Identifier",
-                          "name": "ad",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 1,
-                              "program": "import_index_2.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 3,
-                              "program": "import_index_2.ets"
-                            }
-                          }
-                        },
-                        "arguments": [],
-                        "optional": false,
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 1,
-                            "program": "import_index_2.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "import_index_2.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 1,
-                          "program": "import_index_2.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 6,
-                          "program": "import_index_2.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 1,
-                      "program": "import_index_2.ets"
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 6,
-                      "program": "import_index_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 18,
-                    "column": 1,
-                    "program": "import_index_2.ets"
-                  },
-                  "end": {
-                    "line": 18,
-                    "column": 6,
-                    "program": "import_index_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 18,
-                  "column": 1,
-                  "program": "import_index_2.ets"
-                },
-                "end": {
-                  "line": 18,
-                  "column": 6,
-                  "program": "import_index_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 18,
-                "column": 1,
-                "program": "import_index_2.ets"
-              },
-              "end": {
-                "line": 18,
-                "column": 6,
-                "program": "import_index_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/import_index_3-expected.txt b/ets2panda/test/parser/ets/re_export/import_index_3-expected.txt
index 9da7e0aad6dc457b5bb263242b2ed60888811c74..6368bbb3d2ec11998c262d41a1b0ccf58d357d6a 100644
--- a/ets2panda/test/parser/ets/re_export/import_index_3-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_index_3-expected.txt
@@ -260,112 +260,6 @@
                 "program": "import_index_3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_index_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_index_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_index_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_index_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_index_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_index_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_index_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_index_3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export-expected.txt b/ets2panda/test/parser/ets/re_export/re_export-expected.txt
index 71bf5056c348a22d482a9e3657edb86f9a4b143e..f625a750e0ce32bd2c669c53a7a3c0874b6eb6ab 100644
--- a/ets2panda/test/parser/ets/re_export/re_export-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export-expected.txt
@@ -209,112 +209,6 @@
                 "program": "re_export.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_10-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_10-expected.txt
index b2b3d2ec25d34955f851675dcabebd8c6a68da31..887d4fd5a9694bccac34e5c9bcc99e679a7ec6a7 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_10-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_10-expected.txt
@@ -209,112 +209,6 @@
                 "program": "re_export_10.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_10.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_10.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_10.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_10.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_10.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_10.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_10.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_10.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_11-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_11-expected.txt
index a3bd5a56a6fe2bdb6ce1b09fa2aba846c8708c5b..9c4c1acfa1c8eba53f20bce18385f1e2ea12b069 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_11-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_11-expected.txt
@@ -306,112 +306,6 @@
                 "program": "re_export_11.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_11.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_11.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_11.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_11.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_11.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_11.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_11.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_11.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_12-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_12-expected.txt
index 508d6c6cb89837f0077ea103a96ce1d2b3f88977..08ac1bd0f05c6ec51fdb8de5e91841ceff159ae6 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_12-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_12-expected.txt
@@ -289,112 +289,6 @@
                 "program": "re_export_12.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_12.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_12.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_12.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_12.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_12.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_12.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_12.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_12.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_2-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_2-expected.txt
index c02bbe151393dfc332ca4c0c94fdb996748880d1..f170998306daccc9895199536f5908fcb18fa957 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_2-expected.txt
@@ -226,112 +226,6 @@
                 "program": "re_export_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_3-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_3-expected.txt
index 89d249896648e912587fdb630e61f5f0df60cc93..52af379f4bcec267f40c53dab940c183512b8928 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_3-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_3-expected.txt
@@ -226,112 +226,6 @@
                 "program": "re_export_3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_4-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_4-expected.txt
index 26a9e8d39dd52f8847eb7b37142e939759d9fa9d..5128d6df5ed1b51dd4d2b3cbaeda05fc65cd5ac0 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_4-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_4-expected.txt
@@ -323,112 +323,6 @@
                 "program": "re_export_4.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_4.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_5-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_5-expected.txt
index ae5f36a093295ba0e80884628911f20b836833f1..8c99f73bc7560ec5482fd45180d178896f10ef28 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_5-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_5-expected.txt
@@ -289,112 +289,6 @@
                 "program": "re_export_5.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_5.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_7-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_7-expected.txt
index 00959f7fdd0176194e9b66373bc1c84bded299e5..c1a32f8f01df4ab3035825b00f4519d9091dc123 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_7-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_7-expected.txt
@@ -306,112 +306,6 @@
                 "program": "re_export_7.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_7.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_8-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_8-expected.txt
index 7329e92b7fc7d7bf62bc5a0a464cd069bef0a280..c3e353dba524ac4f73f3b8c0cf82ba0889a65c7c 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_8-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_8-expected.txt
@@ -226,112 +226,6 @@
                 "program": "re_export_8.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_8.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/re_export/re_export_9-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_9-expected.txt
index c12d4e3c6d36b61f18a98117d02800e16cfebf09..8a5abd930c4540ef19583e9cd5742a4791380087 100644
--- a/ets2panda/test/parser/ets/re_export/re_export_9-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/re_export_9-expected.txt
@@ -226,112 +226,6 @@
                 "program": "re_export_9.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_9.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "re_export_9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_9.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "re_export_9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_9.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "re_export_9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_9.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "re_export_9.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/regression-target-type-context-expected.txt b/ets2panda/test/parser/ets/regression-target-type-context-expected.txt
index 59d8b38df42ae9aefad3183ce0e3a9a7acadad71..60f3b0d7f445d31976d2943503c12bb05182e81b 100644
--- a/ets2panda/test/parser/ets/regression-target-type-context-expected.txt
+++ b/ets2panda/test/parser/ets/regression-target-type-context-expected.txt
@@ -1618,112 +1618,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "regression-target-type-context.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "regression-target-type-context.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "regression-target-type-context.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "regression-target-type-context.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "regression-target-type-context.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "regression-target-type-context.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "regression-target-type-context.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "regression-target-type-context.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/rest_parameter_01-expected.txt b/ets2panda/test/parser/ets/rest_parameter_01-expected.txt
index c1fc9868684a5985bfd660312b68a0de8331277d..679ea301e1806db12ca32756ad6ca68e21100cf5 100644
--- a/ets2panda/test/parser/ets/rest_parameter_01-expected.txt
+++ b/ets2panda/test/parser/ets/rest_parameter_01-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "rest_parameter_01.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "rest_parameter_01.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "rest_parameter_01.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "rest_parameter_01.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "rest_parameter_01.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "rest_parameter_01.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "rest_parameter_01.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "rest_parameter_01.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/rest_parameter_02-expected.txt b/ets2panda/test/parser/ets/rest_parameter_02-expected.txt
index 75904393ae830688e70e591e8a44fda44b903911..c8d32910de8ea48ec0c4a7c86ad20c4351a6bca8 100644
--- a/ets2panda/test/parser/ets/rest_parameter_02-expected.txt
+++ b/ets2panda/test/parser/ets/rest_parameter_02-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "rest_parameter_02.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "rest_parameter_02.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "rest_parameter_02.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "rest_parameter_02.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "rest_parameter_02.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "rest_parameter_02.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "rest_parameter_02.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "rest_parameter_02.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/return-expected.txt b/ets2panda/test/parser/ets/return-expected.txt
index 4c08f545fd0a67ab1df08cbeb32fce7152d3664c..ac2cf79a658f156b50bb70b0d1bbc4e6e5e6fd36 100644
--- a/ets2panda/test/parser/ets/return-expected.txt
+++ b/ets2panda/test/parser/ets/return-expected.txt
@@ -24,226 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "return.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "return.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 1,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 17,
-                                  "program": "return.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 18,
-                                  "program": "return.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 2,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 20,
-                                  "program": "return.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 21,
-                                  "program": "return.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3,
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 23,
-                                  "program": "return.ets"
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 24,
-                                  "program": "return.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 16,
-                              "program": "return.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 25,
-                              "program": "return.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "return.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 25,
-                            "program": "return.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "return.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 25,
-                          "program": "return.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "return.ets"
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 25,
-                      "program": "return.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "return.ets"
-                  },
-                  "end": {
-                    "line": 16,
-                    "column": 25,
-                    "program": "return.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "return.ets"
-                },
-                "end": {
-                  "line": 16,
-                  "column": 25,
-                  "program": "return.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "return.ets"
-              },
-              "end": {
-                "line": 16,
-                "column": 25,
-                "program": "return.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -358,7 +138,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 25,
+                "column": 16,
                 "program": "return.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt b/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt
index 09900e0a9388c544e3bd2a36d2346f0b68eb58ab..c5ce680e3027e0d89d6eef4e4e6a3d2c5784154e 100644
--- a/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt
+++ b/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt
@@ -285,112 +285,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "returnNullableFromFunction.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "returnNullableFromFunction.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "returnNullableFromFunction.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "returnNullableFromFunction.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "returnNullableFromFunction.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "returnNullableFromFunction.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "returnNullableFromFunction.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "returnNullableFromFunction.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt b/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt
index 2daf1fa1abb27b2b1b4329000f36fbaa9b71ef02..9566897e1da2972bf6f4fee89f7b3b235cca7335 100644
--- a/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt
+++ b/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt
@@ -662,112 +662,6 @@
                 "program": "returnNullableFromMethod.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "returnNullableFromMethod.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "returnNullableFromMethod.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "returnNullableFromMethod.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "returnNullableFromMethod.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "returnNullableFromMethod.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "returnNullableFromMethod.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "returnNullableFromMethod.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "returnNullableFromMethod.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/scoped_decl-expected.txt b/ets2panda/test/parser/ets/scoped_decl-expected.txt
index 1b84b749f114969c754ee73f4e910ed15d7cadde..eed121c9c666c7fe858898972d1dc18a65447e50 100644
--- a/ets2panda/test/parser/ets/scoped_decl-expected.txt
+++ b/ets2panda/test/parser/ets/scoped_decl-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "scoped_decl.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "scoped_decl.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "scoped_decl.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "scoped_decl.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "scoped_decl.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "scoped_decl.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "scoped_decl.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "scoped_decl.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/selective_export/import_1-expected.txt b/ets2panda/test/parser/ets/selective_export/import_1-expected.txt
index 666a6fd502fc15cb2831d92d3b7037bcc9603a6d..bfa4cf5d5f51fbc7c04a862c3ba4be56c4505b82 100644
--- a/ets2panda/test/parser/ets/selective_export/import_1-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/import_1-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/selective_export/import_2-expected.txt b/ets2panda/test/parser/ets/selective_export/import_2-expected.txt
index 6676c50d1a1a7f2d1a7efede655efb41cceeb0ff..605cb91719255e879ceb43ffb455da780983e2a2 100644
--- a/ets2panda/test/parser/ets/selective_export/import_2-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/import_2-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/selective_export/import_3-expected.txt b/ets2panda/test/parser/ets/selective_export/import_3-expected.txt
index 7ae1968d4bc284ef807151c447a821481a457985..a80d57bf198cde86b4ce27157c7f56233249e391 100644
--- a/ets2panda/test/parser/ets/selective_export/import_3-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/import_3-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/selective_export/import_4-expected.txt b/ets2panda/test/parser/ets/selective_export/import_4-expected.txt
index d99dc8511248a88d6208bfd190d3bf5c07131b83..c5a9716ae2281863df6d11c0f5c3e56064db8d7a 100644
--- a/ets2panda/test/parser/ets/selective_export/import_4-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/import_4-expected.txt
@@ -89,112 +89,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "import_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "import_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "import_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "import_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "import_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/selective_export/selective_export_1-expected.txt b/ets2panda/test/parser/ets/selective_export/selective_export_1-expected.txt
index 8518599df64ae213461be56dfba2163bd59b4c80..41df6ffa05df8e428d8f8edc97daae5739fb948b 100644
--- a/ets2panda/test/parser/ets/selective_export/selective_export_1-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/selective_export_1-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/selective_export/selective_export_2-expected.txt b/ets2panda/test/parser/ets/selective_export/selective_export_2-expected.txt
index 398e6f4512b9a3984899cd238001bca6b776f7b2..2bd19edcbf7f3238e3bd158ce8ce91fc749d5005 100644
--- a/ets2panda/test/parser/ets/selective_export/selective_export_2-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/selective_export_2-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/selective_export/selective_export_3-expected.txt b/ets2panda/test/parser/ets/selective_export/selective_export_3-expected.txt
index 3a428974714526be08d5a28399bf0aa9e4b74675..0f5219fd7a9e329cb2edbaf09425dc916c9be843 100644
--- a/ets2panda/test/parser/ets/selective_export/selective_export_3-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/selective_export_3-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/selective_export/selective_export_4-expected.txt b/ets2panda/test/parser/ets/selective_export/selective_export_4-expected.txt
index f6f0c98bc5ea79a006df98613d6ff7cf632c6253..a6249512b61d5fd51c2f4e23d98a3fa5513ae35e 100644
--- a/ets2panda/test/parser/ets/selective_export/selective_export_4-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/selective_export_4-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "selective_export_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "selective_export_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "selective_export_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "selective_export_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/simple_types-expected.txt b/ets2panda/test/parser/ets/simple_types-expected.txt
index 2800be66145580436b2cd485acee5cf2685e3992..2b069f72ab2950443f3589a270eda6a6fdd6e341 100644
--- a/ets2panda/test/parser/ets/simple_types-expected.txt
+++ b/ets2panda/test/parser/ets/simple_types-expected.txt
@@ -130,759 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 127,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 15,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 18,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 18,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 18,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": -32768,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 16,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 22,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 22,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 2147483647,
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 14,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 24,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 24,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 24,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": -9223372036854775808,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 15,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 35,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 35,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 35,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "e",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BooleanLiteral",
-                          "value": true,
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 18,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 22,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 22,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 6,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CharLiteral",
-                          "value": "a",
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 15,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 19,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 19,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 19,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "k",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 26,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 26,
-                              "column": 6,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "MemberExpression",
-                            "object": {
-                              "type": "Identifier",
-                              "name": "Double",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 26,
-                                  "column": 16,
-                                  "program": "simple_types.ets"
-                                },
-                                "end": {
-                                  "line": 26,
-                                  "column": 22,
-                                  "program": "simple_types.ets"
-                                }
-                              }
-                            },
-                            "property": {
-                              "type": "Identifier",
-                              "name": "toFloat",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 26,
-                                  "column": 23,
-                                  "program": "simple_types.ets"
-                                },
-                                "end": {
-                                  "line": 26,
-                                  "column": 30,
-                                  "program": "simple_types.ets"
-                                }
-                              }
-                            },
-                            "computed": false,
-                            "optional": false,
-                            "loc": {
-                              "start": {
-                                "line": 26,
-                                "column": 16,
-                                "program": "simple_types.ets"
-                              },
-                              "end": {
-                                "line": 26,
-                                "column": 30,
-                                "program": "simple_types.ets"
-                              }
-                            }
-                          },
-                          "arguments": [
-                            {
-                              "type": "NumberLiteral",
-                              "value": 3.1415,
-                              "loc": {
-                                "start": {
-                                  "line": 26,
-                                  "column": 31,
-                                  "program": "simple_types.ets"
-                                },
-                                "end": {
-                                  "line": 26,
-                                  "column": 37,
-                                  "program": "simple_types.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "optional": false,
-                          "loc": {
-                            "start": {
-                              "line": 26,
-                              "column": 16,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 26,
-                              "column": 38,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 26,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 26,
-                            "column": 38,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 38,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "l",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 27,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 27,
-                              "column": 6,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 3.1415,
-                          "loc": {
-                            "start": {
-                              "line": 27,
-                              "column": 17,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 27,
-                              "column": 23,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 27,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 27,
-                            "column": 23,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 23,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c2",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 29,
-                              "column": 5,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 29,
-                              "column": 7,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 29,
-                              "column": 15,
-                              "program": "simple_types.ets"
-                            },
-                            "end": {
-                              "line": 29,
-                              "column": 16,
-                              "program": "simple_types.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 29,
-                            "column": 5,
-                            "program": "simple_types.ets"
-                          },
-                          "end": {
-                            "line": 29,
-                            "column": 16,
-                            "program": "simple_types.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 5,
-                          "program": "simple_types.ets"
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 16,
-                          "program": "simple_types.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "simple_types.ets"
-                    },
-                    "end": {
-                      "line": 29,
-                      "column": 16,
-                      "program": "simple_types.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "simple_types.ets"
-                  },
-                  "end": {
-                    "line": 29,
-                    "column": 16,
-                    "program": "simple_types.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "simple_types.ets"
-                },
-                "end": {
-                  "line": 29,
-                  "column": 16,
-                  "program": "simple_types.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "simple_types.ets"
-              },
-              "end": {
-                "line": 29,
-                "column": 16,
-                "program": "simple_types.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -933,7 +180,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 18,
+                "column": 15,
                 "program": "simple_types.ets"
               }
             }
@@ -988,7 +235,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 22,
+                "column": 16,
                 "program": "simple_types.ets"
               }
             }
@@ -1043,7 +290,7 @@
               },
               "end": {
                 "line": 18,
-                "column": 24,
+                "column": 14,
                 "program": "simple_types.ets"
               }
             }
@@ -1098,7 +345,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 35,
+                "column": 15,
                 "program": "simple_types.ets"
               }
             }
@@ -1153,7 +400,7 @@
               },
               "end": {
                 "line": 21,
-                "column": 22,
+                "column": 18,
                 "program": "simple_types.ets"
               }
             }
@@ -1208,7 +455,7 @@
               },
               "end": {
                 "line": 22,
-                "column": 19,
+                "column": 15,
                 "program": "simple_types.ets"
               }
             }
@@ -1318,7 +565,7 @@
               },
               "end": {
                 "line": 26,
-                "column": 38,
+                "column": 16,
                 "program": "simple_types.ets"
               }
             }
@@ -1373,7 +620,7 @@
               },
               "end": {
                 "line": 27,
-                "column": 23,
+                "column": 17,
                 "program": "simple_types.ets"
               }
             }
@@ -1428,7 +675,7 @@
               },
               "end": {
                 "line": 29,
-                "column": 16,
+                "column": 15,
                 "program": "simple_types.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/static_function_override_1-expected.txt b/ets2panda/test/parser/ets/static_function_override_1-expected.txt
index 967c5d9a6ab41cc8e0207133f38c0efdc6d7b718..d2252adf5759faf58040c46e310d158336cd3808 100644
--- a/ets2panda/test/parser/ets/static_function_override_1-expected.txt
+++ b/ets2panda/test/parser/ets/static_function_override_1-expected.txt
@@ -727,112 +727,6 @@
                 "program": "static_function_override_1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "static_function_override_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "static_function_override_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "static_function_override_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "static_function_override_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "static_function_override_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "static_function_override_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "static_function_override_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "static_function_override_1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/static_function_override_2-expected.txt b/ets2panda/test/parser/ets/static_function_override_2-expected.txt
index 754bc9aedad7bdb37e6c255258722bc5c21781b3..fcd8218843a516c7fe45c4721d97992fc418f83b 100644
--- a/ets2panda/test/parser/ets/static_function_override_2-expected.txt
+++ b/ets2panda/test/parser/ets/static_function_override_2-expected.txt
@@ -727,112 +727,6 @@
                 "program": "static_function_override_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "static_function_override_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "static_function_override_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "static_function_override_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "static_function_override_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "static_function_override_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "static_function_override_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "static_function_override_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "static_function_override_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/static_function_override_3-expected.txt b/ets2panda/test/parser/ets/static_function_override_3-expected.txt
index 7b7a04aceaa77f12209041bbf471f080cebf4fab..b8bffa2e5d81f8e2a0535c4419919a888b4f65fc 100644
--- a/ets2panda/test/parser/ets/static_function_override_3-expected.txt
+++ b/ets2panda/test/parser/ets/static_function_override_3-expected.txt
@@ -727,112 +727,6 @@
                 "program": "static_function_override_3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "static_function_override_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "static_function_override_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "static_function_override_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "static_function_override_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "static_function_override_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "static_function_override_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "static_function_override_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "static_function_override_3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/string-expected.txt b/ets2panda/test/parser/ets/string-expected.txt
index dfd562defe4806934e5348a8fbe1bb81ac6c6d1e..24d534fc93f38a1c394f76c8924303370947e17a 100644
--- a/ets2panda/test/parser/ets/string-expected.txt
+++ b/ets2panda/test/parser/ets/string-expected.txt
@@ -130,241 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "s",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "string.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "string.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "Hello",
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 17,
-                              "program": "string.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 24,
-                              "program": "string.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "string.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 24,
-                            "program": "string.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "string.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 24,
-                          "program": "string.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "w",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "string.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "string.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "World",
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 17,
-                              "program": "string.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 24,
-                              "program": "string.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "string.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 24,
-                            "program": "string.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "string.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 24,
-                          "program": "string.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "string.ets"
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 24,
-                      "program": "string.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "string.ets"
-                  },
-                  "end": {
-                    "line": 17,
-                    "column": 24,
-                    "program": "string.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "string.ets"
-                },
-                "end": {
-                  "line": 17,
-                  "column": 24,
-                  "program": "string.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "string.ets"
-              },
-              "end": {
-                "line": 17,
-                "column": 24,
-                "program": "string.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -447,7 +212,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 24,
+                "column": 17,
                 "program": "string.ets"
               }
             }
@@ -534,7 +299,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 24,
+                "column": 17,
                 "program": "string.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/string_template_1-expected.txt b/ets2panda/test/parser/ets/string_template_1-expected.txt
index 890187012bdc027ab2c76f4d8cb5275e0679332b..51cec724941aae75c2c411f21aa0d4e82782ffc7 100644
--- a/ets2panda/test/parser/ets/string_template_1-expected.txt
+++ b/ets2panda/test/parser/ets/string_template_1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "string_template_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "string_template_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "string_template_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "string_template_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "string_template_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "string_template_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "string_template_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "string_template_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/string_template_2-expected.txt b/ets2panda/test/parser/ets/string_template_2-expected.txt
index 81f1caa9342cbde93b96df21c1055b3110f579d5..2799c0bca61fe86d769276b65d1e79ecd1d3b041 100644
--- a/ets2panda/test/parser/ets/string_template_2-expected.txt
+++ b/ets2panda/test/parser/ets/string_template_2-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "string_template_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "string_template_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "string_template_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "string_template_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "string_template_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "string_template_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "string_template_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "string_template_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/string_template_3-expected.txt b/ets2panda/test/parser/ets/string_template_3-expected.txt
index cfb193b398da7a0e7384ced046cdb333a8a86add..48cf4039b8a8f08e0e0561ee75dd9de2b82db45b 100644
--- a/ets2panda/test/parser/ets/string_template_3-expected.txt
+++ b/ets2panda/test/parser/ets/string_template_3-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "string_template_3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "string_template_3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "string_template_3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "string_template_3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "string_template_3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "string_template_3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "string_template_3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "string_template_3.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/string_template_4-expected.txt b/ets2panda/test/parser/ets/string_template_4-expected.txt
index ed32e495cb84a07f2c05613991a0b53fd1e4037d..c335f33788338f81876bb94a038d00175419b367 100644
--- a/ets2panda/test/parser/ets/string_template_4-expected.txt
+++ b/ets2panda/test/parser/ets/string_template_4-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "string_template_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "string_template_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "string_template_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "string_template_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "string_template_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "string_template_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "string_template_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "string_template_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/switch-expected.txt b/ets2panda/test/parser/ets/switch-expected.txt
index a0f6801d625edea5a8614015236c0029d1787024..142fdd2f5b8547e09b6b863de058f01bdd2c7f4b 100644
--- a/ets2panda/test/parser/ets/switch-expected.txt
+++ b/ets2panda/test/parser/ets/switch-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switch.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switch.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/switch_alive_1-expected.txt b/ets2panda/test/parser/ets/switch_alive_1-expected.txt
index fc3f469a5e66fccdbc87ed522534d1fedba02072..0d2338c14ce4f85a5577b906509a5592df38211a 100644
--- a/ets2panda/test/parser/ets/switch_alive_1-expected.txt
+++ b/ets2panda/test/parser/ets/switch_alive_1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_alive_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_alive_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_alive_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_alive_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_alive_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_alive_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_alive_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_alive_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/switch_alive_4-expected.txt b/ets2panda/test/parser/ets/switch_alive_4-expected.txt
index 4974b4d79fb2143e0500ccd71bb248c066c7bf14..d153d3833ee678a1c532707c19be90b24bbfa5b1 100644
--- a/ets2panda/test/parser/ets/switch_alive_4-expected.txt
+++ b/ets2panda/test/parser/ets/switch_alive_4-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_alive_4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_alive_4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_alive_4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_alive_4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_alive_4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_alive_4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_alive_4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_alive_4.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/switch_enum_string_case-expected.txt b/ets2panda/test/parser/ets/switch_enum_string_case-expected.txt
index 4ece619664ba035af6abd8ea732e474294a5047e..9aa71e1f25e6418315ca10f511f612cf05105137 100644
--- a/ets2panda/test/parser/ets/switch_enum_string_case-expected.txt
+++ b/ets2panda/test/parser/ets/switch_enum_string_case-expected.txt
@@ -5154,112 +5154,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_enum_string_case.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_enum_string_case.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_enum_string_case.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_enum_string_case.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_enum_string_case.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_enum_string_case.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_enum_string_case.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_enum_string_case.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/switch_num_compare_char-expected.txt b/ets2panda/test/parser/ets/switch_num_compare_char-expected.txt
index 4e4109d1e856a1c3186b1ca6b575a39f84939d70..2ca938156c7558323cd15e0648a4b36afe2ff3e5 100644
--- a/ets2panda/test/parser/ets/switch_num_compare_char-expected.txt
+++ b/ets2panda/test/parser/ets/switch_num_compare_char-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_num_compare_char.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_num_compare_char.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_num_compare_char.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_num_compare_char.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_num_compare_char.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_num_compare_char.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_num_compare_char.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_num_compare_char.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/switch_readonly_member-expected.txt b/ets2panda/test/parser/ets/switch_readonly_member-expected.txt
index 4954f89cd12621e8bbd2dbe347dfd982896f0900..9fdc665342b9327f95b888e61ddb21c1858bf196 100644
--- a/ets2panda/test/parser/ets/switch_readonly_member-expected.txt
+++ b/ets2panda/test/parser/ets/switch_readonly_member-expected.txt
@@ -446,112 +446,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_readonly_member.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_readonly_member.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_readonly_member.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_readonly_member.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_readonly_member.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_readonly_member.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_readonly_member.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_readonly_member.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/switch_readonly_member_compare_char-expected.txt b/ets2panda/test/parser/ets/switch_readonly_member_compare_char-expected.txt
index 581970ee1398608e7eb67816db39d81861823adb..b9c30f37aea59cc7783ab99a7e77faa7aecb39d7 100644
--- a/ets2panda/test/parser/ets/switch_readonly_member_compare_char-expected.txt
+++ b/ets2panda/test/parser/ets/switch_readonly_member_compare_char-expected.txt
@@ -446,112 +446,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_readonly_member_compare_char.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_readonly_member_compare_char.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_readonly_member_compare_char.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_readonly_member_compare_char.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_readonly_member_compare_char.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_readonly_member_compare_char.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_readonly_member_compare_char.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_readonly_member_compare_char.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/switch_readonly_member_compare_char_2-expected.txt b/ets2panda/test/parser/ets/switch_readonly_member_compare_char_2-expected.txt
index a8d6babbd992b5afa3e9a364953eb092ff1ae74a..9c8c20d94383a36c33c539686fe4313d9dbac318 100644
--- a/ets2panda/test/parser/ets/switch_readonly_member_compare_char_2-expected.txt
+++ b/ets2panda/test/parser/ets/switch_readonly_member_compare_char_2-expected.txt
@@ -446,112 +446,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_readonly_member_compare_char_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "switch_readonly_member_compare_char_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_readonly_member_compare_char_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "switch_readonly_member_compare_char_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_readonly_member_compare_char_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "switch_readonly_member_compare_char_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_readonly_member_compare_char_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "switch_readonly_member_compare_char_2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/ternary-expected.txt b/ets2panda/test/parser/ets/ternary-expected.txt
index 1a8737e1cd9bf7db7dece7edc6ba9466009cb241..7cbd07d65c1c8703950aacbcbd8e09e9c6a14c88 100644
--- a/ets2panda/test/parser/ets/ternary-expected.txt
+++ b/ets2panda/test/parser/ets/ternary-expected.txt
@@ -130,388 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "ternary.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "ternary.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 0,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 9,
-                              "program": "ternary.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 10,
-                              "program": "ternary.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "ternary.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 10,
-                            "program": "ternary.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "ternary.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 10,
-                          "program": "ternary.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "ternary.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "ternary.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "ternary.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 10,
-                              "program": "ternary.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "ternary.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 10,
-                            "program": "ternary.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "ternary.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 10,
-                          "program": "ternary.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "ternary.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "ternary.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ConditionalExpression",
-                          "test": {
-                            "type": "BinaryExpression",
-                            "operator": ">",
-                            "left": {
-                              "type": "Identifier",
-                              "name": "a",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 9,
-                                  "program": "ternary.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 10,
-                                  "program": "ternary.ets"
-                                }
-                              }
-                            },
-                            "right": {
-                              "type": "Identifier",
-                              "name": "b",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 13,
-                                  "program": "ternary.ets"
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 14,
-                                  "program": "ternary.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 9,
-                                "program": "ternary.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 14,
-                                "program": "ternary.ets"
-                              }
-                            }
-                          },
-                          "consequent": {
-                            "type": "Identifier",
-                            "name": "a",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 17,
-                                "program": "ternary.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 18,
-                                "program": "ternary.ets"
-                              }
-                            }
-                          },
-                          "alternate": {
-                            "type": "Identifier",
-                            "name": "b",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 21,
-                                "program": "ternary.ets"
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 22,
-                                "program": "ternary.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "ternary.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 22,
-                              "program": "ternary.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "ternary.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 22,
-                            "program": "ternary.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "ternary.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22,
-                          "program": "ternary.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "ternary.ets"
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 22,
-                      "program": "ternary.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "ternary.ets"
-                  },
-                  "end": {
-                    "line": 19,
-                    "column": 22,
-                    "program": "ternary.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "ternary.ets"
-                },
-                "end": {
-                  "line": 19,
-                  "column": 22,
-                  "program": "ternary.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "ternary.ets"
-              },
-              "end": {
-                "line": 19,
-                "column": 22,
-                "program": "ternary.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt
index 34bff5b23acc54580976fa8385b2ae6ac88e3a2b..84e1ad7f59c1d0d80d4cadd484161f2656a8bd89 100644
--- a/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt
+++ b/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt
@@ -818,112 +818,6 @@
                 "program": "test-type-alias-call1.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call1.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt
index bf205abf90c1698073e7ce6724ba149eb1e4a27f..847774dc7d79cf48a5555839bd69b631a27d829d 100644
--- a/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt
+++ b/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt
@@ -976,112 +976,6 @@
                 "program": "test-type-alias-call2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt
index 10550e054d48c544ee26b1dc7032e63f0304fb25..220cb72fc024389fe60f1192d2017dc0e5dee469 100644
--- a/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt
+++ b/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt
@@ -820,112 +820,6 @@
                 "program": "test-type-alias-call3.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call3.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call3.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call3.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call3.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call3.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call3.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call3.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call3.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt
index 8e72ce005e12cce0435b408cd7f1fa2ae030b67b..02ee0de790878ee023dc0c97850953a79f4fc307 100644
--- a/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt
+++ b/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt
@@ -820,112 +820,6 @@
                 "program": "test-type-alias-call4.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call4.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call4.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call4.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call4.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call4.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call4.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call4.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call4.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt
index 4d0f981c507f1c6268a5fe65702396da413a62c1..e89ee05e2ba773cda4470eaba5ee68b35a5f590c 100644
--- a/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt
+++ b/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt
@@ -1040,112 +1040,6 @@
                 "program": "test-type-alias-call5.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call5.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call5.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call5.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call5.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call5.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call5.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call5.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call5.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt
index 33d7a05b8e9a5bde73ee29e7ad3671d2bccf4406..57034af4825fe59721b608da7750e46da1e60409 100644
--- a/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt
+++ b/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt
@@ -1119,112 +1119,6 @@
                 "program": "test-type-alias-call6.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call6.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call6.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call6.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call6.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call6.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test-type-alias-call7-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call7-expected.txt
index a7ec943031d09fee613bd88a9664eab3b38603d5..58f97b68f714ae7bad8c4cd9b369706bc7b83537 100644
--- a/ets2panda/test/parser/ets/test-type-alias-call7-expected.txt
+++ b/ets2panda/test/parser/ets/test-type-alias-call7-expected.txt
@@ -240,112 +240,6 @@
                 "program": "test-type-alias-call7.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call7.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt
index 3dcc11e1f76c84cb6d99ad935c28311562629934..f1f2cf250d41c7d758fbc38ee88630652ae7e204 100644
--- a/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt
+++ b/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt
@@ -789,112 +789,6 @@
                 "program": "test-type-alias-call8.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test-type-alias-call8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test-type-alias-call8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test-type-alias-call8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test-type-alias-call8.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test_interface-expected.txt b/ets2panda/test/parser/ets/test_interface-expected.txt
index dafe573497e363bf734268abc8af7a726b1973af..1da2e14dc565b390725c3fbde573a1330679ed7e 100644
--- a/ets2panda/test/parser/ets/test_interface-expected.txt
+++ b/ets2panda/test/parser/ets/test_interface-expected.txt
@@ -1111,112 +1111,6 @@
                 "program": "test_interface.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_interface.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_interface.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_interface.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_interface.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_interface.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_interface.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test_interface.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test_interface.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/test_jsvalue-expected.txt b/ets2panda/test/parser/ets/test_jsvalue-expected.txt
index 11a038c8238f7c53182f5153f68c88f870dcbbaa..2dfb1cbf64bac235f8ac760b063ffbfd67c475f7 100644
--- a/ets2panda/test/parser/ets/test_jsvalue-expected.txt
+++ b/ets2panda/test/parser/ets/test_jsvalue-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_jsvalue.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_jsvalue.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_jsvalue.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_jsvalue.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_jsvalue.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_jsvalue.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test_jsvalue.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test_jsvalue.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/test_type_alias6-expected.txt b/ets2panda/test/parser/ets/test_type_alias6-expected.txt
index 315692355d0d83cb19fe72c66c8a307d46876251..1acbf3a2d89a40539500070c8b2b5255119043fe 100644
--- a/ets2panda/test/parser/ets/test_type_alias6-expected.txt
+++ b/ets2panda/test/parser/ets/test_type_alias6-expected.txt
@@ -177,177 +177,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "x",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "test_type_alias6.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "test_type_alias6.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 15.2,
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "test_type_alias6.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 13,
-                              "program": "test_type_alias6.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "test_type_alias6.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 13,
-                            "program": "test_type_alias6.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "test_type_alias6.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 13,
-                          "program": "test_type_alias6.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 5,
-                      "program": "test_type_alias6.ets"
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 13,
-                      "program": "test_type_alias6.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 17,
-                    "column": 5,
-                    "program": "test_type_alias6.ets"
-                  },
-                  "end": {
-                    "line": 17,
-                    "column": 13,
-                    "program": "test_type_alias6.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 5,
-                  "program": "test_type_alias6.ets"
-                },
-                "end": {
-                  "line": 17,
-                  "column": 13,
-                  "program": "test_type_alias6.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 5,
-                "program": "test_type_alias6.ets"
-              },
-              "end": {
-                "line": 17,
-                "column": 13,
-                "program": "test_type_alias6.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/test_type_alias7-expected.txt b/ets2panda/test/parser/ets/test_type_alias7-expected.txt
index c3e0eb220efe3b2c349dd902a5bd1f3761b1c036..2fa78f055de6e2185ac83bde6ee173d8ffedc062 100644
--- a/ets2panda/test/parser/ets/test_type_alias7-expected.txt
+++ b/ets2panda/test/parser/ets/test_type_alias7-expected.txt
@@ -177,112 +177,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_type_alias7.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_type_alias7.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_type_alias7.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_type_alias7.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_type_alias7.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_type_alias7.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test_type_alias7.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test_type_alias7.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/test_type_alias8-expected.txt b/ets2panda/test/parser/ets/test_type_alias8-expected.txt
index d9f05d631b9f0977f825fd6519fdbf011dddbc60..f7ef430d22d6f1e55177b5445e1d535282dcaef6 100644
--- a/ets2panda/test/parser/ets/test_type_alias8-expected.txt
+++ b/ets2panda/test/parser/ets/test_type_alias8-expected.txt
@@ -103,112 +103,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_type_alias8.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "test_type_alias8.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_type_alias8.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "test_type_alias8.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_type_alias8.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "test_type_alias8.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "test_type_alias8.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "test_type_alias8.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/test_type_alias9-expected.txt b/ets2panda/test/parser/ets/test_type_alias9-expected.txt
index f400a943746e18a1e6e86b57fd9ce103354b5fb2..877111d7f1db628ca5e3d1348e91dba5463533e1 100644
--- a/ets2panda/test/parser/ets/test_type_alias9-expected.txt
+++ b/ets2panda/test/parser/ets/test_type_alias9-expected.txt
@@ -352,372 +352,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "num",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "test_type_alias9.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 8,
-                              "program": "test_type_alias9.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 32,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 14,
-                              "program": "test_type_alias9.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 16,
-                              "program": "test_type_alias9.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "test_type_alias9.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 16,
-                            "program": "test_type_alias9.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "test_type_alias9.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 16,
-                          "program": "test_type_alias9.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "m",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "test_type_alias9.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "test_type_alias9.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ArrayExpression",
-                          "elements": [
-                            {
-                              "type": "ArrayExpression",
-                              "elements": [
-                                {
-                                  "type": "NumberLiteral",
-                                  "value": 1.1,
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 19,
-                                      "program": "test_type_alias9.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 22,
-                                      "program": "test_type_alias9.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "NumberLiteral",
-                                  "value": 1.1,
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 24,
-                                      "program": "test_type_alias9.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 27,
-                                      "program": "test_type_alias9.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "NumberLiteral",
-                                  "value": 1.1,
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 29,
-                                      "program": "test_type_alias9.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 32,
-                                      "program": "test_type_alias9.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 18,
-                                  "program": "test_type_alias9.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 33,
-                                  "program": "test_type_alias9.ets"
-                                }
-                              }
-                            },
-                            {
-                              "type": "ArrayExpression",
-                              "elements": [
-                                {
-                                  "type": "NumberLiteral",
-                                  "value": 2.1,
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 36,
-                                      "program": "test_type_alias9.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 39,
-                                      "program": "test_type_alias9.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "NumberLiteral",
-                                  "value": 2.1,
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 41,
-                                      "program": "test_type_alias9.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 44,
-                                      "program": "test_type_alias9.ets"
-                                    }
-                                  }
-                                },
-                                {
-                                  "type": "NumberLiteral",
-                                  "value": 2.1,
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 46,
-                                      "program": "test_type_alias9.ets"
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 49,
-                                      "program": "test_type_alias9.ets"
-                                    }
-                                  }
-                                }
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 35,
-                                  "program": "test_type_alias9.ets"
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 50,
-                                  "program": "test_type_alias9.ets"
-                                }
-                              }
-                            }
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 17,
-                              "program": "test_type_alias9.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 51,
-                              "program": "test_type_alias9.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "test_type_alias9.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 51,
-                            "program": "test_type_alias9.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "test_type_alias9.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 51,
-                          "program": "test_type_alias9.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 5,
-                      "program": "test_type_alias9.ets"
-                    },
-                    "end": {
-                      "line": 20,
-                      "column": 51,
-                      "program": "test_type_alias9.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 19,
-                    "column": 5,
-                    "program": "test_type_alias9.ets"
-                  },
-                  "end": {
-                    "line": 20,
-                    "column": 51,
-                    "program": "test_type_alias9.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 19,
-                  "column": 5,
-                  "program": "test_type_alias9.ets"
-                },
-                "end": {
-                  "line": 20,
-                  "column": 51,
-                  "program": "test_type_alias9.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 19,
-                "column": 5,
-                "program": "test_type_alias9.ets"
-              },
-              "end": {
-                "line": 20,
-                "column": 51,
-                "program": "test_type_alias9.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -800,7 +434,7 @@
               },
               "end": {
                 "line": 19,
-                "column": 16,
+                "column": 14,
                 "program": "test_type_alias9.ets"
               }
             }
@@ -887,7 +521,7 @@
               },
               "end": {
                 "line": 20,
-                "column": 51,
+                "column": 17,
                 "program": "test_type_alias9.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/this_callee-expected.txt b/ets2panda/test/parser/ets/this_callee-expected.txt
index 73f868f452f85dffc6f0c23f8b328382d84be4e9..4ce77742f1cfd9666713d7231eded65d3622f5e9 100644
--- a/ets2panda/test/parser/ets/this_callee-expected.txt
+++ b/ets2panda/test/parser/ets/this_callee-expected.txt
@@ -1381,112 +1381,6 @@
                 "program": "this_callee.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_callee.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_callee.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_callee.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_callee.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_callee.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_callee.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "this_callee.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "this_callee.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/this_cmp_object-expected.txt b/ets2panda/test/parser/ets/this_cmp_object-expected.txt
index a4284a90a5df3876b7dc19bb97989113eb0d4ec3..b3e62578ce1c956d87b0424bf348723f5bb8912a 100644
--- a/ets2panda/test/parser/ets/this_cmp_object-expected.txt
+++ b/ets2panda/test/parser/ets/this_cmp_object-expected.txt
@@ -645,112 +645,6 @@
                 "program": "this_cmp_object.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_cmp_object.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_cmp_object.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_cmp_object.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_cmp_object.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_cmp_object.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_cmp_object.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "this_cmp_object.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "this_cmp_object.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/this_equality-expected.txt b/ets2panda/test/parser/ets/this_equality-expected.txt
index db64c6fc351e39704f13e45bb2d0289379d6d993..0e10d6a82eb82a5d347962fb63ee85ed81ed97b0 100644
--- a/ets2panda/test/parser/ets/this_equality-expected.txt
+++ b/ets2panda/test/parser/ets/this_equality-expected.txt
@@ -547,112 +547,6 @@
                 "program": "this_equality.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_equality.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_equality.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_equality.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_equality.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_equality.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_equality.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "this_equality.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "this_equality.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/this_expression-expected.txt b/ets2panda/test/parser/ets/this_expression-expected.txt
index c2bb90c8181d5fc55ac992561e7dfe9774da1f8c..523c52e9a482d739e8902271b79c7235fa624be3 100644
--- a/ets2panda/test/parser/ets/this_expression-expected.txt
+++ b/ets2panda/test/parser/ets/this_expression-expected.txt
@@ -504,112 +504,6 @@
                 "program": "this_expression.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_expression.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_expression.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_expression.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_expression.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_expression.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_expression.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "this_expression.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "this_expression.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/this_type_class_method_return_valid-expected.txt b/ets2panda/test/parser/ets/this_type_class_method_return_valid-expected.txt
index 432afbf6b059067e52ec2dc758fcee2f01299d04..f4fd643246d38b39934e4602717ff998e31f0197 100644
--- a/ets2panda/test/parser/ets/this_type_class_method_return_valid-expected.txt
+++ b/ets2panda/test/parser/ets/this_type_class_method_return_valid-expected.txt
@@ -484,112 +484,6 @@
                 "program": "this_type_class_method_return_valid.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_type_class_method_return_valid.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "this_type_class_method_return_valid.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_type_class_method_return_valid.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "this_type_class_method_return_valid.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_type_class_method_return_valid.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "this_type_class_method_return_valid.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "this_type_class_method_return_valid.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "this_type_class_method_return_valid.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt
index 7ec271f2246af6ef88a4aebe4f8b6d02f180a366..8e945381f89622f0fca3cd2347b9bd6eee8c4dbc 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_define_lambda_in_body.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_define_lambda_in_body.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_define_lambda_in_body.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_define_lambda_in_body.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_define_lambda_in_body.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_define_lambda_in_body.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_define_lambda_in_body.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_define_lambda_in_body.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body_capture_variable-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body_capture_variable-expected.txt
index c8692d99a385d3ce8a5db352e4448ffa9cd71ff2..2110d32cf027ce3f7b687b064601f964399b9bdc 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body_capture_variable-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body_capture_variable-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt
index de78229a7f5c219ad86a16358a1cc26bfb1fdcaf..0673a3c778e4ec5c7176a3c70c38fd84dcbec0f4 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt
@@ -130,112 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_overload.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_overload.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_overload.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_overload.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_overload.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_overload.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_overload.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_overload.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt
index b5301d33980153b9c5098f93fc2f9ae6a89c63b8..55d1a48cb40dd6cda8a6eb442564f6fcb55d4e1f 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_overload_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_overload_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_overload_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_overload_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_overload_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_overload_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_overload_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_overload_1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt
index 752033be59a7b70fdcbb5b0f20c7a4d0282a3d75..3b418e8f0fc8fbfcd21eb87b99e5d15d9dc3bc80 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_transform_trailing_block.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_transform_trailing_block.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_transform_trailing_block.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_transform_trailing_block.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_transform_trailing_block.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_transform_trailing_block.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_transform_trailing_block.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_transform_trailing_block.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt
index 975d122ed436d35003e58f7674b08f40bbdffc18..2baeb87771b6f0dd5a2ec42895f66eb73d9aef36 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt
@@ -87,112 +87,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_type_alias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "trailing_lambda_type_alias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_type_alias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "trailing_lambda_type_alias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_type_alias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "trailing_lambda_type_alias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_type_alias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "trailing_lambda_type_alias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/tryFinallyBlockOnly-expected.txt b/ets2panda/test/parser/ets/tryFinallyBlockOnly-expected.txt
index f7fc6d09baff65c1ed860dda9ecd7c4113fdf03d..8c60c3ffe3f3287ffb30956f1c87f678013e93ea 100644
--- a/ets2panda/test/parser/ets/tryFinallyBlockOnly-expected.txt
+++ b/ets2panda/test/parser/ets/tryFinallyBlockOnly-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tryFinallyBlockOnly.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tryFinallyBlockOnly.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tryFinallyBlockOnly.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tryFinallyBlockOnly.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tryFinallyBlockOnly.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tryFinallyBlockOnly.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tryFinallyBlockOnly.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tryFinallyBlockOnly.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt
index 9d0c979f2ca2c9fc77b74ca34445d91a7784f570..aa1e9f83b697237884beccac2bdcc60dfe55718d 100644
--- a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt
+++ b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tupleAsTypeParam1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tupleAsTypeParam1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tupleAsTypeParam1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tupleAsTypeParam1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tupleAsTypeParam1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tupleAsTypeParam1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tupleAsTypeParam1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tupleAsTypeParam1.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt
index 742901d0ee0b373690822345fd42121a7cc6497e..d8758833efbfc0a58d0db437277afc8e1642460e 100644
--- a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt
+++ b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt
@@ -622,112 +622,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tupleAsTypeParam2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tupleAsTypeParam2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tupleAsTypeParam2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tupleAsTypeParam2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tupleAsTypeParam2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tupleAsTypeParam2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tupleAsTypeParam2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tupleAsTypeParam2.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt
index f8561bc609d2ad947542af4c06603b67e6782535..fe60098fcee693f9163b4fce70d6a4915a9de86c 100644
--- a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt
+++ b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tupleIndexWithNumbers.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "tupleIndexWithNumbers.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tupleIndexWithNumbers.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "tupleIndexWithNumbers.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tupleIndexWithNumbers.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "tupleIndexWithNumbers.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "tupleIndexWithNumbers.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "tupleIndexWithNumbers.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/type_alias_1-expected.txt b/ets2panda/test/parser/ets/type_alias_1-expected.txt
index 454187bc1b0b7b106308c4f9147c685b8fa6ce62..168b1f87d69d41471669cefd4cc3dd06ade9df5a 100644
--- a/ets2panda/test/parser/ets/type_alias_1-expected.txt
+++ b/ets2panda/test/parser/ets/type_alias_1-expected.txt
@@ -305,112 +305,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type_alias_1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type_alias_1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type_alias_1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type_alias_1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type_alias_1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type_alias_1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "type_alias_1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "type_alias_1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/type_alias_2-expected.txt b/ets2panda/test/parser/ets/type_alias_2-expected.txt
index 66038130dc13834d762beb83c751069f7bbf9d1f..425832e992bd0d459f4d5598b3d43e011c26316f 100644
--- a/ets2panda/test/parser/ets/type_alias_2-expected.txt
+++ b/ets2panda/test/parser/ets/type_alias_2-expected.txt
@@ -580,112 +580,6 @@
                 "program": "type_alias_2.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type_alias_2.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type_alias_2.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type_alias_2.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type_alias_2.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type_alias_2.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type_alias_2.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "type_alias_2.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "type_alias_2.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/type_cast-expected.txt b/ets2panda/test/parser/ets/type_cast-expected.txt
index 18fe8c37dad3165da26f1a5d72ed5049c582725e..846197f070d13942fa219f5bd5ca0c24823cd210 100644
--- a/ets2panda/test/parser/ets/type_cast-expected.txt
+++ b/ets2panda/test/parser/ets/type_cast-expected.txt
@@ -962,112 +962,6 @@
                 "program": "type_cast.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type_cast.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type_cast.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type_cast.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type_cast.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type_cast.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type_cast.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "type_cast.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "type_cast.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/type_variance1-expected.txt b/ets2panda/test/parser/ets/type_variance1-expected.txt
index 464a81ec90f921cfa0a75b3eeae6a636190bfb0b..191b519bfb378b7adc8f0949f282c0f03d63b560 100644
--- a/ets2panda/test/parser/ets/type_variance1-expected.txt
+++ b/ets2panda/test/parser/ets/type_variance1-expected.txt
@@ -2112,112 +2112,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type_variance1.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "type_variance1.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type_variance1.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "type_variance1.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type_variance1.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "type_variance1.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "type_variance1.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "type_variance1.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/unary_op-expected.txt b/ets2panda/test/parser/ets/unary_op-expected.txt
index bf769e37b616412672e3972c0b1540c224e35d57..b3da19dedf2fb22174437bf913821f53640d71a2 100644
--- a/ets2panda/test/parser/ets/unary_op-expected.txt
+++ b/ets2panda/test/parser/ets/unary_op-expected.txt
@@ -130,779 +130,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 1,
-                          "loc": {
-                            "start": {
-                              "line": 16,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 16,
-                              "column": 10,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 16,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 16,
-                            "column": 10,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 10,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "UpdateExpression",
-                          "operator": "++",
-                          "prefix": false,
-                          "argument": {
-                            "type": "Identifier",
-                            "name": "a",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 9,
-                                "program": "unary_op.ets"
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 10,
-                                "program": "unary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 12,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 12,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 12,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "UpdateExpression",
-                          "operator": "--",
-                          "prefix": false,
-                          "argument": {
-                            "type": "Identifier",
-                            "name": "a",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 9,
-                                "program": "unary_op.ets"
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 10,
-                                "program": "unary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 12,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 12,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 12,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "d",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "NumberLiteral",
-                          "value": 5,
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 11,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 11,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 11,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "e",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "UnaryExpression",
-                          "operator": "-",
-                          "prefix": true,
-                          "argument": {
-                            "type": "Identifier",
-                            "name": "a",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 10,
-                                "program": "unary_op.ets"
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 11,
-                                "program": "unary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 11,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 11,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 11,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "f",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "UnaryExpression",
-                          "operator": "~",
-                          "prefix": true,
-                          "argument": {
-                            "type": "Identifier",
-                            "name": "a",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 10,
-                                "program": "unary_op.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 11,
-                                "program": "unary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 11,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 11,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 11,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "g",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BooleanLiteral",
-                          "value": true,
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 13,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 13,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 13,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "h",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 23,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 23,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "UnaryExpression",
-                          "operator": "!",
-                          "prefix": true,
-                          "argument": {
-                            "type": "Identifier",
-                            "name": "g",
-                            "decorators": [],
-                            "loc": {
-                              "start": {
-                                "line": 23,
-                                "column": 10,
-                                "program": "unary_op.ets"
-                              },
-                              "end": {
-                                "line": 23,
-                                "column": 11,
-                                "program": "unary_op.ets"
-                              }
-                            }
-                          },
-                          "loc": {
-                            "start": {
-                              "line": 23,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 23,
-                              "column": 11,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 23,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 23,
-                            "column": 11,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 11,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "j",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 25,
-                              "column": 5,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 25,
-                              "column": 6,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "BooleanLiteral",
-                          "value": false,
-                          "loc": {
-                            "start": {
-                              "line": 25,
-                              "column": 9,
-                              "program": "unary_op.ets"
-                            },
-                            "end": {
-                              "line": 25,
-                              "column": 11,
-                              "program": "unary_op.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 25,
-                            "column": 5,
-                            "program": "unary_op.ets"
-                          },
-                          "end": {
-                            "line": 25,
-                            "column": 11,
-                            "program": "unary_op.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 5,
-                          "program": "unary_op.ets"
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 11,
-                          "program": "unary_op.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 5,
-                      "program": "unary_op.ets"
-                    },
-                    "end": {
-                      "line": 25,
-                      "column": 11,
-                      "program": "unary_op.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 16,
-                    "column": 5,
-                    "program": "unary_op.ets"
-                  },
-                  "end": {
-                    "line": 25,
-                    "column": 11,
-                    "program": "unary_op.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 5,
-                  "program": "unary_op.ets"
-                },
-                "end": {
-                  "line": 25,
-                  "column": 11,
-                  "program": "unary_op.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 5,
-                "program": "unary_op.ets"
-              },
-              "end": {
-                "line": 25,
-                "column": 11,
-                "program": "unary_op.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
diff --git a/ets2panda/test/parser/ets/unary_operations-expected.txt b/ets2panda/test/parser/ets/unary_operations-expected.txt
index a11ae01da3a3a1de1ce9d929154a4474ae1d4e9a..0dc3d9cb2751516e860d04dbb913dbe7a4624fa6 100644
--- a/ets2panda/test/parser/ets/unary_operations-expected.txt
+++ b/ets2panda/test/parser/ets/unary_operations-expected.txt
@@ -1394,112 +1394,6 @@
                 "program": "unary_operations.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "unary_operations.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "unary_operations.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "unary_operations.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "unary_operations.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "unary_operations.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "unary_operations.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "unary_operations.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "unary_operations.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt
index 40880a3dc8b2db64822f88f21faf27f7047a39b5..3809142362b3b43d67268642cff1aaea2065c335 100644
--- a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt
+++ b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "undefinedNullObjectTypeAnnotation.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "undefinedNullObjectTypeAnnotation.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "undefinedNullObjectTypeAnnotation.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "undefinedNullObjectTypeAnnotation.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "undefinedNullObjectTypeAnnotation.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "undefinedNullObjectTypeAnnotation.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "undefinedNullObjectTypeAnnotation.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "undefinedNullObjectTypeAnnotation.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt b/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt
index e4f2eb5dad48733d2010997d5538bd1def8ee4e6..f1bf95834a9dd3c9a84cc85aa0ac7819914bbd44 100644
--- a/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt
+++ b/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "undefinedNullTypeAlias.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "undefinedNullTypeAlias.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "undefinedNullTypeAlias.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "undefinedNullTypeAlias.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "undefinedNullTypeAlias.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "undefinedNullTypeAlias.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "undefinedNullTypeAlias.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "undefinedNullTypeAlias.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt b/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt
index c44d4ec5519aaf6a844c6a4c22c12f2b52f3fe3e..9bf464fbf71ea0a0c7581fc37168b8124a1770b1 100644
--- a/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt
+++ b/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt
@@ -789,112 +789,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_lowering_common_property.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "union_lowering_common_property.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_lowering_common_property.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "union_lowering_common_property.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_lowering_common_property.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "union_lowering_common_property.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "union_lowering_common_property.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "union_lowering_common_property.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/user_defined_22-expected.txt b/ets2panda/test/parser/ets/user_defined_22-expected.txt
index 75ff8d54310230b2a405fdc19ff82f983c2bd74e..d6092bea5f9893d31cffb5e69a920d22b0acce5a 100644
--- a/ets2panda/test/parser/ets/user_defined_22-expected.txt
+++ b/ets2panda/test/parser/ets/user_defined_22-expected.txt
@@ -467,354 +467,6 @@
               }
             }
           },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 5,
-                              "program": "user_defined_22.ets"
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 6,
-                              "program": "user_defined_22.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "A",
-                                "decorators": [],
-                                "loc": {
-                                  "start": {
-                                    "line": 20,
-                                    "column": 13,
-                                    "program": "user_defined_22.ets"
-                                  },
-                                  "end": {
-                                    "line": 20,
-                                    "column": 14,
-                                    "program": "user_defined_22.ets"
-                                  }
-                                }
-                              },
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 13,
-                                  "program": "user_defined_22.ets"
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 2,
-                                  "program": "user_defined_22.ets"
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 13,
-                                "program": "user_defined_22.ets"
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 2,
-                                "program": "user_defined_22.ets"
-                              }
-                            }
-                          },
-                          "arguments": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 9,
-                              "program": "user_defined_22.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 2,
-                              "program": "user_defined_22.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 5,
-                            "program": "user_defined_22.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 2,
-                            "program": "user_defined_22.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 5,
-                          "program": "user_defined_22.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 2,
-                          "program": "user_defined_22.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "MemberExpression",
-                        "object": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 1,
-                              "program": "user_defined_22.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 2,
-                              "program": "user_defined_22.ets"
-                            }
-                          }
-                        },
-                        "property": {
-                          "type": "Identifier",
-                          "name": "type",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 3,
-                              "program": "user_defined_22.ets"
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 7,
-                              "program": "user_defined_22.ets"
-                            }
-                          }
-                        },
-                        "computed": false,
-                        "optional": false,
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 1,
-                            "program": "user_defined_22.ets"
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 7,
-                            "program": "user_defined_22.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 1,
-                          "program": "user_defined_22.ets"
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 7,
-                          "program": "user_defined_22.ets"
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "b",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 5,
-                              "program": "user_defined_22.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 6,
-                              "program": "user_defined_22.ets"
-                            }
-                          }
-                        },
-                        "right": {
-                          "type": "StringLiteral",
-                          "value": "",
-                          "loc": {
-                            "start": {
-                              "line": 22,
-                              "column": 12,
-                              "program": "user_defined_22.ets"
-                            },
-                            "end": {
-                              "line": 22,
-                              "column": 14,
-                              "program": "user_defined_22.ets"
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 22,
-                            "column": 5,
-                            "program": "user_defined_22.ets"
-                          },
-                          "end": {
-                            "line": 22,
-                            "column": 14,
-                            "program": "user_defined_22.ets"
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 5,
-                          "program": "user_defined_22.ets"
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 14,
-                          "program": "user_defined_22.ets"
-                        }
-                      }
-                    }
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 20,
-                      "column": 5,
-                      "program": "user_defined_22.ets"
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 14,
-                      "program": "user_defined_22.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 20,
-                    "column": 5,
-                    "program": "user_defined_22.ets"
-                  },
-                  "end": {
-                    "line": 22,
-                    "column": 14,
-                    "program": "user_defined_22.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 20,
-                  "column": 5,
-                  "program": "user_defined_22.ets"
-                },
-                "end": {
-                  "line": 22,
-                  "column": 14,
-                  "program": "user_defined_22.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 20,
-                "column": 5,
-                "program": "user_defined_22.ets"
-              },
-              "end": {
-                "line": 22,
-                "column": 14,
-                "program": "user_defined_22.ets"
-              }
-            }
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -1000,7 +652,7 @@
               },
               "end": {
                 "line": 22,
-                "column": 14,
+                "column": 12,
                 "program": "user_defined_22.ets"
               }
             }
diff --git a/ets2panda/test/parser/ets/var_declare-expected.txt b/ets2panda/test/parser/ets/var_declare-expected.txt
index e78e94dbf3cb286c47a7766069214f90eb931fa2..e7bc24f8be0d24cdf5a5c4eca8b0cf78b0882729 100644
--- a/ets2panda/test/parser/ets/var_declare-expected.txt
+++ b/ets2panda/test/parser/ets/var_declare-expected.txt
@@ -908,112 +908,6 @@
                 "program": "var_declare.ets"
               }
             }
-          },
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "var_declare.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "var_declare.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "var_declare.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "var_declare.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "var_declare.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "var_declare.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "var_declare.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "var_declare.ets"
-              }
-            }
           }
         ],
         "loc": {
diff --git a/ets2panda/test/parser/ets/void-expected.txt b/ets2panda/test/parser/ets/void-expected.txt
index 0547d89c7489e61f7593531fc607524c29dc3356..314461a3d666141ae582580befba95cabe8fc444 100644
--- a/ets2panda/test/parser/ets/void-expected.txt
+++ b/ets2panda/test/parser/ets/void-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "void.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "void.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "void.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "void.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "void.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "void.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "void.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "void.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/parser/ets/voidAsTypeArg-expected.txt b/ets2panda/test/parser/ets/voidAsTypeArg-expected.txt
index 2da78e8ed51b8ed31c665fc2141d7f0c2a9cb3bc..9ddb8ceb99dc86d6df5c9031fe989828081cb82c 100644
--- a/ets2panda/test/parser/ets/voidAsTypeArg-expected.txt
+++ b/ets2panda/test/parser/ets/voidAsTypeArg-expected.txt
@@ -24,112 +24,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": null
-                }
-              }
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": null
-                    }
-                  }
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "voidAsTypeArg.ets"
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 1,
-                      "program": "voidAsTypeArg.ets"
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "voidAsTypeArg.ets"
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 1,
-                    "program": "voidAsTypeArg.ets"
-                  }
-                }
-              },
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "voidAsTypeArg.ets"
-                },
-                "end": {
-                  "line": 1,
-                  "column": 1,
-                  "program": "voidAsTypeArg.ets"
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": [],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 1,
-                "program": "voidAsTypeArg.ets"
-              },
-              "end": {
-                "line": 1,
-                "column": 1,
-                "program": "voidAsTypeArg.ets"
-              }
-            }
-          },
           {
             "type": "MethodDefinition",
             "key": {
diff --git a/ets2panda/test/runtime/ets/lambda_inner_call_static_method.ets b/ets2panda/test/runtime/ets/lambda_inner_call_static_method.ets
index ba42c886765ebce88fcca33f2398b5bc5c7f973a..e399ebe38dfa0d7fcaf4d1ff41b54f23b4b2a8c1 100644
--- a/ets2panda/test/runtime/ets/lambda_inner_call_static_method.ets
+++ b/ets2panda/test/runtime/ets/lambda_inner_call_static_method.ets
@@ -15,7 +15,7 @@
 
 function foo(callback: () => string) { }
 
-const bar = (): string => {
+const bar: () => string = (): string => {
     return A.fob();
 }
 
diff --git a/ets2panda/test/runtime/ets/top_level_02.ets b/ets2panda/test/runtime/ets/top_level_02.ets
index 2e8c92e5d73cb64ab52808d971b8f598cfe53d47..bbdf6f16085fac745a3fe7c28b521f4cd420ce79 100644
--- a/ets2panda/test/runtime/ets/top_level_02.ets
+++ b/ets2panda/test/runtime/ets/top_level_02.ets
@@ -54,13 +54,6 @@ function main(): void {
   arktest.assertEQ(q, 30)
   arktest.assertEQ(ETSGLOBAL.q, 1)
 
-  arktest.assertEQ(s, "abccba")
   s = "def";
   arktest.assertEQ(s, "def")
-
-  _$init$_();
-   
-  arktest.assertEQ(s, "abccba")
-  arktest.assertEQ(q, 30)
-  arktest.assertEQ(ETSGLOBAL.q, 8)
 }
diff --git a/ets2panda/test/unit/lsp/change_tracker_test.cpp b/ets2panda/test/unit/lsp/change_tracker_test.cpp
index 1792bec428053ce66f6621fcc53b0e3291e29280..11623fefad767e64e32a84b3cbee9501a3994555 100644
--- a/ets2panda/test/unit/lsp/change_tracker_test.cpp
+++ b/ets2panda/test/unit/lsp/change_tracker_test.cpp
@@ -245,7 +245,8 @@ let obj = {
     auto *ast = context->parserProgram->Ast();
     ASSERT_NE(ast, nullptr);
     auto *propertyNode = ast->FindChild([](const ark::es2panda::ir::AstNode *node) {
-        return node->IsProperty() && node->AsProperty()->Key()->AsIdentifier()->Name() == "foo";
+        return node->IsProperty() && node->AsProperty()->Key()->AsIdentifier()->Name() == "foo" &&
+               node->Parent()->IsObjectExpression() && node->Parent()->Parent()->IsAssignmentExpression();
     });
     ASSERT_NE(propertyNode, nullptr);
     ark::es2panda::ir::AstNode *newProperty = propertyNode->Clone(context->allocator, nullptr);
@@ -258,7 +259,7 @@ let obj = {
     const auto &changes = tracker.GetChangeList();
     const size_t c1 = 1;
     const auto bar = "bar";
-    const auto newLine = ",\n";
+    const auto newLine = "";
     ASSERT_EQ(changes.size(), c1);
     const auto &change = changes[0];
     const auto *replace = std::get_if<ark::es2panda::lsp::ReplaceWithSingleNode>(&change);
diff --git a/ets2panda/test/unit/lsp/code_fix_registration_test.cpp b/ets2panda/test/unit/lsp/code_fix_registration_test.cpp
index acb35182b5b345de126f519ec878e35037862da4..6c064eaa588825af4fb2bb5e06dbaf075caa96e9 100644
--- a/ets2panda/test/unit/lsp/code_fix_registration_test.cpp
+++ b/ets2panda/test/unit/lsp/code_fix_registration_test.cpp
@@ -25,6 +25,6 @@ TEST(RefactorProviderRegistrationTest, RegistersConvertFunctionRefactor)
     const auto &fixIdToRegistration = provider.GetFixIdToRegistration();
     EXPECT_FALSE(errors.empty());
     EXPECT_FALSE(fixIdToRegistration.empty());
-    EXPECT_EQ(errors.size(), fixIdToRegistration.size());
+    EXPECT_TRUE(errors.size() >= fixIdToRegistration.size());
 }
 }  // namespace
diff --git a/ets2panda/test/unit/lsp/fix_convert_const_to_let_test.cpp b/ets2panda/test/unit/lsp/fix_convert_const_to_let_test.cpp
index f3653aca19fdfc72b558e8cbae465d67328315b6..2e67fa3991881eeadcf1fbf9217c567ff95aedcb 100644
--- a/ets2panda/test/unit/lsp/fix_convert_const_to_let_test.cpp
+++ b/ets2panda/test/unit/lsp/fix_convert_const_to_let_test.cpp
@@ -91,7 +91,8 @@ a = 1;
     const size_t length = 1;
     const size_t expectedTextChangeStart = 1;
     const size_t expectedTextChangeLength = 5;
-    const int expectedFixResultSize = 1;
+    const int expectedFixResultSize = 2;
+    const int expectedCombinedFixResultSize = 1;
     const int expectedCombinedTextChangesSize = 1;
 
     std::vector<int> errorCodes(ERROR_CODES.begin(), ERROR_CODES.end());
@@ -104,7 +105,7 @@ a = 1;
 
     CombinedCodeActionsInfo combinedFixResult =
         ark::es2panda::lsp::GetCombinedCodeFixImpl(context, EXPECTED_FIX_NAME.data(), emptyOptions);
-    ASSERT_EQ(combinedFixResult.changes_.size(), expectedFixResultSize);
+    ASSERT_EQ(combinedFixResult.changes_.size(), expectedCombinedFixResultSize);
     ASSERT_EQ(combinedFixResult.changes_[0].textChanges.size(), expectedCombinedTextChangesSize);
     ASSERT_EQ(combinedFixResult.changes_[0].fileName, filePaths[0]);
     ASSERT_EQ(combinedFixResult.changes_[0].textChanges[0].span.start, expectedTextChangeStart);
@@ -135,7 +136,8 @@ b = 2;
     const size_t expectedTextChangeLength1 = 5;
     const size_t expectedTextChangeStart2 = 14;
     const size_t expectedTextChangeLength2 = 5;
-    const int expectedFixResultSize = 1;
+    const int expectedFixResultSize = 2;
+    const int expectedCombinedFixResultSize = 1;
     const int expectedCombinedTextChangesSize = 2;
 
     std::vector<int> errorCodes(ERROR_CODES.begin(), ERROR_CODES.end());
@@ -152,7 +154,7 @@ b = 2;
 
     CombinedCodeActionsInfo combinedFixResult =
         ark::es2panda::lsp::GetCombinedCodeFixImpl(context, EXPECTED_FIX_NAME.data(), emptyOptions);
-    ASSERT_EQ(combinedFixResult.changes_.size(), expectedFixResultSize);
+    ASSERT_EQ(combinedFixResult.changes_.size(), expectedCombinedFixResultSize);
     ASSERT_EQ(combinedFixResult.changes_[0].textChanges.size(), expectedCombinedTextChangesSize);
     ASSERT_EQ(combinedFixResult.changes_[0].fileName, filePaths[0]);
     ASSERT_EQ(combinedFixResult.changes_[0].textChanges[0].span.start, expectedTextChangeStart1);
@@ -181,7 +183,8 @@ a = 2;
     const size_t length = 1;
     const size_t expectedTextChangeStart = 16;
     const size_t expectedTextChangeLength = 5;
-    const int expectedFixResultSize = 1;
+    const int expectedFixResultSize = 2;
+    const int expectedCombinedFixResultSize = 1;
     const int expectedCombinedTextChangesSize = 1;
 
     std::vector<int> errorCodes(ERROR_CODES.begin(), ERROR_CODES.end());
@@ -193,7 +196,7 @@ a = 2;
 
     CombinedCodeActionsInfo combinedFixResult =
         ark::es2panda::lsp::GetCombinedCodeFixImpl(context, EXPECTED_FIX_NAME.data(), emptyOptions);
-    ASSERT_EQ(combinedFixResult.changes_.size(), 1);
+    ASSERT_EQ(combinedFixResult.changes_.size(), expectedCombinedFixResultSize);
     ASSERT_EQ(combinedFixResult.changes_[0].textChanges.size(), expectedCombinedTextChangesSize);
     ASSERT_EQ(combinedFixResult.changes_[0].fileName, filePaths[0]);
     ASSERT_EQ(combinedFixResult.changes_[0].textChanges[0].span.start, expectedTextChangeStart);
diff --git a/ets2panda/test/unit/lsp/get_current_token_value_test.cpp b/ets2panda/test/unit/lsp/get_current_token_value_test.cpp
index 77160bf3e9e58240aa49abde5088c11312e3cee0..c3b623a302aded2aef1de94e1fccfcd9dea3c367 100644
--- a/ets2panda/test/unit/lsp/get_current_token_value_test.cpp
+++ b/ets2panda/test/unit/lsp/get_current_token_value_test.cpp
@@ -80,8 +80,9 @@ TEST_F(LSPAPITests, GetTokenPosOfNode1)
     ASSERT_EQ(ContextState(ctx), ES2PANDA_STATE_CHECKED);
 
     auto ast = GetAstFromContext<AstNode>(ctx);
-    auto targetNode =
-        ast->FindChild([](AstNode *node) { return node->IsIdentifier() && node->AsIdentifier()->Name() == "A"; });
+    auto targetNode = ast->FindChild([](AstNode *node) {
+        return node->IsIdentifier() && node->AsIdentifier()->Name() == "A" && node->Parent()->IsCallExpression();
+    });
 
     ASSERT_NE(targetNode, nullptr);
     auto result = ark::es2panda::lsp::GetTokenPosOfNode(targetNode);
diff --git a/ets2panda/test/unit/lsp/get_diagnostics.cpp b/ets2panda/test/unit/lsp/get_diagnostics.cpp
index 0f6185e48d792987a718781a26c1986e0df7ba34..63dc7fb43751e5654f39841a17d7dcf1a2f531e9 100644
--- a/ets2panda/test/unit/lsp/get_diagnostics.cpp
+++ b/ets2panda/test/unit/lsp/get_diagnostics.cpp
@@ -51,31 +51,32 @@ add("1", 2);)");
     initializer.DestroyContext(ctx);
     auto const expectedErrorCount = 3;
     ASSERT_EQ(result.diagnostic.size(), expectedErrorCount);
+    auto const firstIndex = 0;
     auto const thirdIndex = 2;
     auto const expectedFirstStartLine = 1;
     auto const expectedFirstStartCharacter = 19;
     auto const expectedFirstEndLine = 1;
     auto const expectedFirstEndCharacter = 26;
-    ASSERT_EQ(result.diagnostic[thirdIndex].range_.start.line_, expectedFirstStartLine);
-    ASSERT_EQ(result.diagnostic[thirdIndex].range_.start.character_, expectedFirstStartCharacter);
-    ASSERT_EQ(result.diagnostic[thirdIndex].range_.end.line_, expectedFirstEndLine);
-    ASSERT_EQ(result.diagnostic[thirdIndex].range_.end.character_, expectedFirstEndCharacter);
-    ASSERT_EQ(result.diagnostic[thirdIndex].severity_, DiagnosticSeverity::Error);
-    ASSERT_NE(std::get<int>(result.diagnostic[thirdIndex].code_), 0);
-    ASSERT_EQ(result.diagnostic[thirdIndex].message_, R"(Type '"hello"' cannot be assigned to type 'Double')");
-    ASSERT_EQ(result.diagnostic[thirdIndex].codeDescription_.href_, "test code description");
+    ASSERT_EQ(result.diagnostic[firstIndex].range_.start.line_, expectedFirstStartLine);
+    ASSERT_EQ(result.diagnostic[firstIndex].range_.start.character_, expectedFirstStartCharacter);
+    ASSERT_EQ(result.diagnostic[firstIndex].range_.end.line_, expectedFirstEndLine);
+    ASSERT_EQ(result.diagnostic[firstIndex].range_.end.character_, expectedFirstEndCharacter);
+    ASSERT_EQ(result.diagnostic[firstIndex].severity_, DiagnosticSeverity::Error);
+    ASSERT_NE(std::get<int>(result.diagnostic[firstIndex].code_), 0);
+    ASSERT_EQ(result.diagnostic[firstIndex].message_, R"(Type '"hello"' cannot be assigned to type 'Double')");
+    ASSERT_EQ(result.diagnostic[firstIndex].codeDescription_.href_, "test code description");
     auto const expectedSecondStartLine = 5;
     auto const expectedSecondStartCharacter = 5;
     auto const expectedSecondEndLine = 5;
     auto const expectedSecondEndCharacter = 8;
-    ASSERT_EQ(result.diagnostic[0].range_.start.line_, expectedSecondStartLine);
-    ASSERT_EQ(result.diagnostic[0].range_.start.character_, expectedSecondStartCharacter);
-    ASSERT_EQ(result.diagnostic[0].range_.end.line_, expectedSecondEndLine);
-    ASSERT_EQ(result.diagnostic[0].range_.end.character_, expectedSecondEndCharacter);
-    ASSERT_EQ(result.diagnostic[0].severity_, DiagnosticSeverity::Error);
-    ASSERT_NE(std::get<int>(result.diagnostic[0].code_), 0);
-    ASSERT_EQ(result.diagnostic[0].message_, R"(Type '"1"' is not compatible with type 'Double' at index 1)");
-    ASSERT_EQ(result.diagnostic[0].codeDescription_.href_, "test code description");
+    ASSERT_EQ(result.diagnostic[thirdIndex].range_.start.line_, expectedSecondStartLine);
+    ASSERT_EQ(result.diagnostic[thirdIndex].range_.start.character_, expectedSecondStartCharacter);
+    ASSERT_EQ(result.diagnostic[thirdIndex].range_.end.line_, expectedSecondEndLine);
+    ASSERT_EQ(result.diagnostic[thirdIndex].range_.end.character_, expectedSecondEndCharacter);
+    ASSERT_EQ(result.diagnostic[thirdIndex].severity_, DiagnosticSeverity::Error);
+    ASSERT_NE(std::get<int>(result.diagnostic[thirdIndex].code_), 0);
+    ASSERT_EQ(result.diagnostic[thirdIndex].message_, R"(Type '"1"' is not compatible with type 'Double' at index 1)");
+    ASSERT_EQ(result.diagnostic[thirdIndex].codeDescription_.href_, "test code description");
 }
 
 TEST_F(LspDiagnosticsTests, GetSyntacticDiagnostics1)
@@ -105,7 +106,7 @@ let res = add(n, n);)");
     LSPAPI const *lspApi = GetImpl();
     auto result = lspApi->getSyntacticDiagnostics(ctx);
     initializer.DestroyContext(ctx);
-    auto const expectedErrorCount = 13;
+    auto const expectedErrorCount = 10;
     ASSERT_EQ(result.diagnostic.size(), expectedErrorCount);
     auto const expectedFirstStartLine = 1;
     auto const expectedFirstStartCharacter = 9;
@@ -153,7 +154,7 @@ let res = add(n, n);)");
     LSPAPI const *lspApi = GetImpl();
     auto result = lspApi->getSyntacticDiagnostics(ctx);
     initializer.DestroyContext(ctx);
-    auto const forthIndex = 5;
+    auto const forthIndex = 4;
     auto const expectedForthStartLine = 1;
     auto const expectedForthStartCharacter = 22;
     auto const expectedForthEndLine = 1;
@@ -166,7 +167,7 @@ let res = add(n, n);)");
     ASSERT_NE(std::get<int>(result.diagnostic[forthIndex].code_), 0);
     ASSERT_EQ(result.diagnostic[forthIndex].message_, R"(Unexpected token ','.)");
     ASSERT_EQ(result.diagnostic[forthIndex].codeDescription_.href_, "test code description");
-    auto const fifthIndex = 8;
+    auto const fifthIndex = 6;
     auto const expectedFifththStartLine = 1;
     auto const expectedFifthStartCharacter = 27;
     auto const expectedFifthEndLine = 1;
@@ -193,7 +194,7 @@ let res = add(n, n);)");
     LSPAPI const *lspApi = GetImpl();
     auto result = lspApi->getSyntacticDiagnostics(ctx);
     initializer.DestroyContext(ctx);
-    auto const sixthIndex = 9;
+    auto const sixthIndex = 7;
     auto const expectedSixthStartLine = 1;
     auto const expectedSixthStartCharacter = 33;
     auto const expectedSixthEndLine = 1;
@@ -206,7 +207,7 @@ let res = add(n, n);)");
     ASSERT_NE(std::get<int>(result.diagnostic[sixthIndex].code_), 0);
     ASSERT_EQ(result.diagnostic[sixthIndex].message_, R"(Unexpected token ')'.)");
     ASSERT_EQ(result.diagnostic[sixthIndex].codeDescription_.href_, "test code description");
-    auto const sevenIndex = 12;
+    auto const sevenIndex = 9;
     auto const expectedSeventhStartLine = 2;
     auto const expectedSeventhStartCharacter = 5;
     auto const expectedSeventhEndLine = 2;
diff --git a/ets2panda/test/unit/lsp/get_implementation_location.cpp b/ets2panda/test/unit/lsp/get_implementation_location.cpp
index 277af8005a98d0ec8efabbf13d77efd38830b95d..2bb23694b7e4109a39f36826cd0f73da5231a72d 100644
--- a/ets2panda/test/unit/lsp/get_implementation_location.cpp
+++ b/ets2panda/test/unit/lsp/get_implementation_location.cpp
@@ -126,10 +126,10 @@ TEST_F(LspGILAPTests, GILAPIsAsTypeNode_Test)
     es2panda_Context *ctx = initializer.CreateContext("dummy-node.ets", ES2PANDA_STATE_CHECKED, code);
     ASSERT_EQ(ContextState(ctx), ES2PANDA_STATE_CHECKED);
 
-    size_t const offset = 159;
+    size_t const offset = 175;
     auto result = ark::es2panda::lsp::GetTouchingToken(ctx, offset, false);
     ASSERT_NE(result, nullptr);
-    ASSERT_TRUE(ark::es2panda::lsp::IsAsTypeNode(result));
+    ASSERT_TRUE(result->IsTSAsExpression());
 
     initializer.DestroyContext(ctx);
 }
diff --git a/ets2panda/test/unit/lsp/get_touching_token_test.cpp b/ets2panda/test/unit/lsp/get_touching_token_test.cpp
index a25b3de2a4c4f2cea3800fdd302dd298540dc8a7..99f87f6a9afa8c384c201d675cb94d55b619f565 100644
--- a/ets2panda/test/unit/lsp/get_touching_token_test.cpp
+++ b/ets2panda/test/unit/lsp/get_touching_token_test.cpp
@@ -50,8 +50,9 @@ TEST_F(LSPAPITests, GetTouchingToken2)
     size_t const offset = 51;
     auto result = ark::es2panda::lsp::GetTouchingToken(ctx, offset, false);
     auto ast = GetAstFromContext<ark::es2panda::ir::AstNode>(ctx);
-    auto expectedNode = ast->FindChild(
-        [](ark::es2panda::ir::AstNode *node) { return node->IsIdentifier() && node->AsIdentifier()->Name() == "A"; });
+    auto expectedNode = ast->FindChild([](ark::es2panda::ir::AstNode *node) {
+        return node->IsIdentifier() && node->AsIdentifier()->Name() == "A" && node->Parent()->IsCallExpression();
+    });
     ASSERT_EQ(result->DumpJSON(), expectedNode->DumpJSON());
     ASSERT_EQ(result->Start().index, expectedNode->Start().index);
     ASSERT_EQ(result->End().index, expectedNode->End().index);
@@ -68,7 +69,8 @@ TEST_F(LSPAPITests, GetTouchingToken3)
     auto result = ark::es2panda::lsp::GetTouchingToken(ctx, offset, true);
     auto ast = GetAstFromContext<ark::es2panda::ir::AstNode>(ctx);
     auto expectedNode = ast->FindChild([](ark::es2panda::ir::AstNode *node) {
-        return node->IsMethodDefinition() && node->AsMethodDefinition()->Key()->AsIdentifier()->Name().Is("_$init$_");
+        return node->IsClassStaticBlock() && node->Parent()->IsClassDefinition() &&
+               node->Parent()->AsClassDefinition()->IsGlobal();
     });
     ASSERT_EQ(result->DumpJSON(), expectedNode->DumpJSON());
     ASSERT_EQ(result->Start().index, expectedNode->Start().index);
diff --git a/ets2panda/test/unit/lsp/inlay_hints_test.cpp b/ets2panda/test/unit/lsp/inlay_hints_test.cpp
index dbea5dad245000061fbdbf5c131a358be0d9e847..d7221b6b80e4b3d130fcd83ee4490cb940c5a54d 100644
--- a/ets2panda/test/unit/lsp/inlay_hints_test.cpp
+++ b/ets2panda/test/unit/lsp/inlay_hints_test.cpp
@@ -221,7 +221,6 @@ TEST_F(LSPInlayHintsTests, VisitFunctionDeclarationLikeForReturnTypeTest1)
     const size_t i0 = 0;
     const size_t i1 = 1;
     const size_t i2 = 2;
-    const size_t i3 = 3;
     const auto filePaths = CreateTempFile(files, fileContent);
     ASSERT_EQ(filePaths.size(), i1);
     InlayHintList result;
@@ -238,10 +237,10 @@ TEST_F(LSPInlayHintsTests, VisitFunctionDeclarationLikeForReturnTypeTest1)
         }
         return false;
     });
+    ASSERT_EQ(result.hints[i1].text, doubleString);
+    ASSERT_EQ(result.hints[i1].number, addIndex);
     ASSERT_EQ(result.hints[i2].text, doubleString);
-    ASSERT_EQ(result.hints[i2].number, addIndex);
-    ASSERT_EQ(result.hints[i3].text, doubleString);
-    ASSERT_EQ(result.hints[i3].number, multiplyIndex);
+    ASSERT_EQ(result.hints[i2].number, multiplyIndex);
     initializer.DestroyContext(ctx);
 }
 
@@ -265,7 +264,6 @@ TEST_F(LSPInlayHintsTests, VisitFunctionDeclarationLikeForReturnTypeTest2)
     const size_t i0 = 0;
     const size_t i1 = 1;
     const size_t i2 = 2;
-    const size_t i3 = 3;
 
     const auto filePaths = CreateTempFile(files, fileContent);
     ASSERT_EQ(filePaths.size(), i1);
@@ -283,10 +281,10 @@ TEST_F(LSPInlayHintsTests, VisitFunctionDeclarationLikeForReturnTypeTest2)
         }
         return false;
     });
-    ASSERT_EQ(result.hints[i2].text, stdString);
-    ASSERT_EQ(result.hints[i2].number, greetIndex);
-    ASSERT_EQ(result.hints[i3].text, voidString);
-    ASSERT_EQ(result.hints[i3].number, sayHelloIndex);
+    ASSERT_EQ(result.hints[i1].text, stdString);
+    ASSERT_EQ(result.hints[i1].number, greetIndex);
+    ASSERT_EQ(result.hints[i2].text, voidString);
+    ASSERT_EQ(result.hints[i2].number, sayHelloIndex);
     initializer.DestroyContext(ctx);
 }
 
diff --git a/ets2panda/test/unit/lsp/suggestion_diagnostics_test.cpp b/ets2panda/test/unit/lsp/suggestion_diagnostics_test.cpp
index c97fcbf90b3dfd144ec62d79d496d2945594a228..4f445575c8a91811fbf334d527d59df2f663af76 100644
--- a/ets2panda/test/unit/lsp/suggestion_diagnostics_test.cpp
+++ b/ets2panda/test/unit/lsp/suggestion_diagnostics_test.cpp
@@ -67,7 +67,7 @@ TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments)
         }
         return false;
     });
-    EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(0)));
+    EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(1)));
     initializer.DestroyContext(ctx);
 }
 TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments2)
@@ -86,7 +86,7 @@ TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments2)
 
         return false;
     });
-    EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(0)));
+    EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(1)));
     initializer.DestroyContext(ctx);
 }
 TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments3)
@@ -104,7 +104,7 @@ TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments3)
         }
         return false;
     });
-    EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(0)));
+    EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(1)));
     initializer.DestroyContext(ctx);
 }
 TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments4)
@@ -122,7 +122,7 @@ TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments4)
         }
         return false;
     });
-    EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(0)));
+    EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(1)));
     initializer.DestroyContext(ctx);
 }
 
@@ -222,7 +222,7 @@ TEST_F(LspSuggestionTests, isPromiseHandler)
         }
         return false;
     });
-    EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(0)));
+    EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(1)));
     initializer.DestroyContext(ctx);
 }
 
@@ -241,7 +241,7 @@ TEST_F(LspSuggestionTests, isPromiseHandler2)
         }
         return false;
     });
-    EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(0)));
+    EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(1)));
     initializer.DestroyContext(ctx);
 }
 
@@ -260,7 +260,7 @@ TEST_F(LspSuggestionTests, isPromiseHandler3)
         }
         return false;
     });
-    EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(0)));
+    EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(1)));
     initializer.DestroyContext(ctx);
 }
 
@@ -279,7 +279,7 @@ TEST_F(LspSuggestionTests, isPromiseHandler4)
         }
         return false;
     });
-    EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(0)));
+    EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(1)));
     initializer.DestroyContext(ctx);
 }
 }  // namespace
\ No newline at end of file
diff --git a/ets2panda/test/unit/plugin/e2p_test_plugin_after_bind-expected.txt b/ets2panda/test/unit/plugin/e2p_test_plugin_after_bind-expected.txt
index 825ed8e0f04c42c7b37c7974fcdceb7dacf52358..35b859a72ab21fd306cfb62565196b42c01b4717 100644
--- a/ets2panda/test/unit/plugin/e2p_test_plugin_after_bind-expected.txt
+++ b/ets2panda/test/unit/plugin/e2p_test_plugin_after_bind-expected.txt
@@ -12,90 +12,6 @@
         "superClass": null,
         "implements": [],
         "body": [
-          {
-            "type": "MethodDefinition",
-            "key": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": []
-            },
-            "kind": "method",
-            "accessibility": "public",
-            "static": true,
-            "optional": false,
-            "computed": false,
-            "value": {
-              "type": "FunctionExpression",
-              "function": {
-                "type": "ScriptFunction",
-                "id": {
-                  "type": "Identifier",
-                  "name": "_$init$_",
-                  "decorators": []
-                },
-                "generator": false,
-                "async": false,
-                "expression": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "statements": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "a",
-                          "decorators": []
-                        },
-                        "right": {
-                          "type": "CallExpression",
-                          "callee": {
-                            "type": "Identifier",
-                            "name": "GoodGreeter",
-                            "decorators": []
-                          },
-                          "arguments": [],
-                          "optional": false
-                        }
-                      }
-                    },
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "AssignmentExpression",
-                        "operator": "=",
-                        "left": {
-                          "type": "Identifier",
-                          "name": "c",
-                          "decorators": []
-                        },
-                        "right": {
-                          "type": "ETSNewClassInstanceExpression",
-                          "typeReference": {
-                            "type": "ETSTypeReference",
-                            "part": {
-                              "type": "ETSTypeReferencePart",
-                              "name": {
-                                "type": "Identifier",
-                                "name": "GoodGreeter",
-                                "decorators": []
-                              }
-                            }
-                          },
-                          "arguments": []
-                        }
-                      }
-                    }
-                  ]
-                }
-              }
-            },
-            "overloads": [],
-            "decorators": []
-          },
           {
             "type": "ClassProperty",
             "key": {
@@ -606,90 +522,6 @@
     "superClass": null,
     "implements": [],
     "body": [
-      {
-        "type": "MethodDefinition",
-        "key": {
-          "type": "Identifier",
-          "name": "_$init$_",
-          "decorators": []
-        },
-        "kind": "method",
-        "accessibility": "public",
-        "static": true,
-        "optional": false,
-        "computed": false,
-        "value": {
-          "type": "FunctionExpression",
-          "function": {
-            "type": "ScriptFunction",
-            "id": {
-              "type": "Identifier",
-              "name": "_$init$_",
-              "decorators": []
-            },
-            "generator": false,
-            "async": false,
-            "expression": false,
-            "params": [],
-            "body": {
-              "type": "BlockStatement",
-              "statements": [
-                {
-                  "type": "ExpressionStatement",
-                  "expression": {
-                    "type": "AssignmentExpression",
-                    "operator": "=",
-                    "left": {
-                      "type": "Identifier",
-                      "name": "a",
-                      "decorators": []
-                    },
-                    "right": {
-                      "type": "CallExpression",
-                      "callee": {
-                        "type": "Identifier",
-                        "name": "GoodGreeter",
-                        "decorators": []
-                      },
-                      "arguments": [],
-                      "optional": false
-                    }
-                  }
-                },
-                {
-                  "type": "ExpressionStatement",
-                  "expression": {
-                    "type": "AssignmentExpression",
-                    "operator": "=",
-                    "left": {
-                      "type": "Identifier",
-                      "name": "c",
-                      "decorators": []
-                    },
-                    "right": {
-                      "type": "ETSNewClassInstanceExpression",
-                      "typeReference": {
-                        "type": "ETSTypeReference",
-                        "part": {
-                          "type": "ETSTypeReferencePart",
-                          "name": {
-                            "type": "Identifier",
-                            "name": "GoodGreeter",
-                            "decorators": []
-                          }
-                        }
-                      },
-                      "arguments": []
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        },
-        "overloads": [],
-        "decorators": []
-      },
       {
         "type": "ClassProperty",
         "key": {
diff --git a/ets2panda/test/unit/public/ast_verifier_private_access_negative_test.cpp b/ets2panda/test/unit/public/ast_verifier_private_access_negative_test.cpp
index 4fbc212dba126534b2352772abe78d8a644b1d23..f8dd049327fa4013b67dd1832336814033683060 100644
--- a/ets2panda/test/unit/public/ast_verifier_private_access_negative_test.cpp
+++ b/ets2panda/test/unit/public/ast_verifier_private_access_negative_test.cpp
@@ -151,7 +151,7 @@ TEST_F(ASTVerifierTest, PrivateAccessTestNegative5)
             ->AsClassDeclaration()
             ->Definition()
             ->AsClassDefinition()
-            ->Body()[1]
+            ->Body()[0]
             ->AsClassElement()
             ->Value()
             ->AsFunctionExpression()
@@ -193,7 +193,7 @@ TEST_F(ASTVerifierTest, PrivateAccessTestNegative6)
             ->AsClassDeclaration()
             ->Definition()
             ->AsClassDefinition()
-            ->Body()[1]
+            ->Body()[0]
             ->AsClassElement()
             ->Value()
             ->AsFunctionExpression()
@@ -235,7 +235,7 @@ TEST_F(ASTVerifierTest, PrivateAccessTestNegative7)
             ->AsClassDeclaration()
             ->Definition()
             ->AsClassDefinition()
-            ->Body()[1]
+            ->Body()[0]
             ->AsClassElement()
             ->Value()
             ->AsFunctionExpression()
diff --git a/ets2panda/test/unit/public/ast_verifier_protected_access_negative_test.cpp b/ets2panda/test/unit/public/ast_verifier_protected_access_negative_test.cpp
index 2573cc1244f5604e63a9483ac5be715148b32388..f2000145e4132087de77467426aaab5e19ead0d8 100644
--- a/ets2panda/test/unit/public/ast_verifier_protected_access_negative_test.cpp
+++ b/ets2panda/test/unit/public/ast_verifier_protected_access_negative_test.cpp
@@ -125,7 +125,7 @@ TEST_F(ASTVerifierTest, ProtectedAccessTestNegative4)
             ->AsClassDeclaration()
             ->Definition()
             ->AsClassDefinition()
-            ->Body()[1]
+            ->Body()[0]
             ->AsClassElement()
             ->Value()
             ->AsFunctionExpression()
@@ -167,7 +167,7 @@ TEST_F(ASTVerifierTest, ProtectedAccessTestNegative5)
             ->AsClassDeclaration()
             ->Definition()
             ->AsClassDefinition()
-            ->Body()[1]
+            ->Body()[0]
             ->AsClassElement()
             ->Value()
             ->AsFunctionExpression()
@@ -203,13 +203,14 @@ TEST_F(ASTVerifierTest, ProtectedAccessTestNegative6)
     )";
     CONTEXT(ES2PANDA_STATE_CHECKED, text)
     {
-        GetAst()
+        auto *x = GetAst();
+        x->AsETSModule()
             ->AsETSModule()
             ->Statements()[0]
             ->AsClassDeclaration()
             ->Definition()
             ->AsClassDefinition()
-            ->Body()[1]
+            ->Body()[0]
             ->AsClassElement()
             ->Value()
             ->AsFunctionExpression()
diff --git a/ets2panda/test/unit/public/ast_verifier_short_test.cpp b/ets2panda/test/unit/public/ast_verifier_short_test.cpp
index 4a20d2a0540dbc26ed29e1649e1400191036df99..893f27a28d66caf20fdccd20223a968b6cbf820f 100644
--- a/ets2panda/test/unit/public/ast_verifier_short_test.cpp
+++ b/ets2panda/test/unit/public/ast_verifier_short_test.cpp
@@ -241,7 +241,7 @@ TEST_F(ASTVerifierTest, VariableNameIdentifierNameSameNegative)
             ->AsClassDeclaration()
             ->Definition()
             ->AsClassDefinition()
-            ->Body()[1]
+            ->Body()[0]
             ->AsClassElement()
             ->Value()
             ->AsFunctionExpression()
diff --git a/ets2panda/util/diagnostic/semantic.yaml b/ets2panda/util/diagnostic/semantic.yaml
index f76f0cf5ec6546bc26fcd24a5064da2698e3505a..67b1ab0c445858c776575813a9752d3a96cba74f 100644
--- a/ets2panda/util/diagnostic/semantic.yaml
+++ b/ets2panda/util/diagnostic/semantic.yaml
@@ -544,6 +544,7 @@ semantic:
 - name: FIELD_REASSIGNMENT
   id: 297
   message: "Cannot reassign {} {}"
+  code_fix_ids: [FixConvertConstToLet]
 
 - name: FINAL_METHOD_INVALID_MODIFIER
   id: 48
diff --git a/ets2panda/util/diagnosticEngine.cpp b/ets2panda/util/diagnosticEngine.cpp
index ce2147a3f7453cff2bdfa626d009bfda7b38d4a4..82e2ad43f4574691fd11860e1185ab835c631fcf 100644
--- a/ets2panda/util/diagnosticEngine.cpp
+++ b/ets2panda/util/diagnosticEngine.cpp
@@ -37,6 +37,15 @@ void CLIDiagnosticPrinter::Print(const DiagnosticBase &diagnostic) const
     Print(diagnostic, std::cout);
 }
 
+void DiagnosticEngine::CleanDuplicateLog(DiagnosticType type)
+{
+    DiagnosticStorage &log = diagnostics_[type];
+    std::sort(log.begin(), log.end(), [](const auto &lhs, const auto &rhs) { return *lhs < *rhs; });
+    auto last =
+        std::unique(log.begin(), log.end(), [&](const auto &rhs, const auto &lhs) -> bool { return *rhs == *lhs; });
+    log.resize(std::distance(log.begin(), last));
+}
+
 const DiagnosticStorage &DiagnosticEngine::GetDiagnosticStorage(DiagnosticType type)
 {
     return diagnostics_[type];
diff --git a/ets2panda/util/diagnosticEngine.h b/ets2panda/util/diagnosticEngine.h
index 9b227cca27b5d8404860319d62a81fb323785fb9..14dbc790a8ac05a630d6eb043a17b6ba91cb0af0 100644
--- a/ets2panda/util/diagnosticEngine.h
+++ b/ets2panda/util/diagnosticEngine.h
@@ -141,6 +141,8 @@ public:
         wError_ = wError;
     }
 
+    void CleanDuplicateLog(DiagnosticType type);
+
     const DiagnosticStorage &GetDiagnosticStorage(DiagnosticType type);
 
     static void InitializeSignalHandlers();