diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java
index 0b448d6e67b3d9038cd728b28531bca510bd5082..f50d36954d126bf3345460560fcbb63024dc2608 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java
@@ -1000,7 +1000,7 @@ public final class GenericClientServiceTest extends AbstractClientServiceTest
             int i = -1;
             for (final IEntityProperty sampleProperty : sampleProperties)
             {
-                if (StringUtils.equals(sampleProperty.getValue(), properties[++i].getValue()) == false
+                if (StringUtils.equals(sampleProperty.getStringValue(), properties[++i].getStringValue()) == false
                         || StringUtils.equals(getPropertyTypeCode(sampleProperty),
                                 getPropertyTypeCode(properties[i])) == false)
                 {
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java
index 08383b918f760b0730a663ebec7676dddb950021..53c3f52be2a71459e1ed3862b6ae5df1119d331a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java
@@ -130,7 +130,7 @@ public class DynamicPropertiesEvaluationTest extends GenericSystemTestCase
                             if (property.getPropertyType().getCode().equals(DESCRIPTION))
                             {
                                 assertEquals(sample.getCode(),
-                                        property.getValue().substring(0, sample.getCode().length()));
+                                        property.getStringValue().substring(0, sample.getCode().length()));
                                 found = true;
                                 break;
                             }
@@ -166,7 +166,7 @@ public class DynamicPropertiesEvaluationTest extends GenericSystemTestCase
                         {
                             assertEquals(NEW_SAMPLE_CODE, loadedSample.getCode());
                             assertEquals(NEW_SAMPLE_CODE,
-                                    property.getValue().substring(0, NEW_SAMPLE_CODE.length()));
+                                    property.getStringValue().substring(0, NEW_SAMPLE_CODE.length()));
 
                             found = true;
                             break;
@@ -237,9 +237,9 @@ public class DynamicPropertiesEvaluationTest extends GenericSystemTestCase
                             if (property.getPropertyType().getCode().equals(propertyTypeCode))
                             {
                                 assertTrue(dateBefore.getTime() < Long.parseLong(property
-                                        .getValue()));
+                                        .getStringValue()));
                                 assertTrue(dateAfter.getTime() > Long
-                                        .parseLong(property.getValue()));
+                                        .parseLong(property.getStringValue()));
                                 found = true;
                                 break;
                             }
@@ -287,7 +287,7 @@ public class DynamicPropertiesEvaluationTest extends GenericSystemTestCase
                         {
                             if (property.getPropertyType().getCode().equals(DESCRIPTION))
                             {
-                                String[] dynPropertyValue = property.getValue().split("\\s+");
+                                String[] dynPropertyValue = property.getStringValue().split("\\s+");
 
                                 assertEquals(NEW_SAMPLE_CODE, dynPropertyValue[0]);