diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
index 28e4e5b874f75d93371416a0ea46e5b8e1090ea1..59eeeb5da5299193ead8e27b223fb9ed37e00bb0 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -385,6 +385,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
           e.setError(OAIPMHConstants.OAI_BAD_RESUMPTION_TOKEN, "The value of the "
               + request.getResumptionToken() + " argument is invalid or expired.");
           oaipmhRoot.getError().add(e.getError());
+          return oaipmhRoot;
         }
       }
 
@@ -574,6 +575,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
           e.setError(OAIPMHConstants.OAI_BAD_RESUMPTION_TOKEN, "The value of the "
               + request.getResumptionToken() + " argument is invalid or expired.");
           oaipmhRoot.getError().add(e.getError());
+          return oaipmhRoot;
         }
       }
 
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestUtilities.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestUtilities.java
index 3190f45cdfc6429c56e329e27ab7e4b823243ad6..d53d1349bfe6fe34673eccfd0f96deb0ccf41581 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestUtilities.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestUtilities.java
@@ -44,7 +44,7 @@ public class OaiPmhTestUtilities {
   // Time to wait between the single queries using resumption tokens in milliseconds.
   protected static final Long TIME = 275l;
 
-  protected static final long OAIPMH_CLIENT_TIMEOUT = 30000;
+  protected static final long OAIPMH_CLIENT_TIMEOUT = 120000;
 
   /**
    * @param theClient
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 f72f241f0cf670354330f4b872b8705a0b69e8d8..fee8ac289e4f6535dd7aa5e142cb9a48c1c91af1 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
@@ -30,7 +30,7 @@ import org.junit.Test;
  * 
  * @author Stefan E. Funk, SUB Göttingen
  */
-@Ignore
+// @Ignore
 public class OaiPmhTextgridOnlineTests {
 
   // TODO Configure config files for all the different OAI-PMH service instances!
@@ -1471,8 +1471,6 @@ public class OaiPmhTextgridOnlineTests {
    */
   private static void examineContent(String theResponseString, String theMetadataFormat) {
 
-    System.out.println(theResponseString);
-
     // Check for correct metadata content according to metadata prefix.
     if (theMetadataFormat.equals(OAIDC_SCHEMA_FORMAT)
         && !theResponseString.contains("metadataPrefix=\"" + OAIDC_SCHEMA_FORMAT + "\"")