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 5d21ff768e9a499b17c35ca45c97d76de558396a..a77535696b65cfdb8a51aebc5b1a67e360c29e55 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
@@ -59,7 +59,7 @@ public class SearchDataSetTypeTest extends AbstractTest
         List<String> codes = extractCodes(types);
         Collections.sort(codes);
         assertEquals(codes.toString(), "[CONTAINER_TYPE, DELETION_TEST, DELETION_TEST_CONTAINER, HCS_IMAGE, "
-                + "HCS_IMAGE_ANALYSIS_DATA, LINK_TYPE, REQUIRES_EXPERIMENT, UNKNOWN, VALIDATED_CONTAINER_TYPE, "
+                + "HCS_IMAGE_ANALYSIS_DATA, IMAGING_DATA, LINK_TYPE, REQUIRES_EXPERIMENT, UNKNOWN, VALIDATED_CONTAINER_TYPE, "
                 + "VALIDATED_IMPOSSIBLE_TO_UPDATE_TYPE, VALIDATED_NORMAL_TYPE]");
         assertEquals(types.get(0).getFetchOptions().hasPropertyAssignments(), true);
         v3api.logout(sessionToken);
@@ -79,7 +79,7 @@ public class SearchDataSetTypeTest extends AbstractTest
         List<String> codes = extractCodes(types);
         Collections.sort(codes);
         assertEquals(codes.toString(), "[CONTAINER_TYPE, DELETION_TEST, DELETION_TEST_CONTAINER, HCS_IMAGE, "
-                + "HCS_IMAGE_ANALYSIS_DATA, LINK_TYPE, REQUIRES_EXPERIMENT, UNKNOWN, VALIDATED_CONTAINER_TYPE, "
+                + "HCS_IMAGE_ANALYSIS_DATA, IMAGING_DATA, LINK_TYPE, REQUIRES_EXPERIMENT, UNKNOWN, VALIDATED_CONTAINER_TYPE, "
                 + "VALIDATED_IMPOSSIBLE_TO_UPDATE_TYPE, VALIDATED_NORMAL_TYPE]");
         assertEquals(types.get(0).getFetchOptions().hasPropertyAssignments(), true);
         assertEquals(getDataSetTypePropertyTypeInfo(types).toString(), "[CONTAINER_TYPE:, "
@@ -162,7 +162,7 @@ public class SearchDataSetTypeTest extends AbstractTest
         List<String> codes = extractCodes(types);
         Collections.sort(codes);
         assertEquals(codes.toString(), "[CONTAINER_TYPE, DELETION_TEST, DELETION_TEST_CONTAINER, HCS_IMAGE, "
-                + "HCS_IMAGE_ANALYSIS_DATA, LINK_TYPE, REQUIRES_EXPERIMENT, UNKNOWN, VALIDATED_CONTAINER_TYPE, "
+                + "HCS_IMAGE_ANALYSIS_DATA, IMAGING_DATA, LINK_TYPE, REQUIRES_EXPERIMENT, UNKNOWN, VALIDATED_CONTAINER_TYPE, "
                 + "VALIDATED_IMPOSSIBLE_TO_UPDATE_TYPE, VALIDATED_NORMAL_TYPE]");
         assertEquals(types.get(0).getFetchOptions().hasPropertyAssignments(), true);
         assertEquals(getDataSetTypePropertyTypeInfo(types).toString(), "[CONTAINER_TYPE:, "
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyTypeTest.java
index 3df0e2f7e84c5362bfe248099cc6c0ead94950c8..ae1ace762d00b531b4039615f23501cabd66ce37 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyTypeTest.java
@@ -36,7 +36,7 @@ public class SearchPropertyTypeTest extends AbstractTest
     @Test
     public void testSearchWithEmptyCriteria()
     {
-        testSearch(TEST_SPACE_USER, new PropertyTypeSearchCriteria(), 18);
+        testSearch(TEST_SPACE_USER, new PropertyTypeSearchCriteria(), 19);
     }
 
     @Test
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
index 315a706739a0752149a432dc5f8baeb8cc530e5a..ae266dddabb1cdf6a59a8521cc61475ecaf55c85 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
@@ -564,7 +564,7 @@ public class GeneralInformationServiceJsonApiTest extends RemoteApiTestCase
     public void testListDataSetTypes()
     {
         List<DataSetType> dataSetTypes = generalInformationService.listDataSetTypes(sessionToken);
-        assertEquals(11, dataSetTypes.size());
+        assertEquals(12, dataSetTypes.size());
 
         Collections.sort(dataSetTypes, new ToStringComparator());
         DataSetType dataSetType = dataSetTypes.get(3);
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 19231c6417df3b58e283911b0d80460a9113bf4a..67dfaacb050a15ed59cd6823d10cf2c719e72605 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
@@ -3404,7 +3404,7 @@ public class CommonServerTest extends SystemTestCase
         if (user.isInstanceUserOrSpaceUserOrEnabledProjectUser())
         {
             List<DataSetType> types = commonServer.listDataSetTypes(session.getSessionToken());
-            assertEquals(types.size(), 11);
+            assertEquals(types.size(), 12);
         } 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 fc6ccef50961c2553b57f236a2d809f6fe2e066c..714e957dd3a9ba0188211b7ad9a10d2940805c22 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(3).getCode());
-        List<PropertyTypeGroup> groups = types.get(3).getPropertyTypeGroups();
+        assertEquals("HCS_IMAGE", types.get(4).getCode());
+        List<PropertyTypeGroup> groups = types.get(4).getPropertyTypeGroups();
         List<PropertyType> propertyTypes = groups.get(0).getPropertyTypes();
         Collections.sort(propertyTypes, new Comparator<PropertyType>()
             {