diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/AssetTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/AssetTest.java
index cc9f571..ca0154a 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/AssetTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/AssetTest.java
@@ -4,18 +4,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 
 import java.util.Properties;
 
-import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Application;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/CsvExporterTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/CsvExporterTest.java
index 59cba3b..01f9978 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/CsvExporterTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/CsvExporterTest.java
@@ -3,10 +3,6 @@
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
 import org.junit.Test;
 
 import javax.ws.rs.core.Response;
diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/JsonExporterTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/JsonExporterTest.java
index c68c63c..fb74a2f 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/JsonExporterTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/JsonExporterTest.java
@@ -4,19 +4,11 @@
 import java.io.File;
 import java.io.BufferedReader;
 import java.io.FileReader;
-import java.io.InputStream;
-
-
-
 import javax.ws.rs.core.StreamingOutput;
 
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
 import org.junit.Test;
 
 import javax.ws.rs.core.Response;
diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/MatchAggregatorTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/MatchAggregatorTest.java
index 5acf32e..dccba95 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/MatchAggregatorTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/MatchAggregatorTest.java
@@ -6,11 +6,8 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
 import org.junit.Test;
 
-import de.ids_mannheim.korap.plkexport.MatchAggregator;
-
 public class MatchAggregatorTest {
 
     @Test
diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/MatchTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/MatchTest.java
index ebe7f12..4f4a8d3 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/MatchTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/MatchTest.java
@@ -3,18 +3,12 @@
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
 import org.junit.Test;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
-import de.ids_mannheim.korap.plkexport.Match;
-
 public class MatchTest {
 
     private static final ObjectMapper mapper = new ObjectMapper();
diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/RtfExporterTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/RtfExporterTest.java
index e4c5f46..9d838fd 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/RtfExporterTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/RtfExporterTest.java
@@ -3,11 +3,7 @@
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
 import java.util.Properties;
 
 import org.junit.Test;
diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/ServiceTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/ServiceTest.java
index 568aac4..ceb66e1 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/ServiceTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/ServiceTest.java
@@ -23,10 +23,7 @@
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
 
-import java.util.List;
 import java.util.LinkedList;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 
 import javax.ws.rs.client.Entity;
@@ -37,20 +34,13 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-// Logger loading
-import ch.qos.logback.classic.*;
-import org.slf4j.*;
-
 // SSE testing
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import org.glassfish.jersey.media.sse.EventListener;
 import org.glassfish.jersey.media.sse.EventSource;
-import org.glassfish.jersey.media.sse.InboundEvent;
 import org.glassfish.jersey.media.sse.SseFeature;
 import java.util.concurrent.TimeUnit;
-import javax.ws.rs.client.WebTarget;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.glassfish.jersey.server.ResourceConfig;
@@ -59,15 +49,10 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 
-import org.eclipse.jetty.server.Request;
-
 import static de.ids_mannheim.korap.plkexport.Service.getClientIP;
 
-import de.ids_mannheim.korap.plkexport.Util.*;
-
 
 public class ServiceTest extends JerseyTest {
 
diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/SnippetTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/SnippetTest.java
index a7f9268..b1483ac 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/SnippetTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/SnippetTest.java
@@ -1,16 +1,10 @@
 package de.ids_mannheim.korap.plkexport;
 
-import java.io.IOException;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
 import org.junit.Test;
 
-import de.ids_mannheim.korap.plkexport.Snippet;
-
 public class SnippetTest {
 
     @Test
diff --git a/src/test/java/de/ids_mannheim/korap/plkexport/UtilTest.java b/src/test/java/de/ids_mannheim/korap/plkexport/UtilTest.java
index 6b7abc7..9840d29 100644
--- a/src/test/java/de/ids_mannheim/korap/plkexport/UtilTest.java
+++ b/src/test/java/de/ids_mannheim/korap/plkexport/UtilTest.java
@@ -1,8 +1,6 @@
 package de.ids_mannheim.korap.plkexport;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import org.junit.Test;
 
 import static de.ids_mannheim.korap.plkexport.Util.*;