diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index c78f0ef98fccfd69516aa384ac349a734c92969b..e8104f60f2f012cc5fcf6a7af291e07576b052ae 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -1219,7 +1219,8 @@ public final class CommonServerTest extends AbstractServerTestCase
 
                     one(entityTypePropertyTypeBO).countAssignmentValues(propertyTypeCode,
                             entityTypeCode);
-                    will(returnValue(1)); // TODO BO test
+                    will(returnValue(1));
+                    // TODO 2009-09-10, Piotr Buczek: write BO and DAO tests
                 }
             });
 
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java
index 34bd3cd9550ea4888607c0fc98ba5a8da8244f0a..1236dab12c0b093746af4f1c1115d07160b7832a 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java
@@ -68,7 +68,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.types.DataSetTypeCode;
  * @author Franz-Josef Elmer
  */
 // TODO 2009-09-10, Piotr Buczek: write tests with many parents and cycle check
-@Test(groups="broken")
 public class ExternalDataBOTest extends AbstractBOTest
 {
     private static final TechId TECH_ID = new TechId(42l);
@@ -405,7 +404,8 @@ public class ExternalDataBOTest extends AbstractBOTest
         context.checking(new Expectations()
             {
                 {
-                    one(externalDataDAO).tryGetByTechId(TECH_ID, ExternalDataBO.PROPERTY_TYPES);
+                    one(externalDataDAO).tryGetByTechId(TECH_ID, ExternalDataBO.PROPERTY_TYPES,
+                            ExternalDataBO.DATA_SET_TYPE);
                     will(returnValue(dataSet));
 
                     one(propertiesConverter).updateProperties(
@@ -434,7 +434,8 @@ public class ExternalDataBOTest extends AbstractBOTest
         context.checking(new Expectations()
             {
                 {
-                    one(externalDataDAO).tryGetByTechId(TECH_ID, ExternalDataBO.PROPERTY_TYPES);
+                    one(externalDataDAO).tryGetByTechId(TECH_ID, ExternalDataBO.PROPERTY_TYPES,
+                            ExternalDataBO.DATA_SET_TYPE);
                     will(returnValue(dataSet));
 
                     ExperimentIdentifier identifier = EXPERIMENT_IDENTIFIER;