diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
index 9da4e54..c7b1fef 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
@@ -23,193 +23,194 @@
  * @author margaretha, diewald
  */
 public class StatisticsControllerTest extends OAuth2TestBase {
+	
+    @Test
+    public void testGetStatisticsNoResource ()
+            throws IOException, KustvaktException {
+        String corpusQuery = "corpusSigle=WPD15";
+        Response response = target().path(API_VERSION).path("statistics")
+                .queryParam("cq", corpusQuery).request().get();
+        assert Status.OK.getStatusCode() == response.getStatus();
+        assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
+                "Wes8Bd4h1OypPqbWF5njeQ==");
+        String ent = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(0,node.get("documents").asInt());
+        assertEquals(0,node.get("tokens").asInt());
+    }
+    
+    @Test
+    public void testGetStatisticsWithLogin () throws KustvaktException {
+    	Response response = requestTokenWithDoryPassword(superClientId,
+                clientSecret);
+        JsonNode node = JsonUtils.readTree(response.readEntity(String.class));
+        assertEquals(node.at("/scope").asText(), "all");
+        String accessToken = node.at("/access_token").asText();
+        
+    	String corpusQuery = "corpusSigle=GOE";
+        response = target().path(API_VERSION).path("statistics")
+                .queryParam("cq", corpusQuery).request()
+                .header(Attributes.AUTHORIZATION, "Bearer " + accessToken)
+                .get();
+        assert Status.OK.getStatusCode() == response.getStatus();
+        
+        String ent = response.readEntity(String.class);
+        node = JsonUtils.readTree(ent);
+        assertEquals(11,node.get("documents").asInt());
+	}
 
-        @Test
-        public void testGetStatisticsNoResource()
-                        throws IOException, KustvaktException {
-                String corpusQuery = "corpusSigle=WPD15";
-                Response response = target().path(API_VERSION).path("statistics")
-                                .queryParam("cq", corpusQuery).request().get();
-                assert Status.OK.getStatusCode() == response.getStatus();
-                assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
-                                "Wes8Bd4h1OypPqbWF5njeQ==");
-                String ent = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(0, node.get("documents").asInt());
-                assertEquals(0, node.get("tokens").asInt());
-        }
+    @Test
+    public void testStatisticsWithCq () throws KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .queryParam("cq", "textType=Abhandlung & corpusSigle=GOE")
+                .request().method("GET");
+        assertEquals(Status.OK.getStatusCode(), response.getStatus());
+        String query = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(query);
+        assertEquals(2, node.at("/documents").asInt());
+        assertEquals(138180, node.at("/tokens").asInt());
+        assertEquals(5687, node.at("/sentences").asInt());
+        assertEquals(258, node.at("/paragraphs").asInt());
+        assertTrue(node.at("/warnings").isMissingNode());
+    }
 
-        @Test
-        public void testGetStatisticsWithLogin() throws KustvaktException {
-                Response response = requestTokenWithDoryPassword(superClientId,
-                                clientSecret);
-                JsonNode node = JsonUtils.readTree(response.readEntity(String.class));
-                assertEquals(node.at("/scope").asText(), "all");
-                String accessToken = node.at("/access_token").asText();
 
-                String corpusQuery = "corpusSigle=GOE";
-                response = target().path(API_VERSION).path("statistics")
-                                .queryParam("cq", corpusQuery).request()
-                                .header(Attributes.AUTHORIZATION, "Bearer " + accessToken)
-                                .get();
-                assert Status.OK.getStatusCode() == response.getStatus();
+    @Test
+    public void testGetStatisticsWithcorpusQuery1 ()
+            throws IOException, KustvaktException {
+        String corpusQuery = "corpusSigle=GOE";
+        Response response = target().path(API_VERSION).path("statistics")
+                .queryParam("cq", corpusQuery).request().get();
+        assert Status.OK.getStatusCode() == response.getStatus();
+        String ent = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(11,node.get("documents").asInt());
+        assertEquals(665842,node.get("tokens").asInt());
+    }
 
-                String ent = response.readEntity(String.class);
-                node = JsonUtils.readTree(ent);
-                assertEquals(11, node.get("documents").asInt());
-        }
+    @Test
+    public void testGetStatisticsWithcorpusQuery2 ()
+            throws IOException, KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .queryParam("cq", "creationDate since 1810").request()
+                .get();
+        String ent = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(ent);
+        assert Status.OK.getStatusCode() == response.getStatus();
+        assertEquals(7,node.get("documents").asInt());
+        assertEquals(279402,node.get("tokens").asInt());
+        assertEquals(11047,node.get("sentences").asInt());
+        assertEquals(489,node.get("paragraphs").asInt());
+    }
 
-        @Test
-        public void testStatisticsWithCq() throws KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .queryParam("cq", "textType=Abhandlung & corpusSigle=GOE")
-                                .request().method("GET");
-                assertEquals(Status.OK.getStatusCode(), response.getStatus());
-                String query = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(query);
-                assertEquals(2, node.at("/documents").asInt());
-                assertEquals(138180, node.at("/tokens").asInt());
-                assertEquals(5687, node.at("/sentences").asInt());
-                assertEquals(258, node.at("/paragraphs").asInt());
-                assertTrue(node.at("/warnings").isMissingNode());
-        }
+    @Test
+    public void testGetStatisticsWithWrongcorpusQuery ()
+            throws IOException, KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .queryParam("cq", "creationDate geq 1810").request().get();
+        assert Status.BAD_REQUEST.getStatusCode() == response.getStatus();
+        String ent = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(302, node.at("/errors/0/0").asInt());
+        assertEquals("Could not parse query >>> (creationDate geq 1810) <<<.",
+                node.at("/errors/0/1").asText());
+        assertEquals("(creationDate geq 1810)",
+                node.at("/errors/0/2").asText());
+    }
 
-        @Test
-        public void testGetStatisticsWithcorpusQuery1()
-                        throws IOException, KustvaktException {
-                String corpusQuery = "corpusSigle=GOE";
-                Response response = target().path(API_VERSION).path("statistics")
-                                .queryParam("cq", corpusQuery).request().get();
-                assert Status.OK.getStatusCode() == response.getStatus();
-                String ent = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(11, node.get("documents").asInt());
-                assertEquals(665842, node.get("tokens").asInt());
-        }
+    @Test
+    public void testGetStatisticsWithWrongcorpusQuery2 ()
+            throws IOException, KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .queryParam("cq", "creationDate >= 1810-05").request().get();
+        String ent = response.readEntity(String.class);
+        assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(305, node.at("/errors/0/0").asInt());
+        assertEquals("Operator >= is not acceptable.",
+                node.at("/errors/0/1").asText());
+        assertEquals(">=", node.at("/errors/0/2").asText());
+    }
 
-        @Test
-        public void testGetStatisticsWithcorpusQuery2()
-                        throws IOException, KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .queryParam("cq", "creationDate since 1810").request()
-                                .get();
-                String ent = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(ent);
-                assert Status.OK.getStatusCode() == response.getStatus();
-                assertEquals(7, node.get("documents").asInt());
-                assertEquals(279402, node.get("tokens").asInt());
-                assertEquals(11047, node.get("sentences").asInt());
-                assertEquals(489, node.get("paragraphs").asInt());
-        }
+    @Test
+    public void testGetStatisticsWithoutcorpusQuery ()
+            throws IOException, KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .request().get();
+        assertEquals(Status.OK.getStatusCode(), response.getStatus());
+        String ent = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(11, node.at("/documents").asInt());
+        assertEquals(665842, node.at("/tokens").asInt());
+        assertEquals(25074, node.at("/sentences").asInt());
+        assertEquals(772, node.at("/paragraphs").asInt());
+    }
 
-        @Test
-        public void testGetStatisticsWithWrongcorpusQuery()
-                        throws IOException, KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .queryParam("cq", "creationDate geq 1810").request().get();
-                assert Status.BAD_REQUEST.getStatusCode() == response.getStatus();
-                String ent = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(302, node.at("/errors/0/0").asInt());
-                assertEquals("Could not parse query >>> (creationDate geq 1810) <<<.",
-                                node.at("/errors/0/1").asText());
-                assertEquals("(creationDate geq 1810)",
-                                node.at("/errors/0/2").asText());
-        }
+    @Test
+    public void testGetStatisticsWithKoralQuery ()
+            throws IOException, KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .request()
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                .post(Entity.json("{ \"collection\" : {\"@type\": "
+                        + "\"koral:doc\", \"key\": \"availability\", \"match\": "
+                        + "\"match:eq\", \"type\": \"type:regex\", \"value\": "
+                        + "\"CC.*\"} }"));
+        assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
+                "Wes8Bd4h1OypPqbWF5njeQ==");
+        assertEquals(Status.OK.getStatusCode(), response.getStatus());
+        String ent = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(2, node.at("/documents").asInt());
+        assertEquals(72770, node.at("/tokens").asInt());
+        assertEquals(2985, node.at("/sentences").asInt());
+        assertEquals(128, node.at("/paragraphs").asInt());
+    }
 
-        @Test
-        public void testGetStatisticsWithWrongcorpusQuery2()
-                        throws IOException, KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .queryParam("cq", "creationDate >= 1810-05").request().get();
-                String ent = response.readEntity(String.class);
-                assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(305, node.at("/errors/0/0").asInt());
-                assertEquals("Operator >= is not acceptable.",
-                                node.at("/errors/0/1").asText());
-                assertEquals(">=", node.at("/errors/0/2").asText());
-        }
+    @Test
+    public void testGetStatisticsWithEmptyCollection ()
+            throws IOException, KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .request()
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                .post(Entity.json("{}"));
+        assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        String ent = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION,
+                node.at("/errors/0/0").asInt());
+        assertEquals("Collection is not found",
+                node.at("/errors/0/1").asText());
+    }
 
-        @Test
-        public void testGetStatisticsWithoutcorpusQuery()
-                        throws IOException, KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .request().get();
-                assertEquals(Status.OK.getStatusCode(), response.getStatus());
-                String ent = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(11, node.at("/documents").asInt());
-                assertEquals(665842, node.at("/tokens").asInt());
-                assertEquals(25074, node.at("/sentences").asInt());
-                assertEquals(772, node.at("/paragraphs").asInt());
-        }
+    @Test
+    public void testGetStatisticsWithIncorrectJson ()
+            throws IOException, KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .request()
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                .post(Entity.json("{ \"collection\" : }"));
+        assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        String ent = response.readEntity(String.class);
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(StatusCodes.DESERIALIZATION_FAILED,
+                node.at("/errors/0/0").asInt());
+        assertEquals("Failed deserializing json object: { \"collection\" : }",
+                node.at("/errors/0/1").asText());
+    }
 
-        @Test
-        public void testGetStatisticsWithKoralQuery()
-                        throws IOException, KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .request()
-                                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                                .post(Entity.json("{ \"collection\" : {\"@type\": "
-                                                + "\"koral:doc\", \"key\": \"availability\", \"match\": "
-                                                + "\"match:eq\", \"type\": \"type:regex\", \"value\": "
-                                                + "\"CC.*\"} }"));
-                assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
-                                "Wes8Bd4h1OypPqbWF5njeQ==");
-                assertEquals(Status.OK.getStatusCode(), response.getStatus());
-                String ent = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(2, node.at("/documents").asInt());
-                assertEquals(72770, node.at("/tokens").asInt());
-                assertEquals(2985, node.at("/sentences").asInt());
-                assertEquals(128, node.at("/paragraphs").asInt());
-        }
-
-        @Test
-        public void testGetStatisticsWithEmptyCollection()
-                        throws IOException, KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .request()
-                                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                                .post(Entity.json("{}"));
-                assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-                String ent = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION,
-                                node.at("/errors/0/0").asInt());
-                assertEquals("VC is not found",
-                                node.at("/errors/0/1").asText());
-        }
-
-        @Test
-        public void testGetStatisticsWithIncorrectJson()
-                        throws IOException, KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .request()
-                                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                                .post(Entity.json("{ \"collection\" : }"));
-                assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-                String ent = response.readEntity(String.class);
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(StatusCodes.DESERIALIZATION_FAILED,
-                                node.at("/errors/0/0").asInt());
-                assertEquals("Failed deserializing json object: { \"collection\" : }",
-                                node.at("/errors/0/1").asText());
-        }
-
-        @Test
-        public void testGetStatisticsWithoutKoralQuery()
-                        throws IOException, KustvaktException {
-                Response response = target().path(API_VERSION).path("statistics")
-                                .request().post(Entity.json(""));
-                String ent = response.readEntity(String.class);
-                assertEquals(Status.OK.getStatusCode(), response.getStatus());
-                JsonNode node = JsonUtils.readTree(ent);
-                assertEquals(11, node.at("/documents").asInt());
-                assertEquals(665842, node.at("/tokens").asInt());
-                assertEquals(25074, node.at("/sentences").asInt());
-                assertEquals(772, node.at("/paragraphs").asInt());
-        }
-
+    @Test
+    public void testGetStatisticsWithoutKoralQuery ()
+            throws IOException, KustvaktException {
+        Response response = target().path(API_VERSION).path("statistics")
+                .request().post(Entity.json(""));
+        String ent = response.readEntity(String.class);
+        assertEquals(Status.OK.getStatusCode(), response.getStatus());
+        JsonNode node = JsonUtils.readTree(ent);
+        assertEquals(11, node.at("/documents").asInt());
+        assertEquals(665842, node.at("/tokens").asInt());
+        assertEquals(25074, node.at("/sentences").asInt());
+        assertEquals(772, node.at("/paragraphs").asInt());
+    }
+    
 }
diff --git a/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
index b9a625f..699536a 100644
--- a/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
@@ -21,7 +21,7 @@
 public class LiteStatisticControllerTest extends LiteJerseyTest {
 
     @Test
-    public void testStatisticsWithCq() throws KustvaktException {
+    public void testStatisticsWithCq () throws KustvaktException {
         Response response = target().path(API_VERSION).path("statistics")
                 .queryParam("cq", "textType=Abhandlung & corpusSigle=GOE")
                 .request().method("GET");
@@ -38,7 +38,7 @@
     }
 
     @Test
-    public void testStatisticsEmptyCq() throws KustvaktException {
+    public void testStatisticsEmptyCq () throws KustvaktException {
         Response response = target().path(API_VERSION).path("statistics")
                 .queryParam("cq", "").request().method("GET");
         assertEquals(Status.OK.getStatusCode(), response.getStatus());
@@ -60,7 +60,7 @@
     }
 
     @Test
-    public void testGetStatisticsWithKoralQuery()
+    public void testGetStatisticsWithKoralQuery ()
             throws IOException, KustvaktException {
         Response response = target().path(API_VERSION).path("statistics")
                 .request()
@@ -81,7 +81,7 @@
     }
 
     @Test
-    public void testGetStatisticsWithEmptyCollection()
+    public void testGetStatisticsWithEmptyCollection ()
             throws IOException, KustvaktException {
         Response response = target().path(API_VERSION).path("statistics")
                 .request()
@@ -93,11 +93,11 @@
         assertEquals(node.at("/errors/0/0").asInt(),
                 de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION);
         assertEquals(node.at("/errors/0/1").asText(),
-                "VC is not found");
+                "Collection is not found");
     }
 
     @Test
-    public void testGetStatisticsWithIncorrectJson()
+    public void testGetStatisticsWithIncorrectJson ()
             throws IOException, KustvaktException {
         Response response = target().path(API_VERSION).path("statistics")
                 .request()
@@ -113,7 +113,7 @@
     }
 
     @Test
-    public void testGetStatisticsWithoutKoralQuery()
+    public void testGetStatisticsWithoutKoralQuery ()
             throws IOException, KustvaktException {
         Response response = target().path(API_VERSION).path("statistics")
                 .request().post(Entity.json(""));
@@ -125,9 +125,9 @@
         assertEquals(25074, node.at("/sentences").asInt());
         assertEquals(772, node.at("/paragraphs").asInt());
     }
-
+    
     @Test
-    public void testStatisticsWithNamedVC() throws KustvaktException {
+    public void testStatisticsWithNamedVC () throws KustvaktException {
         Response response = target().path(API_VERSION).path("statistics")
                 .queryParam("cq", "referTo unknownVC")
                 .request().method("GET");