diff --git a/app/components/Viewer/ObjectTree/Base/Controls.vue b/app/components/Viewer/ObjectTree/Base/Controls.vue
index 0fd087fd..faf66d57 100644
--- a/app/components/Viewer/ObjectTree/Base/Controls.vue
+++ b/app/components/Viewer/ObjectTree/Base/Controls.vue
@@ -32,6 +32,7 @@ watch(
         :class="{ 'is-expanded': showSearch }"
       >
         <ActionButton
+          data-testid="searchObjectsButton"
           :tooltip="showSearch ? 'Hide search' : 'Show search'"
           icon="mdi-magnify"
           tooltipLocation="bottom"
@@ -43,6 +44,7 @@ watch(
         <v-expand-x-transition>
           <div v-if="showSearch" class="flex-grow-1 ms-1 text-no-wrap overflow-hidden">
             <SearchBar
+              data-testid="searchObjectsInput"
               :model-value="search"
               placeholder="Search objects..."
               color="black"
@@ -67,6 +69,7 @@ watch(
             />
           </v-fade-transition>
           <ActionButton
+            data-testid="sortObjectsButton"
             :tooltip="'Sort by ' + (sortType === 'name' ? 'ID' : 'Name')"
             :icon="
               sortType === 'name' ? 'mdi-sort-alphabetical-ascending' : 'mdi-sort-numeric-ascending'
@@ -79,6 +82,7 @@ watch(
           <v-menu :close-on-content-click="false">
             <template #activator="{ props: menuProps }">
               <ActionButton
+                data-testid="filterObjectsButton"
                 tooltip="Filter options"
                 icon="mdi-filter-variant"
                 variant="text"
@@ -94,6 +98,7 @@ watch(
                   :label="category_id"
                   hide-details
                   density="compact"
+                  :data-testid="'filterCheckbox-' + category_id"
                 />
               </v-list-item>
             </v-list>
diff --git a/app/components/Viewer/ObjectTree/Base/ItemLabel.vue b/app/components/Viewer/ObjectTree/Base/ItemLabel.vue
index 7c00c85e..b51abe83 100644
--- a/app/components/Viewer/ObjectTree/Base/ItemLabel.vue
+++ b/app/components/Viewer/ObjectTree/Base/ItemLabel.vue
@@ -50,7 +50,11 @@ const tooltipDisabled = computed(() => {
 </script>
 
 <template>
-  <div ref="label-container" class="tree-item-label-container w-100">
+  <div
+    ref="label-container"
+    :data-testid="'treeRow-' + actualItem.id"
+    class="tree-item-label-container w-100"
+  >
     <v-tooltip :disabled="tooltipDisabled" location="right" open-delay="400">
       <template #activator="{ props: tooltipProps }">
         <span
diff --git a/app/components/Viewer/Options/ColorPicker.vue b/app/components/Viewer/Options/ColorPicker.vue
index a739e631..e0839a62 100644
--- a/app/components/Viewer/Options/ColorPicker.vue
+++ b/app/components/Viewer/Options/ColorPicker.vue
@@ -52,6 +52,7 @@ watch(pressed, (value) => {
     flat
     canvas-height="75"
     hide-inputs
+    hide-eye-dropper
     width="220"
     mode="rgba"
     class="mx-auto"