diff --git a/app/components/Viewer/Generic/Model/EdgesOptions.vue b/app/components/Viewer/Generic/Model/EdgesOptions.vue
index 9bd2201c..8461d40c 100644
--- a/app/components/Viewer/Generic/Model/EdgesOptions.vue
+++ b/app/components/Viewer/Generic/Model/EdgesOptions.vue
@@ -25,9 +25,17 @@ const visibility = computed({
 </script>
 
 <template>
-  <ViewerContextMenuItem :itemProps="itemProps" tooltip="Edges options" :btn_image="SurfaceEdges">
+  <ViewerContextMenuItem
+    data-testid="modelEdgesMenu"
+    :itemProps="itemProps"
+    tooltip="Edges options"
+    :btn_image="SurfaceEdges"
+  >
     <template #options>
-      <ViewerOptionsVisibilitySwitch v-model="visibility" />
+      <ViewerOptionsVisibilitySwitch
+        data-testid="modelEdgesVisibilitySwitch"
+        v-model="visibility"
+      />
     </template>
   </ViewerContextMenuItem>
 </template>
diff --git a/app/components/Viewer/Generic/Model/PointsOptions.vue b/app/components/Viewer/Generic/Model/PointsOptions.vue
index bbd728ff..d59aca65 100644
--- a/app/components/Viewer/Generic/Model/PointsOptions.vue
+++ b/app/components/Viewer/Generic/Model/PointsOptions.vue
@@ -32,9 +32,17 @@ const size = computed({
 </script>
 
 <template>
-  <ViewerContextMenuItem :itemProps="itemProps" tooltip="Points options" :btn_image="SurfacePoints">
+  <ViewerContextMenuItem
+    data-testid="modelPointsMenu"
+    :itemProps="itemProps"
+    tooltip="Points options"
+    :btn_image="SurfacePoints"
+  >
     <template #options>
-      <ViewerOptionsVisibilitySwitch v-model="visibility" />
+      <ViewerOptionsVisibilitySwitch
+        data-testid="modelPointsVisibilitySwitch"
+        v-model="visibility"
+      />
       <template v-if="visibility">
         <v-row class="pa-0" align="center">
           <v-divider />
diff --git a/app/components/Viewer/ObjectTree/Layout.vue b/app/components/Viewer/ObjectTree/Layout.vue
index c75f6518..c0653521 100644
--- a/app/components/Viewer/ObjectTree/Layout.vue
+++ b/app/components/Viewer/ObjectTree/Layout.vue
@@ -194,7 +194,7 @@ function onVerticalResizeStart(event, index) {
         :scroll-top="mainView.scrollTop"
         @update:scroll-top="treeviewStore.setScrollTop(mainView.id, $event)"
       >
-        <GlobalObjects @show-menu="emit('show-menu', $event)" />
+        <GlobalObjects data-testid="mainObjectTree" @show-menu="emit('show-menu', $event)" />
       </ViewerObjectTreeBox>
     </div>
 
@@ -226,7 +226,11 @@ function onVerticalResizeStart(event, index) {
             @dragstart="onDragStart(index + 1)"
             @update:scroll-top="treeviewStore.setScrollTop(view.id, $event)"
           >
-            <ModelComponents :id="view.id" @show-menu="emit('show-menu', $event)" />
+            <ModelComponents
+              data-testid="modelComponentsObjectTree"
+              :id="view.id"
+              @show-menu="emit('show-menu', $event)"
+            />
           </ViewerObjectTreeBox>
         </div>
         <div