diff --git a/app/components/Viewer/Generic/Model/BlocksOptions.vue b/app/components/Viewer/Generic/Model/BlocksOptions.vue
index a83c20a6..1bc4b7ed 100644
--- a/app/components/Viewer/Generic/Model/BlocksOptions.vue
+++ b/app/components/Viewer/Generic/Model/BlocksOptions.vue
@@ -255,7 +255,12 @@ const polyhedronSchema = back_schemas.opengeodeweb_back.model_component_polyhedr
     />
   </OptionsSection>
 
-  <OptionsSection v-if="blockId" title="Component Options" class="mt-4">
+  <OptionsSection
+    v-if="blockId"
+    title="Component Options"
+    class="mt-4"
+    data-testid="modelComponentOptions"
+  >
     <VisibilitySwitch v-model="blockVisibility" />
     <ViewerOptionsColoringTypeSelector
       :id="modelId"
diff --git a/app/components/Viewer/Generic/Model/CornersOptions.vue b/app/components/Viewer/Generic/Model/CornersOptions.vue
index 287aaf44..3917b16b 100644
--- a/app/components/Viewer/Generic/Model/CornersOptions.vue
+++ b/app/components/Viewer/Generic/Model/CornersOptions.vue
@@ -172,7 +172,12 @@ const vertexSchema = back_schemas.opengeodeweb_back.model_component_vertex_attri
     />
   </OptionsSection>
 
-  <OptionsSection v-if="cornerId" title="Component Options" class="mt-4">
+  <OptionsSection
+    v-if="cornerId"
+    title="Component Options"
+    class="mt-4"
+    data-testid="modelComponentOptions"
+  >
     <VisibilitySwitch v-model="cornerVisibility" />
     <ViewerOptionsColoringTypeSelector
       :id="modelId"
diff --git a/app/components/Viewer/Generic/Model/LinesOptions.vue b/app/components/Viewer/Generic/Model/LinesOptions.vue
index 23f763bc..ca8df70f 100644
--- a/app/components/Viewer/Generic/Model/LinesOptions.vue
+++ b/app/components/Viewer/Generic/Model/LinesOptions.vue
@@ -251,7 +251,12 @@ const edgeSchema = back_schemas.opengeodeweb_back.model_component_edge_attribute
     />
   </OptionsSection>
 
-  <OptionsSection v-if="lineId" title="Component Options" class="mt-4">
+  <OptionsSection
+    v-if="lineId"
+    title="Component Options"
+    class="mt-4"
+    data-testid="modelComponentOptions"
+  >
     <VisibilitySwitch v-model="lineVisibility" />
     <ViewerOptionsColoringTypeSelector
       :id="modelId"
diff --git a/app/components/Viewer/Generic/Model/SurfacesOptions.vue b/app/components/Viewer/Generic/Model/SurfacesOptions.vue
index b0dbc791..d9b968ed 100644
--- a/app/components/Viewer/Generic/Model/SurfacesOptions.vue
+++ b/app/components/Viewer/Generic/Model/SurfacesOptions.vue
@@ -259,7 +259,12 @@ const polygonSchema = back_schemas.opengeodeweb_back.model_component_polygon_att
     />
   </OptionsSection>
 
-  <OptionsSection v-if="surfaceId" title="Component Options" class="mt-4">
+  <OptionsSection
+    v-if="surfaceId"
+    title="Component Options"
+    class="mt-4"
+    data-testid="modelComponentOptions"
+  >
     <VisibilitySwitch v-model="surfaceVisibility" />
     <ViewerOptionsColoringTypeSelector
       :id="modelId"