diff --git a/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/ODBuilder.java b/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/ODBuilder.java
index 5aa9de343..b6422938a 100644
--- a/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/ODBuilder.java
+++ b/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/ODBuilder.java
@@ -1,6 +1,7 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.cddiff.syn2semdiff.odgen;
 
+import com.google.common.base.Verify;
 import de.monticore.cddiff.syn2semdiff.datastructures.AssocDirection;
 import de.monticore.od4report.OD4ReportMill;
 import de.monticore.odbasis.ODBasisMill;
@@ -38,7 +39,8 @@ public ASTODAttribute buildAttr(String type, String name, String value) {
     catch (Exception exception) {
       Log.error("Attributes couldn't be created");
     }
-    assert Objects.requireNonNull(attribute).isPresent();
+    Verify.verifyNotNull(attribute, "Attribute is null");
+    Verify.verify(attribute.isPresent(), "Attribute value must be present");
     return attribute.get();
   }
   
@@ -58,7 +60,8 @@ public ASTODAttribute buildAttr(String type, String name) {
     catch (Exception exception) {
       Log.error("Attributes couldn't be created");
     }
-    assert Objects.requireNonNull(attribute).isPresent();
+    Verify.verifyNotNull(attribute, "Attribute is null");
+    Verify.verify(attribute.isPresent(), "Attribute value must be present");
     return attribute.get();
   }
   
diff --git a/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Package.java b/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Package.java
index 341b6faf8..b174b2908 100644
--- a/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Package.java
+++ b/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Package.java
@@ -1,6 +1,7 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.cddiff.syn2semdiff.odgen;
 
+import com.google.common.base.Verify;
 import de.monticore.cdassociation._ast.ASTCDAssociation;
 import de.monticore.cdbasis._ast.ASTCDAttribute;
 import de.monticore.cdbasis._ast.ASTCDClass;
@@ -13,7 +14,6 @@
 import edu.mit.csail.sdg.alloy4.Pair;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 public class Package {
   
@@ -36,8 +36,8 @@ public Package(ASTCDClass leftObject, String idSrc, ASTCDClass rightObject, Stri
     this.rightObject = ODBuilder.buildObj(idTgt, rightObject.getSymbol().getInternalQualifiedName(),
         odGenHelper.getSuperTypes(rightObject), getAttributesOD(rightObject, helper));
     this.association = ODBuilder.buildLink(this.leftObject, CDDiffUtil.inferRole(association
-        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Objects
-            .requireNonNull(Syn2SemDiffHelper.getDirection(association)));
+        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Verify
+            .verifyNotNull(Syn2SemDiffHelper.getDirection(association)));
     this.astcdAssociation = association;
     this.side = side;
     this.isProcessedLeft = isProcessedLeft;
@@ -49,8 +49,8 @@ public Package(ASTODObject leftObject, ASTODObject rightObject, ASTCDAssociation
     this.leftObject = leftObject;
     this.rightObject = rightObject;
     this.association = ODBuilder.buildLink(this.leftObject, CDDiffUtil.inferRole(association
-        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Objects
-            .requireNonNull(Syn2SemDiffHelper.getDirection(association)));
+        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Verify
+            .verifyNotNull(Syn2SemDiffHelper.getDirection(association)));
     this.astcdAssociation = association;
     this.side = side;
     this.isProcessedLeft = isProcessedLeft;
@@ -66,8 +66,8 @@ public Package(ASTCDClass leftObject, String idSrc, ASTODObject rightObject,
         odGenHelper.getSuperTypes(leftObject), getAttributesOD(leftObject, helper));
     this.rightObject = rightObject;
     this.association = ODBuilder.buildLink(this.leftObject, CDDiffUtil.inferRole(association
-        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Objects
-            .requireNonNull(Syn2SemDiffHelper.getDirection(association)));
+        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Verify
+            .verifyNotNull(Syn2SemDiffHelper.getDirection(association)));
     this.astcdAssociation = association;
     this.side = side;
     this.isProcessedLeft = isProcessedLeft;
@@ -82,8 +82,8 @@ public Package(ASTODObject leftObject, ASTCDClass rightObject, String idTgt,
     this.rightObject = ODBuilder.buildObj(idTgt, rightObject.getSymbol().getInternalQualifiedName(),
         odGenHelper.getSuperTypes(rightObject), getAttributesOD(rightObject, helper));
     this.association = ODBuilder.buildLink(this.leftObject, CDDiffUtil.inferRole(association
-        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Objects
-            .requireNonNull(Syn2SemDiffHelper.getDirection(association)));
+        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Verify
+            .verifyNotNull(Syn2SemDiffHelper.getDirection(association)));
     this.astcdAssociation = association;
     this.side = side;
     this.isProcessedLeft = isProcessedLeft;
diff --git a/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Syn2SemDiffHelper.java b/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Syn2SemDiffHelper.java
index 09f10880c..0daadbb6c 100644
--- a/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Syn2SemDiffHelper.java
+++ b/cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Syn2SemDiffHelper.java
@@ -1,6 +1,7 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.cddiff.syn2semdiff.odgen;
 
+import com.google.common.base.Verify;
 import com.google.common.collect.ArrayListMultimap;
 import de.monticore.cd.facade.MCQualifiedNameFacade;
 import de.monticore.cd4code.CD4CodeMill;
@@ -435,16 +436,16 @@ public static void mergeAssocs(AssocStruct association, AssocStruct superAssoc)
     association.getAssociation().setCDAssocDir(direction);
     association.setDirection(getDirection(association.getAssociation()));
     if (association.getSide().equals(ClassSide.Left)) {
-      association.getAssociation().getLeft().setCDCardinality(createCardinality(Objects
-          .requireNonNull(cardinalityLeft)));
-      association.getAssociation().getRight().setCDCardinality(createCardinality(Objects
-          .requireNonNull(cardinalityRight)));
+      association.getAssociation().getLeft().setCDCardinality(createCardinality(Verify
+          .verifyNotNull(cardinalityLeft)));
+      association.getAssociation().getRight().setCDCardinality(createCardinality(Verify
+          .verifyNotNull(cardinalityRight)));
     }
     else {
-      association.getAssociation().getLeft().setCDCardinality(createCardinality(Objects
-          .requireNonNull(cardinalityRight)));
-      association.getAssociation().getRight().setCDCardinality(createCardinality(Objects
-          .requireNonNull(cardinalityLeft)));
+      association.getAssociation().getLeft().setCDCardinality(createCardinality(Verify
+          .verifyNotNull(cardinalityRight)));
+      association.getAssociation().getRight().setCDCardinality(createCardinality(Verify
+          .verifyNotNull(cardinalityLeft)));
     }
   }
   
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AmbiguousMatchTest.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AmbiguousMatchTest.java
index f3ca4bc9a..1def3e21f 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AmbiguousMatchTest.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AmbiguousMatchTest.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -44,7 +44,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.ASSERT_ASSOCIATIVITY).withParam(
             MergeParameter.FAIL_AMBIGUOUS).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationAmbiguousRole.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationAmbiguousRole.java
index 1e55878f8..5cce4a103 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationAmbiguousRole.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationAmbiguousRole.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -47,7 +47,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY)
         .withParam(MergeParameter.FAIL_FAST);
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCardinalities.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCardinalities.java
index a8f273fa7..81a02f969 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCardinalities.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCardinalities.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -53,7 +53,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD").withParam(
             MergeParameter.FAIL_FAST);
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionAssociation.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionAssociation.java
index 0ff09aa26..f6c5b4479 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionAssociation.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionAssociation.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionDesignissue.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionDesignissue.java
index f1d106de1..6cdfc4e9f 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionDesignissue.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionDesignissue.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -43,7 +43,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY)
         .withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationDerived.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationDerived.java
index fd5b26e86..f73ce6a10 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationDerived.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationDerived.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -44,7 +44,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNavigations.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNavigations.java
index ccca09fd1..f4b195955 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNavigations.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNavigations.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNoMatch.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNoMatch.java
index fca29b304..8ca8a1f13 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNoMatch.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNoMatch.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -57,7 +57,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierConflict.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierConflict.java
index d409fa391..f9ac03b12 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierConflict.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierConflict.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -49,7 +49,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierOK.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierOK.java
index 92a69210a..652a567bd 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierOK.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierOK.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesAttributeConflict.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesAttributeConflict.java
index f3ed757ca..6b6310f21 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesAttributeConflict.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesAttributeConflict.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -47,7 +47,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesConflict.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesConflict.java
index 00da04c9d..1b936d4e7 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesConflict.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesConflict.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -48,7 +48,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesSimple.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesSimple.java
index 6820ea396..df2fca500 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesSimple.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesSimple.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesWithAssocName.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesWithAssocName.java
index 54dcfffff..417f77713 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesWithAssocName.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesWithAssocName.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociativityTest.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociativityTest.java
index 8c2c69185..c5027f85c 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociativityTest.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociativityTest.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -48,7 +48,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.ASSERT_ASSOCIATIVITY).withParam(
             MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeConflictDifferentTypes.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeConflictDifferentTypes.java
index ad8b3a7fb..e2302793f 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeConflictDifferentTypes.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeConflictDifferentTypes.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -49,7 +49,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
             "mergedCD");
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeDifferentAttributes.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeDifferentAttributes.java
index 9b0c60e3c..f09d584f1 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeDifferentAttributes.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeDifferentAttributes.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeDuplicateAttributes.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeDuplicateAttributes.java
index 4c9149f67..17c3c89bd 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeDuplicateAttributes.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AttributeDuplicateAttributes.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralAllFlavours.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralAllFlavours.java
index 444021c79..b6be0df4f 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralAllFlavours.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralAllFlavours.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -48,7 +48,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
                 MergeParameter.DISABLE_CONTEXT_CONDITIONS);
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralFourClassDiagrams.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralFourClassDiagrams.java
index d702f6b10..ad142fb6b 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralFourClassDiagrams.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralFourClassDiagrams.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -68,7 +68,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         // FIXME Tool works but CoCo Fails
         .withParam(MergeParameter.DISABLE_CONTEXT_CONDITIONS);
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralOffice.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralOffice.java
index 9b9289bb8..cb688194a 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralOffice.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/GeneralOffice.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -48,7 +48,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
                 MergeParameter.DISABLE_CONTEXT_CONDITIONS);
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceConflictCyclicInheritance.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceConflictCyclicInheritance.java
index 00d92dcb4..d963905bb 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceConflictCyclicInheritance.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceConflictCyclicInheritance.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -48,7 +48,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
             "mergedCD");
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceConflictSuperclasses.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceConflictSuperclasses.java
index d49b1140b..12ac6fcb4 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceConflictSuperclasses.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceConflictSuperclasses.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -49,7 +49,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceDisjointInterfaces.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceDisjointInterfaces.java
index 4cef162d1..83685e9cd 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceDisjointInterfaces.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceDisjointInterfaces.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceDuplicateSuperinterfaces.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceDuplicateSuperinterfaces.java
index b6442612b..4bac47608 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceDuplicateSuperinterfaces.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceDuplicateSuperinterfaces.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup1.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup1.java
index 993e18d11..08f9a38ac 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup1.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup1.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY)
         .withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup2.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup2.java
index ddc1bef8d..c25e49006 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup2.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup2.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -55,7 +55,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup3.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup3.java
index 72f46cdbb..576bc6e45 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup3.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceInheritanceAttributePullup3.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceRedundantSuperinterfaces1.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceRedundantSuperinterfaces1.java
index fb27f021e..384c1109a 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceRedundantSuperinterfaces1.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceRedundantSuperinterfaces1.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceRedundantSuperinterfaces2.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceRedundantSuperinterfaces2.java
index 27b340d4a..e6ab942c5 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceRedundantSuperinterfaces2.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceRedundantSuperinterfaces2.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceTransitiveInheritanceClasses.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceTransitiveInheritanceClasses.java
index 22686dc0f..604e805c3 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceTransitiveInheritanceClasses.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceTransitiveInheritanceClasses.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -51,7 +51,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
                 MergeParameter.LOG_TO_CONSOLE);
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceTransitiveInheritanceInterfaces.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceTransitiveInheritanceInterfaces.java
index 834d21f99..ccde40e65 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceTransitiveInheritanceInterfaces.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/InheritanceTransitiveInheritanceInterfaces.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -50,7 +50,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/StereotypeMergeTest.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/StereotypeMergeTest.java
index 416a9b7bc..a284a47a9 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/StereotypeMergeTest.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/StereotypeMergeTest.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDAttribute;
 import de.monticore.cdbasis._ast.ASTCDClass;
 import de.monticore.cdbasis._ast.ASTCDDefinition;
@@ -166,7 +166,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesAbstractClasses.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesAbstractClasses.java
index 5514e85d1..2dc7fe205 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesAbstractClasses.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesAbstractClasses.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -47,7 +47,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousClassEnum.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousClassEnum.java
index 102e2a7c1..faa069795 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousClassEnum.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousClassEnum.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD").withParam(
             MergeParameter.MERGE_HETEROGENEOUS_TYPES, MergeParameter.ON);
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousClassInterface.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousClassInterface.java
index 4bed04795..ae76a2c9c 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousClassInterface.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousClassInterface.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -47,7 +47,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD").withParam(
             MergeParameter.MERGE_HETEROGENEOUS_TYPES, MergeParameter.ON);
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousInterfaceEnum.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousInterfaceEnum.java
index c81560417..0186ddda1 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousInterfaceEnum.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesHeterogeneousInterfaceEnum.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -47,7 +47,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD").withParam(
             MergeParameter.MERGE_HETEROGENEOUS_TYPES, MergeParameter.ON);
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesMergeEnum.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesMergeEnum.java
index 108a26b38..87148b6d0 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesMergeEnum.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesMergeEnum.java
@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesNameConflictNonHeteorogenous.java b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesNameConflictNonHeteorogenous.java
index aef9f5435..1e1419844 100644
--- a/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesNameConflictNonHeteorogenous.java
+++ b/cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/TypesNameConflictNonHeteorogenous.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -47,7 +47,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();
diff --git a/cdtool/src/test/java/de/monticore/CDDiffCLIToolTest.java b/cdtool/src/test/java/de/monticore/CDDiffCLIToolTest.java
index 202c80e80..29cb21b41 100644
--- a/cdtool/src/test/java/de/monticore/CDDiffCLIToolTest.java
+++ b/cdtool/src/test/java/de/monticore/CDDiffCLIToolTest.java
@@ -3,6 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cddiff.CDDiffUtil;
 import de.monticore.cddiff.alloycddiff.CDSemantics;
@@ -14,7 +15,6 @@
 import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 import org.apache.commons.io.file.PathUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -78,8 +78,8 @@ public void testSemDiff() {
       CD4CodeTool.main(args);
       
       try {
-        ASTCDCompilationUnit ast1 = Objects.requireNonNull(CDDiffUtil.loadCD(cd1)).deepClone();
-        ASTCDCompilationUnit ast2 = Objects.requireNonNull(CDDiffUtil.loadCD(cd2)).deepClone();
+        ASTCDCompilationUnit ast1 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd1)).deepClone();
+        ASTCDCompilationUnit ast2 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd2)).deepClone();
         
         // then corresponding .od files are generated
         File[] odFiles = Paths.get(output).toFile().listFiles();
@@ -157,8 +157,8 @@ public void testDefaultSemDiff() {
     CD4CodeTool.main(args);
     
     try {
-      ASTCDCompilationUnit ast1 = Objects.requireNonNull(CDDiffUtil.loadCD(cd1)).deepClone();
-      ASTCDCompilationUnit ast2 = Objects.requireNonNull(CDDiffUtil.loadCD(cd2)).deepClone();
+      ASTCDCompilationUnit ast1 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd1)).deepClone();
+      ASTCDCompilationUnit ast2 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd2)).deepClone();
       
       // then corresponding .od files are generated
       File[] odFiles = Paths.get(output).toFile().listFiles();
@@ -355,8 +355,8 @@ public void testValidityOfSemDiffWithPackages() {
       CD4CodeTool.main(args);
       
       try {
-        ASTCDCompilationUnit ast1 = Objects.requireNonNull(CDDiffUtil.loadCD(cd1)).deepClone();
-        ASTCDCompilationUnit ast2 = Objects.requireNonNull(CDDiffUtil.loadCD(cd2)).deepClone();
+        ASTCDCompilationUnit ast1 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd1)).deepClone();
+        ASTCDCompilationUnit ast2 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd2)).deepClone();
         
         // then corresponding .od files are generated
         File[] odFiles = Paths.get(output).toFile().listFiles();
@@ -429,8 +429,8 @@ public void testValidityOfOW2CWReduction2() {
     assertNotNull(odFiles);
     
     try {
-      ASTCDCompilationUnit ast1 = Objects.requireNonNull(CDDiffUtil.loadCD(cd1)).deepClone();
-      ASTCDCompilationUnit ast2 = Objects.requireNonNull(CDDiffUtil.loadCD(cd2)).deepClone();
+      ASTCDCompilationUnit ast1 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd1)).deepClone();
+      ASTCDCompilationUnit ast2 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd2)).deepClone();
       for (File odFile : odFiles) {
         if (odFile.getName().endsWith(".od")) {
           assertTrue(new OD2CDMatcher().checkIfDiffWitness(CDSemantics.STA_OPEN_WORLD, ast1, ast2,
diff --git a/cdtool/src/test/java/de/monticore/ExampleCommandTest.java b/cdtool/src/test/java/de/monticore/ExampleCommandTest.java
index 9e9238adc..3e8eea168 100644
--- a/cdtool/src/test/java/de/monticore/ExampleCommandTest.java
+++ b/cdtool/src/test/java/de/monticore/ExampleCommandTest.java
@@ -3,6 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import com.google.common.base.Verify;
 import de.monticore.cd.OutTestBasis;
 import de.monticore.cd._symboltable.BuiltInTypes;
 import de.monticore.cd4code.CD4CodeMill;
@@ -23,7 +24,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Objects;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -250,8 +250,8 @@ public void testTwoCDsComparisonExample2() {
         outputPath + "out" });
     
     try {
-      ASTCDCompilationUnit ast1 = Objects.requireNonNull(CDDiffUtil.loadCD(cd1)).deepClone();
-      ASTCDCompilationUnit ast2 = Objects.requireNonNull(CDDiffUtil.loadCD(cd2)).deepClone();
+      ASTCDCompilationUnit ast1 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd1)).deepClone();
+      ASTCDCompilationUnit ast2 = Verify.verifyNotNull(CDDiffUtil.loadCD(cd2)).deepClone();
       
       // then corresponding .od files are generated
       File[] odFiles = Paths.get(outputPath + "out").toFile().listFiles();