diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
index 033854366e26aa3eb3286de91606674e5ca79c09..5361990b16cd6d8ca6ecd987e3798bf4d7f241c2 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
@@ -15,8 +15,6 @@ import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
 public class OaiPmhDARIAHTest {
 
   public static OAI_ESClient oaiEsClient;
-  DeletedRecordType deletedRecordType = DeletedRecordType.NO;
-  GranularityType granularityType = GranularityType.YYYY_MM_DD_THH_MM_SS_Z;
 
   private static RecordDelivererDC record;
   private static RecordListDelivererDC recordList;
@@ -24,8 +22,10 @@ public class OaiPmhDARIAHTest {
   private static MetadataFormatListDeliverer metadataFormatList = new MetadataFormatListDeliverer();
   private static SetDeliverer setListDARIAH = new SetDeliverer(false, true);
 
+  private DeletedRecordType deletedRecordType = DeletedRecordType.NO;
+  private GranularityType granularityType = GranularityType.YYYY_MM_DD_THH_MM_SS_Z;
   private RepIdentification rep = new RepIdentification("DARIAH-DE Repository",
-      "http://trep.de.dariah.eu", this.deletedRecordType, "2011-06-11T02:32:40Z",
+      "https://trep.de.dariah.eu", this.deletedRecordType, "2011-06-11T02:32:40Z",
       this.granularityType, "2.0", "funk@sub.uni-goettingen.de");
 
   /**
@@ -46,8 +46,8 @@ public class OaiPmhDARIAHTest {
    */
   @BeforeClass
   public static void setUp() throws Exception {
-		int[] ports = new int[] {9202};
-		oaiEsClient = new OAI_ESClient("localhost", ports, 100);
+    int[] ports = new int[] {9202};
+    oaiEsClient = new OAI_ESClient("localhost", ports, 100);
     OAI_ESClient.setEsIndex("dariah-public");
     OAI_ESClient.setEsType("metadata");
 
@@ -61,7 +61,6 @@ public class OaiPmhDARIAHTest {
    */
   @Test
   public void testGetRequestIdentify() throws ParseException {
-
     System.out.println("Test for the verb \"Identify\" with succesfull response");
     String r = this.request.getRequest("Identify", "", "", "", "", "", "");
     System.out.println(r);
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java
index 2778d6f2aad9da32a8d60656f2da6c10f82cbaf2..83088d6bf9e3d33951d2209d81ac6fed07424748 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java
@@ -9,6 +9,7 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import info.textgrid.utils.httpclient.TGHttpClient;
 import info.textgrid.utils.httpclient.TGHttpResponse;
@@ -20,6 +21,7 @@ import info.textgrid.utils.httpclient.TGHttpResponse;
  * 
  * @author Stefan E. Funk, SUB Göttingen
  */
+@Ignore
 public class OaiPmhDariahdeOnlineTests {
 
   // The OAIPMH host to be tested.
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
index ddbb484b7c6e7cce757520d273e30bd3f8f60ab7..ccae2d37c7276f56cf385e7e5940a3e7aa219a3f 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -42,15 +42,10 @@ public class OaiPmhTest {
   private RepIdentification rep = new RepIdentification("TextGrid-Repository", "www.textgridrep.de",
       this.bla, "2011-06-11T02:32:40Z", this.bla2, "2.0", "textgrid-support@gwdg.de");
   private MetadataFormatListDeliverer metadataFormatList = new MetadataFormatListDeliverer();
-  // FIXME Why is setdeliverer commented out here again?
-  // private SetDeliverer setListDARIAH = new SetDeliverer(false, true);
   private OAIPMHImpl request = new OAIPMHImpl(
       this.rep, OaiPmhTest.record, OaiPmhTest.recordIDIOM, OaiPmhTest.recordList,
       OaiPmhTest.recordListIDIOM, this.metadataFormatList,
       OaiPmhTest.setListTextGrid, OaiPmhTest.identifierList, OaiPmhTest.identifierListIDIOM);
-  // FIXME from develop branch... not needed?
-  // private SetDeliverer setListDARIAH = new SetDeliverer(false, true);
-  // private SetDeliverer setListTextGrid = new SetDeliverer(true, false);
 
   /**
    * @throws Exception
@@ -180,7 +175,7 @@ public class OaiPmhTest {
     record.setLanguages(TGConstants.LANGUAGE_LIST);
     record.setPublishers(TGConstants.PUBLISHER_LIST);
     record.setRelations(TGConstants.RELATIONS_LIST);
-    //record.setRelationsForWork(TGConstants.RELATIONS_FOR_WORK_LIST);
+    // record.setRelationsForWork(TGConstants.RELATIONS_FOR_WORK_LIST);
     record.setRights(TGConstants.RIGHTS_LIST);
     record.setSources(TGConstants.SOURCE_LIST);
     record.setSubjects(TGConstants.SUBJECT_LIST);
@@ -418,11 +413,6 @@ public class OaiPmhTest {
     OaiPmhTest.recordList.setModifiedField(TGConstants.CREATED);
     OaiPmhTest.recordList.setIdentifierField(TGConstants.URI);
     OaiPmhTest.recordList.setSearchResponseSize("100");
-
-    // FIXME Left over from develop branch... needed?
-    // JAXBElement<OAIPMHType> r =
-    // this.request.getRequest("ListRecords", "", "oai_dc",
-    // "project:TGPR-ed7c757e-1ead-69d4-7c17-554a3581925c", "", "", "");
     String r = this.request.getRequest("ListRecords", "", "oai_dc", "", "", "", "");
     System.out.println(r);
     System.out.println("-----------------------------------\n");
@@ -468,6 +458,8 @@ public class OaiPmhTest {
   /**
    * @throws ParseException
    */
+  @Test
+  @Ignore
   public void testListSetsDH() throws ParseException {
     OaiPmhTest.setListTextGrid.setFormatField("format");
     OaiPmhTest.setListTextGrid.setFormatToFilter(TextGridMimetypes.DARIAH_COLLECTION);
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
index a8ed9cfedf4047fd712eff791c0c04f91f749c68..76c207b96e226120c680110eb3de550de449fac4 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
@@ -14,6 +14,7 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import info.textgrid.utils.httpclient.TGHttpClient;
 import info.textgrid.utils.httpclient.TGHttpResponse;
@@ -25,6 +26,7 @@ import info.textgrid.utils.httpclient.TGHttpResponse;
  * 
  * @author Stefan E. Funk, SUB Göttingen
  */
+@Ignore
 public class OaiPmhTextgridOnlineTests {
 
   private static final String OAI_DC_PREFIX = "oai_dc";
@@ -951,7 +953,6 @@ public class OaiPmhTextgridOnlineTests {
 
       return true;
     }
-
   }
 
 }