diff --git a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.java b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.java
index bd29bee9bd..4891d7931c 100644
--- a/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.java
+++ b/com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/BasicModelTest.java
@@ -85,7 +85,7 @@ public void testXIssueExpressionWithMarkerFeatureMessageParameters() throws Exce
   @Disabled("Fails because DocumentedImplCustom uses the null resource description provider to get the document provider")
   public void testInferingOfDescription() throws Exception {
     final Check check = util.getFirstInstanceOf(parser.parse(modelUtil.modelWithCheck()), Check.class);
-    assertEquals(check.getDescription(), "No documentation.");
+    assertEquals("No documentation.", check.getDescription());
   }
 
   /* Tests that Checks have an implicit name which matches the ID. */
diff --git a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/quickfix/AbstractQuickFixTest.java b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/quickfix/AbstractQuickFixTest.java
index 676b19e94e..d5459bb151 100644
--- a/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/quickfix/AbstractQuickFixTest.java
+++ b/com.avaloq.tools.ddk.check.ui.test/src/com/avaloq/tools/ddk/check/ui/test/quickfix/AbstractQuickFixTest.java
@@ -352,7 +352,7 @@ private void assertQuickFixExistsAndSuccessful(final String issueCode, final Str
   private void assertQuickFixExistsAndSuccessful(final String issueCode, final String quickfixLabel, final String expectedContent, final boolean ignoreFormatting) {
     // Assert amount of quickfixes
     int resolutionCount = resolutionsFor(issueCode, quickfixLabel).size();
-    assertEquals(resolutionCount, 1, String.format("There must be exactly one quickfix with label '%s' for issue '%s', but found '%d'.", quickfixLabel, issueCode, resolutionCount));
+    assertEquals(1, resolutionCount, String.format("There must be exactly one quickfix with label '%s' for issue '%s', but found '%d'.", quickfixLabel, issueCode, resolutionCount));
     // Apply quickfix
     UiThreadDispatcher.dispatchAndWait(new Runnable() {
       @Override
diff --git a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java
index 580ce0f630..c711a3edd4 100644
--- a/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java
+++ b/com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/generator/ExportGeneratorSupport.java
@@ -84,7 +84,7 @@ public EPackage apply(final IEObjectDescription from) {
       })).toArray(new EPackage[0]);
       registerMetaModel(new EmfRegistryMetaModel() {
         @Override
-        public EPackage[] allPackages() {
+        protected EPackage[] allPackages() {
           return ePackages;
         }
 
diff --git a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
index 62e1f11df8..87ffd658c3 100644
--- a/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
+++ b/com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopingGeneratorUtil.java
@@ -117,7 +117,7 @@ private void registerMetaModels(final ScopeModel model) {
       final EPackage[] ePackages = Lists.newArrayList(Iterables.transform(EObjectUtil.getScopeProviderByEObject(model).getScope(model, ScopePackage.Literals.IMPORT__PACKAGE).getAllElements(), d -> (EPackage) EcoreUtil.resolve(d.getEObjectOrProxy(), model))).toArray(new EPackage[0]);
       registerMetaModel(new EmfRegistryMetaModel() {
         @Override
-        public EPackage[] allPackages() {
+        protected EPackage[] allPackages() {
           return ePackages;
         }
 
diff --git a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractValidationTest.java b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractValidationTest.java
index 1f103f0d1a..822311aa6e 100644
--- a/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractValidationTest.java
+++ b/com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/jupiter/AbstractValidationTest.java
@@ -931,7 +931,7 @@ private void assertNoDiagnostic(final Diagnostic diagnostics, final String issue
    *          the diagnostic to check for issues
    */
   private void assertNoDiagnostics(final Diagnostic diagnostics) {
-    assertEquals(diagnostics.getCode(), Diagnostic.OK, "Diagnostics should be in OK state.");
+    assertEquals(Diagnostic.OK, diagnostics.getCode(), "Diagnostics should be in OK state.");
     assertTrue(diagnostics.getChildren().isEmpty(), "There should be no diagnostics. Instead found " + diagnostics.getChildren().size());
   }
 
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProviderTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProviderTest.java
index 2f1f283e11..0d770008e3 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProviderTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/linking/AbstractFragmentProviderTest.java
@@ -37,16 +37,16 @@ public EObject getEObjectFromSegment(final EObject container, final String segme
     }
 
     @Override
-    // make method public for testing
+    // make method accessible for testing
     @SuppressWarnings("PMD.UselessOverridingMethod")
-    public void appendEscaped(final String text, final StringBuilder builder) {
+    protected void appendEscaped(final String text, final StringBuilder builder) {
       super.appendEscaped(text, builder);
     }
 
     @Override
-    // make method public for testing
+    // make method accessible for testing
     @SuppressWarnings("PMD.UselessOverridingMethod")
-    public String unescape(final String text) {
+    protected String unescape(final String text) {
       return super.unescape(text);
     }
   }
@@ -57,7 +57,7 @@ public String unescape(final String text) {
   public void testEscape() {
     StringBuilder builder = new StringBuilder();
     fragmentProvider.appendEscaped("foo/bar#\\", builder);
-    assertEquals(builder.toString(), "foo\\/bar#\\\\", "Fragment not properly scaped");
+    assertEquals("foo\\/bar#\\\\", builder.toString(), "Fragment not properly scaped");
   }
 
   @Test
diff --git a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookupTest.java b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookupTest.java
index d78a1d0b1d..4b10a0e7c2 100644
--- a/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookupTest.java
+++ b/com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookupTest.java
@@ -210,7 +210,7 @@ public void testGetMappings() {
 
     URI noSuchValue = URI.createURI("scheme:/anotherHost");
     expected = lookup.getMappings(noSuchValue);
-    assertEquals(expected.size(), 0);
+    assertEquals(0, expected.size());
   }
 
   private QualifiedName name(final String str) {
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
index 2878cac028..5ac28a4914 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameSegmentTreeLookup.java
@@ -142,7 +142,7 @@ <T> Collection<T> matches(final QualifiedName lower, final int lowerIdx, final S
       final Collection<T> result = excludeDuplicates ? Sets.<T> newHashSet() : Lists.<T> newArrayList();
       Visitor visitor = new Visitor() {
         @Override
-        public void visit(final SegmentNode node) {
+        void visit(final SegmentNode node) {
           if (node.values != null) {
             for (Object value : node.values) {
               result.add((T) value);
@@ -406,7 +406,7 @@ <T> Collection<T> matches(final QualifiedName lower, final int lowerIdx, final S
       final Set<Object[]> arrays = Sets.newHashSet();
       Visitor visitor = new Visitor() {
         @Override
-        public void visit(final SegmentNode node) {
+        void visit(final SegmentNode node) {
           if (node.values != null) {
             arrays.add(node.values);
           }
@@ -543,7 +543,7 @@ public Collection<T> get(final QualifiedName name) {
   public void removeMappings(final T value) {
     root.accept(new Visitor() {
       @Override
-      public void visit(final SegmentNode node) {
+      void visit(final SegmentNode node) {
         Object[] newValues = ArrayUtils.remove(node.values, value);
         if (newValues != node.values) {
           node.values = newValues;