diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java
index bcb1f74068b74f0f45b06fe05afaf6871bc0849e..4205e1606d7d0ec9d47d9b3893c7d8bbe433cdd2 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithm.java
@@ -46,6 +46,7 @@ import ch.systemsx.cisd.etlserver.IStorageProcessor;
 import ch.systemsx.cisd.etlserver.IStorageProcessor.UnstoreDataAction;
 import ch.systemsx.cisd.etlserver.TransferredDataSetHandler;
 import ch.systemsx.cisd.etlserver.validation.IDataSetValidator;
+import ch.systemsx.cisd.openbis.dss.generic.server.DataStoreService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
 import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
@@ -338,6 +339,8 @@ public class DataSetStorageAlgorithm<T extends DataSetInformation>
         protected final File createBaseDirectory(final IDataStoreStrategy strategy,
                 final File baseDir, final DataSetInformation dataSetInfo)
         {
+            // TODO replace by mapping
+            dataSetInfo.setShareId(DataStoreService.DEFAULT_SHARE_ID);
             final File baseDirectory =
                     strategy.getBaseDirectory(baseDir, dataSetInfo,
                             storageAlgorithm.getDataSetType());
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
index ec532bd3c9cb0a1eb8b38e6fa41cdd939ac7896b..ea61b3cbd551244349a28c9018cff9c1e2cd90c1 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
@@ -34,6 +34,7 @@ import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.filesystem.QueueingPathRemoverService;
 import ch.systemsx.cisd.common.logging.BufferedAppender;
+import ch.systemsx.cisd.common.logging.LogMatcher;
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.utilities.ExtendedProperties;
 import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
@@ -146,22 +147,13 @@ public class DataSetRegistrationTransactionTest extends AbstractFileSystemTestCa
 
         tr.commit();
 
-        // assertTrue(
-        // logAppender.getLogContent(),
-        // logAppender
-        // .getLogContent()
-        // .matches(
-        // "No pre-registration script found, skipping execution.\n"
-        // + "No post-registration script found, skipping execution.\n"
-        // + "Identified that database knows experiment '/SPACE/PROJECT/EXP-CODE'.\n"
-        // + "Start storing data set for experiment '/SPACE/PROJECT/EXP-CODE'.\n"
-        // + "Finished storing data set for experiment '/SPACE/PROJECT/EXP-CODE', took .*\n"
-        // + "Successfully registered data set: .*\n"
-        // + "Successfully registered data set: .*\n"
-        // + "Dataset deleted in registration: clean up failed"));
-
-        // Changed temporarily to fix a problem on Hudson.
-        assertTrue(logAppender.getLogContent().length() > 0);
+        new LogMatcher(logAppender, "No pre-registration script found, skipping execution.*",
+                "No post-registration script found, skipping execution.*",
+                "Identified that database knows experiment '/SPACE/PROJECT/EXP-CODE'.*",
+                "Identified that database knows experiment '/SPACE/PROJECT/EXP-CODE'.*",
+                "Start storing data set for experiment '/SPACE/PROJECT/EXP-CODE'.*",
+                "Finished storing data set for experiment '/SPACE/PROJECT/EXP-CODE', took .*",
+                "Successfully registered data set: .+").assertMatches();
 
         rollbackQueueFiles = listRollbackQueueFiles();
         assertEquals(0, rollbackQueueFiles.length);
@@ -547,4 +539,5 @@ public class DataSetRegistrationTransactionTest extends AbstractFileSystemTestCa
                 new DataSetRegistrationTransaction<DataSetInformation>(workingDirectory,
                         workingDirectory, stagingDirectory, service, handler);
     }
+
 }