diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastModificationStateUpdater.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastModificationStateUpdater.java
index 191cc1d3dff3878696af499d8a1820bf21d4f3c7..44e11a563a079185a180ed030b92edc57c67925c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastModificationStateUpdater.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastModificationStateUpdater.java
@@ -50,10 +50,12 @@ class LastModificationStateUpdater extends AbstractAsyncCallback<LastModificatio
         this.commonService = viewContext.getCommonService();
         this.modificationObserver = modificationObserver;
         this.lastSeenModificationStateOrNull = null;
+        this.ignore();
     }
 
     public void update()
     {
+		reuse();
         commonService.getLastModificationState(this);
     }
 
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
index eefaa4647dcc24b82a9307c5a8dd0a41bf7320e7..c356d0a24f9e9f4541fa4cb78b81e392137e6753 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
@@ -38,6 +38,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.SampleBrow
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.SearchTest;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.VocabularyBrowserTest;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.VocabularyRegistrationTest;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset.GenericDataSetEditorTest;
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset.GenericDataSetViewerTest;
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentAttachmentDownloadTest;
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentEditorTest;
@@ -59,10 +60,7 @@ public class SystemTestSuite extends GWTTestSuite
         testSuite.addTestSuite(FileFormatTypeGridTest.class);
         testSuite.addTestSuite(DataSetSearchTest.class);
         testSuite.addTestSuite(GenericDataSetViewerTest.class);
-
-        // TODO 2009-11-09, PB : Uncomment after it is fixed and don't cause next test failure
-        // testSuite.addTestSuite(GenericDataSetEditorTest.class);
-
+        testSuite.addTestSuite(GenericDataSetEditorTest.class);
         testSuite.addTestSuite(AuthorizationManagementConsolTest.class);
         testSuite.addTestSuite(SampleBrowserTest.class);
         testSuite.addTestSuite(GenericSampleViewerTest.class);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/FillDataSetEditForm.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/FillDataSetEditForm.java
index 93fec9ddfccfff154984b663790270eaae7cada2..b942fd53f879a973c0409dca9f51a052803d831e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/FillDataSetEditForm.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/FillDataSetEditForm.java
@@ -86,7 +86,6 @@ public final class FillDataSetEditForm extends AbstractDefaultTestCommand
         }
         if (modifiedParentsOrNull != null)
         {
-            System.err.println(modifiedParentsOrNull);
             final TextArea parentsField =
                     (TextArea) GWTTestUtil.getWidgetWithID(DataSetParentsArea.createId(simpleId));
             parentsField.setRawValue(modifiedParentsOrNull);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
index f93a2b77d55506b53386c6de11d67fcd4eb74d78..edcf9dd19a432a88c759cc332a77c1df0441f0ce 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
@@ -66,7 +66,7 @@ public class GenericDataSetEditorTest extends AbstractGWTTestCase
         checkParents.expectedRow(new DataSetRow(oldParentCode));
         remoteConsole.prepare(checkDataSet);
 
-        launchTest(25 * SECOND);
+        launchTest(30 * SECOND);
     }
 
     // could be removed when we implement BO unit test or merged with first test
@@ -85,7 +85,7 @@ public class GenericDataSetEditorTest extends AbstractGWTTestCase
                                 + "' and cannot be at the same time set as its child.");
         remoteConsole.prepare(failureExpectation);
 
-        launchTest(20 * SECOND);
+        launchTest(30 * SECOND);
     }
 
     private void prepareShowDataSetEditor(String dataSetCode)