diff --git a/package.json b/package.json
index b0c8f8040..0d639dce2 100644
--- a/package.json
+++ b/package.json
@@ -27,12 +27,12 @@
     ]
   },
   "devDependencies": {
-    "@abaplint/cli": "^2.102.10",
-    "@abaplint/database-sqlite": "^2.7.18",
-    "@abaplint/runtime": "^2.7.55",
-    "@abaplint/transpiler-cli": "^2.7.55",
+    "@abaplint/cli": "^2.102.28",
+    "@abaplint/database-sqlite": "^2.7.74",
+    "@abaplint/runtime": "^2.7.80",
+    "@abaplint/transpiler-cli": "^2.7.80",
     "abapmerge": "^0.16.0",
     "c8": "^8.0.1",
-    "eslint": "^8.46.0"
+    "eslint": "^8.47.0"
   }
 }
diff --git a/src/repo/zcl_abapgit_repo_status.clas.testclasses.abap b/src/repo/zcl_abapgit_repo_status.clas.testclasses.abap
index e16120e15..143f9b3f8 100644
--- a/src/repo/zcl_abapgit_repo_status.clas.testclasses.abap
+++ b/src/repo/zcl_abapgit_repo_status.clas.testclasses.abap
@@ -644,7 +644,6 @@ CLASS ltcl_status_helper DEFINITION FOR TESTING.
       zif_abapgit_tadir.
 
     METHODS:
-      constructor,
       add_tadir
         IMPORTING
           iv_obj_type TYPE tadir-object
@@ -695,12 +694,6 @@ ENDCLASS.
 
 CLASS ltcl_status_helper IMPLEMENTATION.
 
-  METHOD constructor.
-
-    zcl_abapgit_injector=>set_tadir( me ).
-
-  ENDMETHOD.
-
   METHOD add_tadir.
 
     FIELD-SYMBOLS: <ls_tadir> LIKE LINE OF mt_tadir.
@@ -812,6 +805,7 @@ CLASS ltcl_calculate_status DEFINITION FOR TESTING RISK LEVEL HARMLESS
 
     METHODS:
       setup,
+      teardown,
       complete_local,
       complete_remote,
       complete_state,
@@ -834,6 +828,14 @@ CLASS ltcl_calculate_status IMPLEMENTATION.
   METHOD setup.
 
     CREATE OBJECT mo_helper.
+    zcl_abapgit_injector=>set_tadir( mo_helper ).
+
+  ENDMETHOD.
+
+  METHOD teardown.
+
+    DATA li_tadir TYPE REF TO zif_abapgit_tadir.
+    zcl_abapgit_injector=>set_tadir( li_tadir ).
 
   ENDMETHOD.
 
diff --git a/src/zcl_abapgit_injector.clas.testclasses.abap b/src/zcl_abapgit_injector.clas.testclasses.abap
index ffdc71d4a..345d0f28c 100644
--- a/src/zcl_abapgit_injector.clas.testclasses.abap
+++ b/src/zcl_abapgit_injector.clas.testclasses.abap
@@ -1,13 +1,11 @@
 CLASS ltcl_abapgit_tadir_mock DEFINITION FOR TESTING.
 
   PUBLIC SECTION.
-    INTERFACES: zif_abapgit_tadir.
+    INTERFACES zif_abapgit_tadir.
 
 ENDCLASS.
 
-CLASS ltcl_no_dependency_injection DEFINITION FOR TESTING
-                              RISK LEVEL HARMLESS
-                              DURATION SHORT.
+CLASS ltcl_no_dependency_injection DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT.
 
   PRIVATE SECTION.
     METHODS:
@@ -15,13 +13,12 @@ CLASS ltcl_no_dependency_injection DEFINITION FOR TESTING
 
 ENDCLASS.
 
-CLASS ltcl_simple_dependency_inject DEFINITION FOR TESTING
-                                  RISK LEVEL HARMLESS
-                                  DURATION SHORT.
+CLASS ltcl_simple_dependency_inject DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT.
 
   PRIVATE SECTION.
     METHODS:
       setup,
+      teardown,
       simple_injection FOR TESTING RAISING cx_static_check.
 
 ENDCLASS.
@@ -65,7 +62,7 @@ CLASS ltcl_simple_dependency_inject IMPLEMENTATION.
 
   METHOD setup.
 
-    DATA: lo_tadir_mock  TYPE REF TO ltcl_abapgit_tadir_mock.
+    DATA lo_tadir_mock TYPE REF TO ltcl_abapgit_tadir_mock.
 
     CREATE OBJECT lo_tadir_mock.
 
@@ -73,6 +70,11 @@ CLASS ltcl_simple_dependency_inject IMPLEMENTATION.
 
   ENDMETHOD.
 
+  METHOD teardown.
+    DATA li_tadir TYPE REF TO zif_abapgit_tadir.
+    zcl_abapgit_injector=>set_tadir( li_tadir ).
+  ENDMETHOD.
+
   METHOD simple_injection.
 
     DATA: li_tadir       TYPE REF TO zif_abapgit_tadir,