diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
index 889e010bade35af3e2e0e210778c44e6b48cefba..023377cdbd0b7cc4d8b2cf992b8aea2d48d97406 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
@@ -640,12 +640,6 @@ public class DataBOTest extends AbstractBOTest
         { dataSet.getCode() };
         dataSetUpdatesDTO.setModifiedParentDatasetCodesOrNull(parentCodes);
         prepareForUpdate(dataSet, experiment);
-        context.checking(new Expectations()
-            {
-                {
-                    one(relationshipService).assignDataSetToSample(EXAMPLE_SESSION, dataSet, null);
-                }
-            });
 
         IDataBO dataBO = createDataBO();
         try
@@ -679,8 +673,6 @@ public class DataBOTest extends AbstractBOTest
                 {
                     one(dataDAO).tryToFindDataSetByCode(PARENT_CODE);
                     will(returnValue(null));
-                    
-                    one(relationshipService).assignDataSetToSample(EXAMPLE_SESSION, dataSet, null);
                 }
             });
 
@@ -717,8 +709,6 @@ public class DataBOTest extends AbstractBOTest
                 {
                     one(dataDAO).tryToFindDataSetByCode(COMPONENT_CODE);
                     will(returnValue(null));
-                    
-                    one(relationshipService).assignDataSetToSample(EXAMPLE_SESSION, dataSet, null);
                 }
             });
 
@@ -774,7 +764,6 @@ public class DataBOTest extends AbstractBOTest
 
                     one(dataDAO).validateAndSaveUpdatedEntity(ds1);
 
-                    one(relationshipService).assignDataSetToSample(EXAMPLE_SESSION, ds1, null);
                 }
             });
 
@@ -799,12 +788,6 @@ public class DataBOTest extends AbstractBOTest
         { dataSet.getCode() };
         dataSetUpdatesDTO.setModifiedContainedDatasetCodesOrNull(componentCodes);
         prepareForUpdate(dataSet, experiment);
-        context.checking(new Expectations()
-            {
-                {
-                    one(relationshipService).assignDataSetToSample(EXAMPLE_SESSION, dataSet, null);
-                }
-            });
 
         IDataBO dataBO = createDataBO();
         try
@@ -837,8 +820,6 @@ public class DataBOTest extends AbstractBOTest
                 {
                     one(relationshipTypeDAO).tryFindRelationshipTypeByCode(BasicConstant.CONTAINER_COMPONENT_INTERNAL_RELATIONSHIP);
                     will(returnValue(relationshipTypePE));
-
-                    one(relationshipService).assignDataSetToSample(EXAMPLE_SESSION, container1, null);
                 }
             });
         RelationshipTypePE containerComponentRelationshipType = RelationshipUtils