diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.java
index a77535696b65cfdb8a51aebc5b1a67e360c29e55..f8be11c37ed99a7ee933556957d34547b2c64955 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.java
@@ -86,7 +86,7 @@ public class SearchDataSetTypeTest extends AbstractTest
                 + "DELETION_TEST: BACTERIUM[MATERIAL] DESCRIPTION[VARCHAR] ORGANISM[CONTROLLEDVOCABULARY:?], "
                 + "DELETION_TEST_CONTAINER: BACTERIUM[MATERIAL] DESCRIPTION[VARCHAR] ORGANISM[CONTROLLEDVOCABULARY:?], "
                 + "HCS_IMAGE: ANY_MATERIAL[MATERIAL] BACTERIUM[MATERIAL] COMMENT[VARCHAR] GENDER[CONTROLLEDVOCABULARY:?], "
-                + "HCS_IMAGE_ANALYSIS_DATA:, LINK_TYPE:, REQUIRES_EXPERIMENT:, UNKNOWN:, "
+                + "HCS_IMAGE_ANALYSIS_DATA:, IMAGING_DATA: $IMAGING_DATA_CONFIG[JSON], LINK_TYPE:, REQUIRES_EXPERIMENT:, UNKNOWN:, "
                 + "VALIDATED_CONTAINER_TYPE:, VALIDATED_IMPOSSIBLE_TO_UPDATE_TYPE:, VALIDATED_NORMAL_TYPE:]");
         v3api.logout(sessionToken);
     }
@@ -169,7 +169,7 @@ public class SearchDataSetTypeTest extends AbstractTest
                 + "DELETION_TEST: BACTERIUM[MATERIAL] ORGANISM[CONTROLLEDVOCABULARY:ORGANISM] DESCRIPTION[VARCHAR], "
                 + "DELETION_TEST_CONTAINER: BACTERIUM[MATERIAL] ORGANISM[CONTROLLEDVOCABULARY:ORGANISM] DESCRIPTION[VARCHAR], "
                 + "HCS_IMAGE: BACTERIUM[MATERIAL] ANY_MATERIAL[MATERIAL] GENDER[CONTROLLEDVOCABULARY:GENDER] COMMENT[VARCHAR], "
-                + "HCS_IMAGE_ANALYSIS_DATA:, LINK_TYPE:, REQUIRES_EXPERIMENT:, UNKNOWN:, "
+                + "HCS_IMAGE_ANALYSIS_DATA:, IMAGING_DATA: $IMAGING_DATA_CONFIG[JSON], LINK_TYPE:, REQUIRES_EXPERIMENT:, UNKNOWN:, "
                 + "VALIDATED_CONTAINER_TYPE:, VALIDATED_IMPOSSIBLE_TO_UPDATE_TYPE:, VALIDATED_NORMAL_TYPE:]");
         List<String> vocabularyCodes = new ArrayList<String>();
         for (DataSetType type : types)
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
index 67dfaacb050a15ed59cd6823d10cf2c719e72605..882916470f41d90537e0911d84fe7f1133edc743 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
@@ -3167,7 +3167,7 @@ public class CommonServerTest extends SystemTestCase
         if (user.isInstanceUserOrSpaceUserOrEnabledProjectUser())
         {
             List<PropertyType> types = commonServer.listPropertyTypes(session.getSessionToken(), false);
-            assertEquals(types.size(), 18);
+            assertEquals(types.size(), 19);
         } else
         {
             try
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
index 714e957dd3a9ba0188211b7ad9a10d2940805c22..05fadfbdd043dd767643adc1621940f253eaeb7d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
@@ -2039,8 +2039,8 @@ public class GeneralInformationServiceTest extends SystemTestCase
             });
         assertEquals("CONTAINER_TYPE", types.get(0).getCode());
         assertEquals("[]", types.get(0).getPropertyTypeGroups().toString());
-        assertEquals("HCS_IMAGE", types.get(4).getCode());
-        List<PropertyTypeGroup> groups = types.get(4).getPropertyTypeGroups();
+        assertEquals("HCS_IMAGE", types.get(5).getCode());
+        List<PropertyTypeGroup> groups = types.get(5).getPropertyTypeGroups();
         List<PropertyType> propertyTypes = groups.get(0).getPropertyTypes();
         Collections.sort(propertyTypes, new Comparator<PropertyType>()
             {