diff --git a/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/ConditionalExpressionIsFalseTypedCheckTest.java b/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/ConditionalExpressionIsFalseTypedCheckTest.java
index 8c231065..248832f9 100644
--- a/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/ConditionalExpressionIsFalseTypedCheckTest.java
+++ b/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/ConditionalExpressionIsFalseTypedCheckTest.java
@@ -33,8 +33,7 @@ class ConditionalExpressionIsFalseTypedCheckTest extends MagikTypedCheckTestBase
       })
   void testOk(final String code) {
     final IDefinitionKeeper definitionKeeper = new DefinitionKeeper();
-    final ConditionalExpressionIsFalseTypedCheck check =
-        new ConditionalExpressionIsFalseTypedCheck();
+    final MagikTypedCheck check = new ConditionalExpressionIsFalseTypedCheck();
     final List<MagikIssue> checkResults = this.runCheck(code, definitionKeeper, check);
     assertThat(checkResults).isEmpty();
   }
@@ -55,8 +54,7 @@ void testOk(final String code) {
       })
   void testFail(final String code) {
     final IDefinitionKeeper definitionKeeper = new DefinitionKeeper();
-    final ConditionalExpressionIsFalseTypedCheck check =
-        new ConditionalExpressionIsFalseTypedCheck();
+    final MagikTypedCheck check = new ConditionalExpressionIsFalseTypedCheck();
     final List<MagikIssue> checkResults = this.runCheck(code, definitionKeeper, check);
     assertThat(checkResults).hasSize(1);
   }
diff --git a/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/MethodArgumentCountMatchesParameterCountTypedCheckTest.java b/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/MethodArgumentCountMatchesParameterCountTypedCheckTest.java
index 526d1b6e..907f7a12 100644
--- a/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/MethodArgumentCountMatchesParameterCountTypedCheckTest.java
+++ b/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/MethodArgumentCountMatchesParameterCountTypedCheckTest.java
@@ -25,8 +25,7 @@ void testMethodUnknown() {
           object.m()
         _endblock""";
     final IDefinitionKeeper definitionKeeper = new DefinitionKeeper();
-    final MethodArgumentCountMatchesParameterCountTypedCheck check =
-        new MethodArgumentCountMatchesParameterCountTypedCheck();
+    final MagikTypedCheck check = new MethodArgumentCountMatchesParameterCountTypedCheck();
     final List<MagikIssue> issues = this.runCheck(code, definitionKeeper, check);
     assertThat(issues).isEmpty();
   }
@@ -73,8 +72,7 @@ void testArgumentCountMatches() {
         _block
           object.m(object, object)
         _endblock""";
-    final MethodArgumentCountMatchesParameterCountTypedCheck check =
-        new MethodArgumentCountMatchesParameterCountTypedCheck();
+    final MagikTypedCheck check = new MethodArgumentCountMatchesParameterCountTypedCheck();
     final List<MagikIssue> issues = this.runCheck(code, definitionKeeper, check);
     assertThat(issues).isEmpty();
   }
@@ -121,8 +119,7 @@ void testArgumentMissing() {
         _block
           object.m(object)
         _endblock""";
-    final MethodArgumentCountMatchesParameterCountTypedCheck check =
-        new MethodArgumentCountMatchesParameterCountTypedCheck();
+    final MagikTypedCheck check = new MethodArgumentCountMatchesParameterCountTypedCheck();
     final List<MagikIssue> issues = this.runCheck(code, definitionKeeper, check);
     assertThat(issues).hasSize(1);
   }
diff --git a/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/MethodArgumentTypeMatchesParameterTypeTypedCheckTest.java b/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/MethodArgumentTypeMatchesParameterTypeTypedCheckTest.java
index f238074c..4b3a0567 100644
--- a/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/MethodArgumentTypeMatchesParameterTypeTypedCheckTest.java
+++ b/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/MethodArgumentTypeMatchesParameterTypeTypedCheckTest.java
@@ -81,8 +81,7 @@ void testArgumentTypeMatches(final String code) {
     final IDefinitionKeeper definitionKeeper = new DefinitionKeeper();
     this.addTestMethods(definitionKeeper);
 
-    final MethodArgumentTypeMatchesParameterTypeTypedCheck check =
-        new MethodArgumentTypeMatchesParameterTypeTypedCheck();
+    final MagikTypedCheck check = new MethodArgumentTypeMatchesParameterTypeTypedCheck();
     final List<MagikIssue> checkResults = this.runCheck(code, definitionKeeper, check);
     assertThat(checkResults).isEmpty();
   }
@@ -97,8 +96,7 @@ void testArgumentTypeNotMatches(final String code) {
     final IDefinitionKeeper definitionKeeper = new DefinitionKeeper();
     this.addTestMethods(definitionKeeper);
 
-    final MethodArgumentTypeMatchesParameterTypeTypedCheck check =
-        new MethodArgumentTypeMatchesParameterTypeTypedCheck();
+    final MagikTypedCheck check = new MethodArgumentTypeMatchesParameterTypeTypedCheck();
     final List<MagikIssue> checkResults = this.runCheck(code, definitionKeeper, check);
     assertThat(checkResults).hasSize(1);
   }
diff --git a/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/SwChar16VectorEvaluateInvocationTypedCheckTest.java b/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/SwChar16VectorEvaluateInvocationTypedCheckTest.java
index d52f51be..caf85532 100644
--- a/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/SwChar16VectorEvaluateInvocationTypedCheckTest.java
+++ b/magik-typed-checks/src/test/java/nl/ramsolutions/sw/magik/typedchecks/checks/SwChar16VectorEvaluateInvocationTypedCheckTest.java
@@ -14,8 +14,7 @@ class SwChar16VectorEvaluateInvocationTypedCheckTest extends MagikTypedCheckTest
   void testUseOfSwChar16VectorEvaluate() {
     final String code = "'abc'.evaluate()";
     final IDefinitionKeeper definitionKeeper = new DefinitionKeeper();
-    final SwChar16VectorEvaluateInvocationTypedCheck check =
-        new SwChar16VectorEvaluateInvocationTypedCheck();
+    final MagikTypedCheck check = new SwChar16VectorEvaluateInvocationTypedCheck();
     final List<MagikIssue> checkResults = this.runCheck(code, definitionKeeper, check);
     assertThat(checkResults).hasSize(1);
   }
@@ -24,8 +23,7 @@ void testUseOfSwChar16VectorEvaluate() {
   void testUseOfOtherEvaluate() {
     final String code = "100.evaluate()";
     final IDefinitionKeeper definitionKeeper = new DefinitionKeeper();
-    final SwChar16VectorEvaluateInvocationTypedCheck check =
-        new SwChar16VectorEvaluateInvocationTypedCheck();
+    final MagikTypedCheck check = new SwChar16VectorEvaluateInvocationTypedCheck();
     final List<MagikIssue> checkResults = this.runCheck(code, definitionKeeper, check);
     assertThat(checkResults).isEmpty();
   }