diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
index 758cc12161e0dd1b8015257613ffbd2fd1205e5d..adb95cda4d797730813ef1133eca58b03cb7db53 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
@@ -83,8 +83,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractFileSystemTest
     private static final String SCRIPTS_FOLDER =
             "sourceTest/java/ch/systemsx/cisd/etlserver/registrator/";
 
-    private static final String SHARED_SCRIPT_PATH = SCRIPTS_FOLDER + "script.py";
-
     private static final String DATA_SET_CODE = "data-set-code";
 
     private static final String DATABASE_INSTANCE_UUID = "db-uuid";
@@ -398,32 +396,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractFileSystemTest
         context.assertIsSatisfied();
     }
 
-    @Test
-    public void testDataSetRegistration()
-    {
-        setUpOpenBisExpectations();
-
-        createHandler();
-        createData();
-
-        setUpDataSetValidatorExpectations();
-        setUpMailClientExpectations();
-
-        handler.handle(markerFile);
-
-        // Causes problems in Hudson
-        // assertTrue(
-        // logAppender.getLogContent(),
-        // logAppender.getLogContent().endsWith(
-        // ".MARKER_is_finished_data_set' has been removed."));
-
-        assertEquals(2, MockStorageProcessor.instance.incomingDirs.size());
-        assertEquals(2, MockStorageProcessor.instance.calledCommitCount);
-        assertEquals(
-                "Data Set Code::data-set-code2;Data Set Type::O1;Experiment Identifier::/SPACE/PROJECT/EXP-CODE;Production Date::;Parent Data Sets::data-set-code1;Is complete::U",
-                MockStorageProcessor.instance.dataSetInfoString);
-    }
-
     @Test
     public void testTransactionWithNewExperiment()
     {
@@ -577,37 +549,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractFileSystemTest
         assertEquals(0, MockStorageProcessor.instance.calledCommitCount);
     }
 
-    @Test
-    public void testRegistrationFails()
-    {
-        setUpOpenBisExpectations();
-
-        // Create a handler that throws an exception during registration
-        Properties threadProperties = createThreadProperties(SHARED_SCRIPT_PATH);
-        createHandler(threadProperties, true);
-
-        createData();
-
-        setUpDataSetValidatorExpectations();
-        setUpMailClientExpectations();
-
-        didDataSetRollbackHappen = false;
-        didServiceRollbackHappen = false;
-
-        handler.handle(markerFile);
-
-        // Causes problems in Hudson
-        // assertTrue(
-        // logAppender.getLogContent(),
-        // logAppender.getLogContent().endsWith(
-        // ".MARKER_is_finished_data_set' has been removed."));
-
-        assertEquals(2, MockStorageProcessor.instance.incomingDirs.size());
-        assertEquals(0, MockStorageProcessor.instance.calledCommitCount);
-        assertTrue("Data set rollback should have been invoked", didDataSetRollbackHappen);
-        assertFalse("Service rollback should not have been invoked", didServiceRollbackHappen);
-    }
-
     private void createData()
     {
         incomingDataSetFile = createDirectory(workingDirectory, "data_set");
@@ -622,32 +563,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractFileSystemTest
         FileUtilities.writeToFile(markerFile, "");
     }
 
-    @Test
-    public void testRollbackDataSetRegistration()
-    {
-        setUpOpenBisExpectations();
-
-        // Create a handler that throws an exception during registration
-        Properties threadProperties = createThreadProperties(SCRIPTS_FOLDER + "rollback-script.py");
-        createHandler(threadProperties, true);
-
-        createData();
-
-        setUpDataSetValidatorExpectations();
-        setUpMailClientExpectations();
-
-        handler.handle(markerFile);
-
-        assertEquals(2, MockStorageProcessor.instance.incomingDirs.size());
-        assertEquals(0, MockStorageProcessor.instance.calledCommitCount);
-
-        TestingDataSetHandler theHandler = (TestingDataSetHandler) handler;
-        assertTrue("Python data set rollback should have run",
-                theHandler.didRollbackDataSetRegistrationFunctionRun);
-        assertFalse("Python service rollback should not have run",
-                theHandler.didRollbackServiceFunctionRun);
-    }
-
     @Test
     public void testRollbackService()
     {
@@ -760,13 +675,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractFileSystemTest
         return file;
     }
 
-    private void createHandler()
-    {
-        Properties threadProperties = createThreadProperties(SHARED_SCRIPT_PATH);
-
-        createHandler(threadProperties, false);
-    }
-
     private void createHandler(Properties threadProperties, final boolean registrationShouldFail)
     {
         createHandler(threadProperties, registrationShouldFail, false);
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/rollback-script.py b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/rollback-script.py
deleted file mode 100644
index 1b5a62c20f1194cb20644225ab9c62db70b938fe..0000000000000000000000000000000000000000
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/rollback-script.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier as identifier
-import java.io as io
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto as dto
-
-def rollback_data_set_registration(service, algorithm, throwable):
-	global didRollbackServiceFunctionRun
-	didRollbackServiceFunctionRun = True
-	
-def rollback_service(service, throwable):
-	global didRollbackServiceFunctionRun
-	didRollbackServiceFunctionRun = True
-	
-
-# Create the Experiment Identifier
-identifier = identifier.ExperimentIdentifierFactory("/SPACE/PROJECT/EXP-CODE").createIdentifier()
-
-# Register data set 1
-registrationDetails = factory.createRegistrationDetails()
-dataSetInformation = registrationDetails.getDataSetInformation()
-dataSetInformation.setExperimentIdentifier(identifier)
-registrationDetails.setDataSetType(dto.DataSetType("O1"));
-futureDataSet = service.queueDataSetRegistration(io.File(incoming, "sub_data_set_1"), registrationDetails)
-
-# Register data set 2
-registrationDetails = factory.createRegistrationDetails()
-dataSetInformation = registrationDetails.getDataSetInformation()
-dataSetInformation.setExperimentIdentifier(identifier)
-dataSetInformation.setParentDataSetCodes([futureDataSet.getCode()])
-registrationDetails.setDataSetType(dto.DataSetType("O1"));
-service.queueDataSetRegistration(io.File(incoming, "sub_data_set_2"), registrationDetails)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/script.py b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/script.py
deleted file mode 100644
index 0403c210ff7d141090661cd74565a52bec2c8c55..0000000000000000000000000000000000000000
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/script.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier as identifier
-import java.io as io
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto as dto
-
-# Create the Experiment Identifier
-identifier = identifier.ExperimentIdentifierFactory("/SPACE/PROJECT/EXP-CODE").createIdentifier()
-
-# Register data set 1
-registrationDetails = factory.createRegistrationDetails()
-dataSetInformation = registrationDetails.getDataSetInformation()
-dataSetInformation.setExperimentIdentifier(identifier)
-registrationDetails.setDataSetType(dto.DataSetType("O1"));
-futureDataSet = service.queueDataSetRegistration(io.File(incoming, "sub_data_set_1"), registrationDetails)
-
-# Register data set 2
-registrationDetails = factory.createRegistrationDetails()
-dataSetInformation = registrationDetails.getDataSetInformation()
-dataSetInformation.setExperimentIdentifier(identifier)
-dataSetInformation.setParentDataSetCodes([futureDataSet.getCode()])
-registrationDetails.setDataSetType(dto.DataSetType("O1"));
-service.queueDataSetRegistration(io.File(incoming, "sub_data_set_2"), registrationDetails)