diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
index 901b3a62d4fcabf36190ac633afda78763004463..6cfc51d8654a90eae077efa0348bebcfd981880c 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
@@ -341,7 +341,7 @@ public class ETLServiceTest extends AbstractServerTestCase
                     one(sampleTypeDAO).tryFindSampleTypeByCode("MY_TYPE");
                     SampleTypePE sampleTypePE = new SampleTypePE();
                     sampleTypePE.setListable(Boolean.TRUE);
-                    sampleTypePE.setGeneratedFromHierarchyDepth(new Integer(2));
+                    sampleTypePE.setGeneratedFromHierarchyDepth(new Integer(1));
                     sampleTypePE.setContainerHierarchyDepth(new Integer(1));
                     sampleTypePE.setAutoGeneratedCode(Boolean.FALSE);
                     sampleTypePE.setSubcodeUnique(Boolean.FALSE);
@@ -351,7 +351,7 @@ public class ETLServiceTest extends AbstractServerTestCase
         SampleType sampleType = createService().getSampleType(SESSION_TOKEN, "MY_TYPE");
 
         assertEquals(true, sampleType.isListable());
-        assertEquals(2, sampleType.getGeneratedFromHierarchyDepth());
+        assertEquals(1, sampleType.getGeneratedFromHierarchyDepth());
         assertEquals(1, sampleType.getContainerHierarchyDepth());
         assertEquals(false, sampleType.isAutoGeneratedCode());
         context.assertIsSatisfied();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java
index 7c3f36c28064a0a1a8abb345aae8a80049383efa..c60e9d9679daec7a06105c9f7c3b8973a5a50939 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo.samplelister;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertTrue;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongSet;
@@ -172,7 +171,5 @@ public class SampleListingWorkerTest extends AbstractDAOTest
     {
         assertNotNull("ID:" + s.getId(), s.getGeneratedFrom());
         assertEquals("ID:" + s.getId(), PARENT_ID, s.getGeneratedFrom().getId().longValue());
-        assertNotNull("ID:" + s.getId(), s.getGeneratedFrom().getGeneratedFrom());
-        assertNull("ID:" + s.getId(), s.getGeneratedFrom().getGeneratedFrom().getGeneratedFrom());
     }
 }
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java
index ddd324bd88adea6d4f8ef6486e2fa46f4d93545f..9d9bc99edf07668e2b563e824d7ade7d52d33d6a 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java
@@ -169,7 +169,7 @@ public class SampleBrowsingTest extends GenericSystemTestCase
         assertNotNull(s.getInvalidation());
         assertEquals("/CISD/NEMO/EXP1", s.getExperiment().getIdentifier());
         assertEquals("CISD:/CISD/3V-123", s.getGeneratedFrom().getIdentifier());
-        assertEquals("CISD:/CISD/MP001-1", s.getGeneratedFrom().getGeneratedFrom().getIdentifier());
+        assertNull(s.getGeneratedFrom().getGeneratedFrom());
     }
 
     private void checkUserProperty(List<IEntityProperty> properties, String propertyCode,