diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DeletionTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DeletionTest.java
index add898d6a45455bc18ce26e69f06ea0c953f2fc8..da6d96f0c1d1d3b3d9c529cb872633fb84562947 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DeletionTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DeletionTest.java
@@ -834,10 +834,10 @@ public abstract class DeletionTest extends AbstractTest
         v3api.updateDataSets(sessionToken, Arrays.asList(update));
     }
 
-    protected void setProperties(IMaterialId sample, String... properties)
+    protected void setProperties(IMaterialId material, String... properties)
     {
         MaterialUpdate update = new MaterialUpdate();
-        update.setMaterialId(sample);
+        update.setMaterialId(material);
         for (Map.Entry<String, String> entry : props(properties).entrySet())
         {
             update.setProperty(entry.getKey(), entry.getValue());
@@ -845,10 +845,10 @@ public abstract class DeletionTest extends AbstractTest
         v3api.updateMaterials(sessionToken, Arrays.asList(update));
     }
 
-    protected void setProperties(IExperimentId sample, String... properties)
+    protected void setProperties(IExperimentId experiment, String... properties)
     {
         ExperimentUpdate update = new ExperimentUpdate();
-        update.setExperimentId(sample);
+        update.setExperimentId(experiment);
         for (Map.Entry<String, String> entry : props(properties).entrySet())
         {
             update.setProperty(entry.getKey(), entry.getValue());
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ExperimentDeletionTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ExperimentDeletionTest.java
index 8626fbe3b34edc3c27f3e1a36dd12d4e9e7fa468..711fd5e2e3cc1955e7c988990c0b7db207080782 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ExperimentDeletionTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ExperimentDeletionTest.java
@@ -77,6 +77,7 @@ public class ExperimentDeletionTest extends DeletionTest
     }
 
     @Test
+    @Rollback(false)
     public void moveExperimentToAnotherProject() throws Exception
     {
         SpacePermId space1 = createSpace("SPACE1");
@@ -86,6 +87,8 @@ public class ExperimentDeletionTest extends DeletionTest
         ProjectPermId project2 = createProject(space2, "PROJECT2");
 
         ExperimentPermId experiment = createExperiment(project1, "EXPERIMENT");
+        
+        newTx();
 
         ExperimentUpdate update = new ExperimentUpdate();
         update.setExperimentId(experiment);
@@ -93,6 +96,10 @@ public class ExperimentDeletionTest extends DeletionTest
         v3api.updateExperiments(sessionToken, Arrays.asList(update));
 
         delete(experiment);
+        delete(project1);
+        delete(project2);
+        delete(space1);
+        delete(space2);
 
         assertHistory(experiment.getPermId(), "OWNED", projectSet(project1.getPermId()), 
                 projectSet(project2.getPermId()));
@@ -144,7 +151,7 @@ public class ExperimentDeletionTest extends DeletionTest
         delete(project);
         delete(space);
 
-        assertHistory(experiment.getPermId(), "OWNER", unknownSet(dataset1.getPermId()), 
+        assertHistory(experiment.getPermId(), "OWNER",  
                 unknownSet(dataset1.getPermId(), dataset2.getPermId()),
                 unknownSet(dataset2.getPermId()),
                 set());
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ProjectDeletionTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ProjectDeletionTest.java
index 369a7c27c358ec868172fb5163b5fe4cca2eb34d..5bd50f794b7cdb1ceb57f14a43903c044049e476 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ProjectDeletionTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ProjectDeletionTest.java
@@ -103,6 +103,7 @@ public class ProjectDeletionTest extends DeletionTest
     }
 
     @Test
+    @Rollback(false)
     public void moveProjectToAnotherSpace() throws Exception
     {
         SpacePermId space1 = createSpace("SPACE1");
@@ -110,17 +111,21 @@ public class ProjectDeletionTest extends DeletionTest
 
         ProjectPermId project = createProject(space1, "PROJECT");
 
+        newTx();
         ProjectUpdate projectUpdate = new ProjectUpdate();
         projectUpdate.setProjectId(project);
         projectUpdate.setSpaceId(space2);
         v3api.updateProjects(sessionToken, Arrays.asList(projectUpdate));
 
         delete(project);
+        delete(space1);
+        delete(space2);
 
         assertHistory(project.getPermId(), "OWNED", spaceSet("SPACE1"), spaceSet("SPACE2"));
     }
 
     @Test
+    @Rollback(false)
     public void assignExperimentsToProject() throws Exception
     {
         SpacePermId space = createSpace("SPACE");
@@ -131,6 +136,7 @@ public class ProjectDeletionTest extends DeletionTest
         ExperimentPermId experiment1 = createExperiment(project1, "EXPERIMENT1");
         ExperimentPermId experiment2 = createExperiment(project1, "EXPERIMENT2");
 
+        newTx();
         ExperimentUpdate experimentUpdate1 = new ExperimentUpdate();
         experimentUpdate1.setExperimentId(experiment1);
         experimentUpdate1.setProjectId(project2);
@@ -141,8 +147,12 @@ public class ProjectDeletionTest extends DeletionTest
         v3api.updateExperiments(sessionToken, Arrays.asList(experimentUpdate1, experimentUpdate2));
 
         delete(project1);
+        delete(experiment1);
+        delete(experiment2);
+        delete(project2);
+        delete(space);
 
-        assertHistory(project1.getPermId(), "OWNER", experimentSet(experiment1.getPermId()), 
+        assertHistory(project1.getPermId(), "OWNER",  
                 experimentSet(experiment1.getPermId(), experiment2.getPermId()), set());
     }
 }
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java
index dc4d10497bb5aef8bb2e6bde5a6a441c97cc67bb..5c2049178ba9789f307d7269ed6e13fd3e224d95 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java
@@ -17,6 +17,7 @@
 package ch.systemsx.cisd.openbis.generic.server.business.bo;
 
 import java.lang.reflect.Method;
+import java.util.Date;
 
 import org.jmock.Expectations;
 import org.jmock.Mockery;
@@ -236,6 +237,8 @@ public abstract class AbstractBOTest extends AssertJUnit
                     will(returnValue(permIdDAO));
                     allowing(daoFactory).getRelationshipTypeDAO();
                     will(returnValue(relationshipTypeDAO));
+                    allowing(daoFactory).getTransactionTimestamp();
+                    will(returnValue(new Date()));
                 }
             });
     }