diff --git a/openbis_ng_ui/srcTest/js/common/fixture.js b/openbis_ng_ui/srcTest/js/common/fixture.js
index 6cd9060e2f6e803a2401125315bc11eb82bba7cf..7d198067bc40b6db83db8236afbdcff9512cf8c1 100644
--- a/openbis_ng_ui/srcTest/js/common/fixture.js
+++ b/openbis_ng_ui/srcTest/js/common/fixture.js
@@ -68,7 +68,13 @@ const TEST_PROPERTY_ASSIGNMENT_3 = new openbis.PropertyAssignment()
 TEST_PROPERTY_ASSIGNMENT_3.setPropertyType(TEST_PROPERTY_TYPE_3_DTO)
 TEST_PROPERTY_ASSIGNMENT_3.setSection('TEST_SECTION_2')
 
+const TEST_PROPERTY_ASSIGNMENT_4 = new openbis.PropertyAssignment()
+TEST_PROPERTY_ASSIGNMENT_4.setPropertyType(TEST_PROPERTY_TYPE_1_DTO)
+
 const TEST_SAMPLE_TYPE_DTO = new openbis.SampleType()
+TEST_SAMPLE_TYPE_DTO.setPermId(
+  new openbis.EntityTypePermId('TEST_TYPE', openbis.EntityKind.SAMPLE)
+)
 TEST_SAMPLE_TYPE_DTO.setCode('TEST_TYPE')
 TEST_SAMPLE_TYPE_DTO.setAutoGeneratedCode(false)
 TEST_SAMPLE_TYPE_DTO.setGeneratedCodePrefix('TEST_PREFIX_')
@@ -80,8 +86,18 @@ TEST_SAMPLE_TYPE_DTO.setPropertyAssignments([
   TEST_PROPERTY_ASSIGNMENT_3
 ])
 
+TEST_PROPERTY_ASSIGNMENT_1.setEntityType(TEST_SAMPLE_TYPE_DTO)
+TEST_PROPERTY_ASSIGNMENT_2.setEntityType(TEST_SAMPLE_TYPE_DTO)
+TEST_PROPERTY_ASSIGNMENT_3.setEntityType(TEST_SAMPLE_TYPE_DTO)
+
 const ANOTHER_SAMPLE_TYPE_DTO = new openbis.SampleType()
+ANOTHER_SAMPLE_TYPE_DTO.setPermId(
+  new openbis.EntityTypePermId('ANOTHER_SAMPLE_TYPE', openbis.EntityKind.SAMPLE)
+)
 ANOTHER_SAMPLE_TYPE_DTO.setCode('ANOTHER_SAMPLE_TYPE')
+ANOTHER_SAMPLE_TYPE_DTO.setPropertyAssignments([TEST_PROPERTY_ASSIGNMENT_4])
+
+TEST_PROPERTY_ASSIGNMENT_4.setEntityType(ANOTHER_SAMPLE_TYPE_DTO)
 
 const TEST_EXPERIMENT_TYPE_DTO = new openbis.ExperimentType()
 TEST_EXPERIMENT_TYPE_DTO.setCode('TEST_TYPE')
diff --git a/openbis_ng_ui/srcTest/js/components/types/browser/TypeBrowserControllerRemoveNode.test.js b/openbis_ng_ui/srcTest/js/components/types/browser/TypeBrowserControllerRemoveNode.test.js
index 1efd40bd8951934d2f222d913fd1c23a3863bd30..b1315e22b21f108406c907989610ee1b8d8d9fc6 100644
--- a/openbis_ng_ui/srcTest/js/components/types/browser/TypeBrowserControllerRemoveNode.test.js
+++ b/openbis_ng_ui/srcTest/js/components/types/browser/TypeBrowserControllerRemoveNode.test.js
@@ -42,11 +42,13 @@ async function testRemoveNode() {
     return new openbis.DeleteSampleTypesOperation([id], options)
   }
 
-  const createDeletePropertyTypeOperation = propertyTypeCode => {
-    const id = new openbis.PropertyTypePermId(propertyTypeCode)
+  const createDeletePropertyTypeOperation = propertyTypeCodes => {
+    const ids = propertyTypeCodes.map(propertyTypeCode => {
+      return new openbis.PropertyTypePermId(propertyTypeCode)
+    })
     const options = new openbis.PropertyTypeDeletionOptions()
     options.setReason('deleted via ng_ui')
-    return new openbis.DeletePropertyTypesOperation([id], options)
+    return new openbis.DeletePropertyTypesOperation(ids, options)
   }
 
   const options = new openbis.SynchronousOperationExecutionOptions()
@@ -55,7 +57,10 @@ async function testRemoveNode() {
   expect(openbis.executeOperations).toHaveBeenCalledWith(
     [
       createDeleteTypeOperation(fixture.TEST_SAMPLE_TYPE_DTO.code),
-      createDeletePropertyTypeOperation(fixture.TEST_PROPERTY_TYPE_1_DTO.code)
+      createDeletePropertyTypeOperation([
+        fixture.TEST_PROPERTY_TYPE_2_DTO.code,
+        fixture.TEST_PROPERTY_TYPE_3_DTO.code
+      ])
     ],
     options
   )
diff --git a/openbis_ng_ui/srcTest/js/components/types/browser/TypeBrowserControllerTest.js b/openbis_ng_ui/srcTest/js/components/types/browser/TypeBrowserControllerTest.js
index 1ac46ab9c1454c04c5a225fe688b24401444fae0..33992505e78f7b85fc3773a8e3cf60898e453ccf 100644
--- a/openbis_ng_ui/srcTest/js/components/types/browser/TypeBrowserControllerTest.js
+++ b/openbis_ng_ui/srcTest/js/components/types/browser/TypeBrowserControllerTest.js
@@ -37,6 +37,11 @@ export default class TypeBrowserControllerTest {
       fixture.TEST_PROPERTY_TYPE_1_DTO,
       fixture.TEST_PROPERTY_TYPE_2_DTO
     ])
+
+    openbis.mockSearchPropertyAssignments([
+      ...fixture.TEST_SAMPLE_TYPE_DTO.propertyAssignments,
+      ...fixture.ANOTHER_SAMPLE_TYPE_DTO.propertyAssignments
+    ])
   }
 
   expectNewTypeAction(type) {