diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProviderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProviderTest.java
index d32e3046c9f6c4d88c4551a80f20d97ee69f4011..e2dfd74cc273f37fabedce65bbe42dbfe1516087 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProviderTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/PlateMetadataProviderTest.java
@@ -98,7 +98,7 @@ public class PlateMetadataProviderTest extends AbstractServerTestCase
         assertEquals(1, headers.get(1).getIndex());
         assertEquals(DataTypeCode.VARCHAR, headers.get(1).getDataType());
         assertEquals("answer", headers.get(2).getTitle());
-        assertEquals(CONTENT_PROPERTY_PREFIX + "ANSWER", headers.get(2).getId());
+        assertEquals(CONTENT_PROPERTY_PREFIX + "USER-ANSWER", headers.get(2).getId());
         assertEquals(2, headers.get(2).getIndex());
         assertEquals(DataTypeCode.INTEGER, headers.get(2).getDataType());
         assertEquals(3, headers.size());
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/ObjectCreationUtilForTests.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/ObjectCreationUtilForTests.java
index 133195733a9adeecc8b1b810cb0472c0c10adb47..bcba7410cef108b5df33b701566c617843f2d271 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/ObjectCreationUtilForTests.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/ObjectCreationUtilForTests.java
@@ -32,6 +32,7 @@ public class ObjectCreationUtilForTests
         PropertyType propertyType = new PropertyType();
         propertyType.setLabel(label);
         propertyType.setCode(label.toUpperCase());
+        propertyType.setSimpleCode(propertyType.getCode());
         propertyType.setDataType(new DataType(DataTypeCode.INTEGER));
         property.setPropertyType(propertyType);
         property.setValue("" + value);