diff --git a/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java b/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
index 0935f6c..9a9e6ca 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
@@ -22,8 +22,8 @@
         b.with("corpusSigle=WPD");
         JsonNode node = JsonUtils.readTree(b.toJSON());
         assertNotNull(node);
-        assertEquals(node.at("/collection/@type").asText(), "koral:doc");
-        assertEquals(node.at("/collection/key").asText(), "corpusSigle");
+        assertEquals("koral:doc", node.at("/collection/@type").asText());
+        assertEquals("corpusSigle", node.at("/collection/key").asText());
     }
 
     @Test
@@ -32,13 +32,13 @@
         b.with("corpusSigle=WPD & textClass=freizeit");
         JsonNode node = JsonUtils.readTree(b.toJSON());
         assertNotNull(node);
-        assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
-        assertEquals(node.at("/collection/operation").asText(),
-                "operation:and");
-        assertEquals(node.at("/collection/operands/0/key").asText(),
-                "corpusSigle");
-        assertEquals(node.at("/collection/operands/1/key").asText(),
-                "textClass");
+        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+        assertEquals("operation:and",
+            node.at("/collection/operation").asText());
+        assertEquals("corpusSigle",
+            node.at("/collection/operands/0/key").asText());
+        assertEquals("textClass",
+            node.at("/collection/operands/1/key").asText());
     }
 
     @Test
@@ -76,22 +76,21 @@
         c.with("corpusSigle=WPD");
         JsonNode node = JsonUtils.readTree(c.toJSON());
         assertNotNull(node);
-        assertEquals(node.at("/collection/operands/1/@type").asText(),
-                "koral:doc");
-        assertEquals(node.at("/collection/operands/0/@type").asText(),
-                "koral:docGroup");
+        assertEquals("koral:doc",
+            node.at("/collection/operands/1/@type").asText());
+        assertEquals("koral:docGroup",
+            node.at("/collection/operands/0/@type").asText());
         assertEquals(2, node.at("/collection/operands").size());
         assertEquals(2, node.at("/collection/operands/0/operands").size());
         assertEquals(2,
                 node.at("/collection/operands/0/operands/0/operands").size());
-        assertEquals(node.at("/collection/operation").asText(),
-                "operation:and");
-        assertEquals(node.at("/collection/operands/0/operation").asText(),
-                "operation:or");
-        assertEquals(
-                node.at("/collection/operands/0/operands/0/operation").asText(),
-                "operation:and");
-        assertEquals(node.at("/collection/operands/1/value").asText(), "WPD");
+        assertEquals("operation:and",
+            node.at("/collection/operation").asText());
+        assertEquals("operation:or",
+            node.at("/collection/operands/0/operation").asText());
+        assertEquals("operation:and",
+            node.at("/collection/operands/0/operands/0/operation").asText());
+        assertEquals("WPD", node.at("/collection/operands/1/value").asText());
     }
 
     @Test
@@ -103,22 +102,18 @@
         c.with("(corpusSigle=BRZ13 | corpusSigle=AZPS)");
         JsonNode node = JsonUtils.readTree(c.toJSON());
         assertNotNull(node);
-        assertEquals(node.at("/collection/operands/0/@type").asText(),
-                "koral:docGroup");
-        assertEquals(node.at("/collection/operands/1/@type").asText(),
-                "koral:docGroup");
-        assertEquals(
-                node.at("/collection/operands/1/operands/0/value").asText(),
-                "BRZ13");
-        assertEquals(
-                node.at("/collection/operands/1/operands/1/value").asText(),
-                "AZPS");
-        assertEquals(
-                node.at("/collection/operands/0/operands/0/value").asText(),
-                "random title");
-        assertEquals(
-                node.at("/collection/operands/0/operands/1/value").asText(),
-                "wissenschaft");
+        assertEquals("koral:docGroup",
+            node.at("/collection/operands/0/@type").asText());
+        assertEquals("koral:docGroup",
+            node.at("/collection/operands/1/@type").asText());
+        assertEquals("BRZ13",
+            node.at("/collection/operands/1/operands/0/value").asText());
+        assertEquals("AZPS",
+            node.at("/collection/operands/1/operands/1/value").asText());
+        assertEquals("random title",
+            node.at("/collection/operands/0/operands/0/value").asText());
+        assertEquals("wissenschaft",
+            node.at("/collection/operands/0/operands/1/value").asText());
     }
 
     @Test
@@ -133,24 +128,24 @@
         b.with("textClass=freizeit");
         JsonNode res = (JsonNode) b.rebaseCollection();
         assertNotNull(res);
-        assertEquals(res.at("/collection/@type").asText(), "koral:docGroup");
-        assertEquals(res.at("/collection/operation").asText(), "operation:and");
-        assertEquals(res.at("/collection/operands/0/@type").asText(),
-                "koral:doc");
-        assertEquals(res.at("/collection/operands/1/value").asText(),
-                "freizeit");
-        assertEquals(res.at("/collection/operands/1/key").asText(),
-                "textClass");
-        assertEquals(res.at("/collection/operands/1/@type").asText(),
-                "koral:doc");
-        assertEquals(res.at("/collection/operands/0/value").asText(), "WPD");
-        assertEquals(res.at("/collection/operands/0/key").asText(),
-                "corpusSigle");
+        assertEquals("koral:docGroup", res.at("/collection/@type").asText());
+        assertEquals("operation:and", res.at("/collection/operation").asText());
+        assertEquals("koral:doc",
+            res.at("/collection/operands/0/@type").asText());
+        assertEquals("freizeit",
+            res.at("/collection/operands/1/value").asText());
+        assertEquals("textClass",
+            res.at("/collection/operands/1/key").asText());
+        assertEquals("koral:doc",
+            res.at("/collection/operands/1/@type").asText());
+        assertEquals("WPD", res.at("/collection/operands/0/value").asText());
+        assertEquals("corpusSigle",
+            res.at("/collection/operands/0/key").asText());
         // check also that query is still there
-        assertEquals(res.at("/query/@type").asText(), "koral:token");
-        assertEquals(res.at("/query/wrap/@type").asText(), "koral:term");
-        assertEquals(res.at("/query/wrap/key").asText(), "Haus");
-        assertEquals(res.at("/query/wrap/layer").asText(), "lemma");
+        assertEquals("koral:token", res.at("/query/@type").asText());
+        assertEquals("koral:term", res.at("/query/wrap/@type").asText());
+        assertEquals("Haus", res.at("/query/wrap/key").asText());
+        assertEquals("lemma", res.at("/query/wrap/layer").asText());
     }
 
     @Test
@@ -162,13 +157,13 @@
         c.with("corpusSigle=BRZ13");
         JsonNode base = (JsonNode) c.rebaseCollection();
         assertNotNull(base);
-        assertEquals(base.at("/collection/@type").asText(), "koral:docGroup");
-        assertEquals(base.at("/collection/operands/1/@type").asText(),
-                "koral:doc");
-        assertEquals(base.at("/collection/operands/1/value").asText(), "BRZ13");
-        assertEquals(base.at("/collection/operands/0/@type").asText(),
-                "koral:docGroup");
-        assertEquals(base.at("/collection/operands/0/operands").size(), 2);
+        assertEquals("koral:docGroup", base.at("/collection/@type").asText());
+        assertEquals("koral:doc",
+            base.at("/collection/operands/1/@type").asText());
+        assertEquals("BRZ13", base.at("/collection/operands/1/value").asText());
+        assertEquals("koral:docGroup",
+            base.at("/collection/operands/0/@type").asText());
+        assertEquals(2, base.at("/collection/operands/0/operands").size());
     }
 
     @Test
@@ -185,9 +180,9 @@
         JsonNode node = (JsonNode) test.rebaseCollection();
         node = b.mergeWith(node);
         assertNotNull(node);
-        assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
-        assertEquals(node.at("/collection/operation").asText(),
-                "operation:and");
+        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+        assertEquals("operation:and",
+            node.at("/collection/operation").asText());
         assertEquals(2, node.at("/collection/operands").size());
     }
 
@@ -244,8 +239,8 @@
         test.or().with("textClass=wissenschaft | textClass=politik");
         JsonNode node = (JsonNode) test.rebaseCollection();
         assertNotNull(node);
-        assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
-        assertEquals(node.at("/collection/operation").asText(), "operation:or");
+        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+        assertEquals("operation:or", node.at("/collection/operation").asText());
         assertEquals(2, node.at("/collection/operands/1/operands").size());
     }
 
@@ -261,9 +256,9 @@
         test.and().with("textClass=wissenschaft | textClass=politik");
         JsonNode node = (JsonNode) test.rebaseCollection();
         assertNotNull(node);
-        assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
-        assertEquals(node.at("/collection/operation").asText(),
-                "operation:and");
+        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+        assertEquals("operation:and",
+            node.at("/collection/operation").asText());
         assertEquals(2, node.at("/collection/operands/1/operands").size());
     }
 
@@ -279,9 +274,9 @@
         test.with("textClass=wissenschaft | textClass=politik");
         JsonNode node = (JsonNode) test.rebaseCollection();
         assertNotNull(node);
-        assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
-        assertEquals(node.at("/collection/operation").asText(),
-                "operation:and");
+        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+        assertEquals("operation:and",
+            node.at("/collection/operation").asText());
         assertEquals(2, node.at("/collection/operands/1/operands").size());
     }
 
@@ -297,17 +292,17 @@
         JsonNode node = total.and()
                 .mergeWith((JsonNode) builder.rebaseCollection());
         assertNotNull(node);
-        assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
-        assertEquals(node.at("/collection/operation").asText(),
-                "operation:and");
-        assertEquals(node.at("/collection/operands/0/@type").asText(),
-                "koral:doc");
-        assertEquals(node.at("/collection/operands/1/@type").asText(),
-                "koral:doc");
-        assertEquals(node.at("/collection/operands/0/key").asText(),
-                "textClass");
-        assertEquals(node.at("/collection/operands/1/key").asText(),
-                "corpusSigle");
+        assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+        assertEquals("operation:and",
+            node.at("/collection/operation").asText());
+        assertEquals("koral:doc",
+            node.at("/collection/operands/0/@type").asText());
+        assertEquals("koral:doc",
+            node.at("/collection/operands/1/@type").asText());
+        assertEquals("textClass",
+            node.at("/collection/operands/0/key").asText());
+        assertEquals("corpusSigle",
+            node.at("/collection/operands/1/key").asText());
     }
 
     @Test
@@ -322,7 +317,7 @@
         JsonNode node = total.and()
                 .mergeWith((JsonNode) builder.rebaseCollection());
         assertNotNull(node);
-        assertEquals(node.at("/collection/@type").asText(), "koral:doc");
-        assertEquals(node.at("/collection/key").asText(), "textClass");
+        assertEquals("koral:doc", node.at("/collection/@type").asText());
+        assertEquals("textClass", node.at("/collection/key").asText());
     }
 }