diff --git a/app/javascript/vue/protocols/modals/versions.vue b/app/javascript/vue/protocols/modals/versions.vue
index 083b6d0e5..781522703 100644
--- a/app/javascript/vue/protocols/modals/versions.vue
+++ b/app/javascript/vue/protocols/modals/versions.vue
@@ -1,12 +1,12 @@
 <template>
   <div ref="modal" class="modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
-      <div class="modal-content">
+      <div class="modal-content" data-e2e="e2e-MD-protocolVersions">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-protocolVersionsModal-close">
             <i class="sn-icon sn-icon-close"></i>
           </button>
-          <h4 class="modal-title truncate !block">
+          <h4 class="modal-title truncate !block" data-e2e="e2e-TX-protocolVersionsModal-title">
             {{ i18n.t('protocols.index.versions.title', { protocol: protocol.name }) }}
           </h4>
         </div>
@@ -15,9 +15,9 @@
             <img src="/images/medium/loading.svg" alt="Loading" class="p-4 rounded-xl bg-sn-white" />
           </div>
           <div class="max-h-[400px] overflow-y-auto">
-            <div v-if="draft">
+            <div v-if="draft" data-e2e="e2e-CO-protocolVersionsModal-draft">
               <div class="flex items-center gap-4">
-                <a :href="draft.urls.show" class="hover:no-underline cursor-pointer shrink-0">
+                <a :href="draft.urls.show" class="hover:no-underline cursor-pointer shrink-0" data-e2e="e2e-TL-protocolVersionsModal-draft-draftLink">
                   <span v-if="draft.previous_number"
                         v-html="i18n.t('protocols.index.versions.draft_html', {
                           parent_version: draft.previous_number
@@ -25,7 +25,7 @@
                   ></span>
                   <span v-else v-html="i18n.t('protocols.index.versions.first_draft_html')"></span>
                 </a>
-                <span class="text-xs" v-if="draft.modified_by">
+                <span class="text-xs" v-if="draft.modified_by" data-e2e="e2e-TX-protocolVersionsModal-draft-timestamp">
                   {{
                       i18n.t('protocols.index.versions.draft_full_modification_info', {
                         modified_on: draft.modified_on,
@@ -33,7 +33,7 @@
                       })
                   }}
                 </span>
-                <span class="text-xs" v-else>
+                <span class="text-xs" v-else data-e2e="e2e-TX-protocolVersionsModal-draft-timestamp">
                   {{
                       i18n.t('protocols.index.versions.draft_update_modification_info', {
                         modified_on: draft.modified_on
@@ -41,11 +41,17 @@
                   }}
                 </span>
                 <div class="flex items-center gap-2 ml-auto">
-                  <button v-if="draft.urls.publish" class="btn btn-light" :disabled="updating" @click="publishDraft">
+                  <button v-if="draft.urls.publish" class="btn btn-light" :disabled="updating" @click="publishDraft" data-e2e="e2e-BT-protocolVersionsModal-draft-publish">
                     <i class="sn-icon sn-icon-Publish"></i>
                     {{ i18n.t('protocols.index.versions.publish') }}
                   </button>
-                  <button v-if="draft.urls.destroy" @click="destroyDraft" :disabled="updating" class="btn btn-light icon-btn">
+                  <button
+                    v-if="draft.urls.destroy"
+                    @click="destroyDraft"
+                    :disabled="updating"
+                    class="btn btn-light icon-btn"
+                    data-e2e="e2e-BT-protocolVersionsModal-draft-deleteDraft"
+                  >
                     <i class="sn-icon sn-icon-delete"></i>
                   </button>
                 </div>
@@ -60,16 +66,17 @@
                   :singleLine="false"
                   :attributeName="`${i18n.t('Draft')} ${i18n.t('comment')}`"
                   @update="updateComment"
+                  :dataE2e="'protocolVersionsModal-draft-revisionNotes'"
                 />
             </div>
-            <div v-for="version in publishedVersions" :key="version.number">
+            <div v-for="version in publishedVersions" :key="version.number" :data-e2e="`e2e-CO-protocolVersionsModal-version${version.number}`">
               <div class="flex items-center gap-4 group min-h-[40px]">
-                <a :href="version.urls.show" class="hover:no-underline cursor-pointer shrink-0">
+                <a :href="version.urls.show" class="hover:no-underline cursor-pointer shrink-0" :data-e2e="`e2e-TL-protocolVersionsModal-version${version.number}-versionLink`">
                   <b>
                     {{ i18n.t('protocols.index.versions.revision', { version: version.number }) }}
                   </b>
                 </a>
-                <span class="text-xs">
+                <span class="text-xs" :data-e2e="`e2e-TX-protocolVersionsModal-version${version.number}-timestamp`">
                   {{
                       i18n.t('protocols.index.versions.revision_publishing_info', {
                         published_on: version.published_on,
@@ -83,11 +90,12 @@
                   :title="i18n.t('protocols.index.versions.save_as_draft')"
                   @click="saveAsDraft(version.urls.save_as_draft)"
                   :disabled="draft || updating"
+                  :data-e2e="`e2e-BT-protocolVersionsModal-version${version.number}-saveAsDraft`"
                 >
                   <i class="sn-icon sn-icon-duplicate"></i>
                 </button>
               </div>
-              <div class="mb-4">
+              <div class="mb-4" :data-e2e="`e2e-TX-protocolVersionsModal-version${version.number}-revisionNotes`">
                 {{  version.comment }}
               </div>
             </div>
diff --git a/app/javascript/vue/shared/content/text.vue b/app/javascript/vue/shared/content/text.vue
index 2e89fba8e..b5e5de961 100644
--- a/app/javascript/vue/shared/content/text.vue
+++ b/app/javascript/vue/shared/content/text.vue
@@ -15,7 +15,7 @@
           :allowBlank="true"
           :autofocus="editingName"
           :attributeName="`${i18n.t('Text')} ${i18n.t('name')}`"
-          :dataE2e="`${dataE2e}-stepText${element.id}`"
+          :dataE2e="`${dataE2e}-stepText${element.id}-title`"
           @editingEnabled="enableNameEdit"
           @editingDisabled="disableNameEdit"
           @update="updateName"
@@ -36,7 +36,7 @@
     </div>
     <div class="flex rounded min-h-[2.25rem] mb-4 relative group/text_container content__text-body"
       :class="{ 'edit': inEditMode, 'component__element--locked': !element.attributes.orderable.urls.update_url }"
-      :data-e2e="`e2e-IF-${dataE2e}-stepText${element.id}`"
+      :data-e2e="`e2e-IF-${dataE2e}-stepText${element.id}-content`"
       @keyup.enter="enableEditMode($event)"
       tabindex="0">
       <Tinymce
diff --git a/app/views/my_modules/_header_actions.html.erb b/app/views/my_modules/_header_actions.html.erb
index 10c66eca8..d3780b15d 100644
--- a/app/views/my_modules/_header_actions.html.erb
+++ b/app/views/my_modules/_header_actions.html.erb
@@ -1,4 +1,8 @@
-<div id="taskSecondaryMenu" class="sticky-header-element bg-sn-white border-b border-solid border-0 border-sn-sleepy-grey rounded-t px-4 py-2 pb-[16px] top-0 sticky flex items-center flex-wrap z-[106]">
+<div 
+  id="taskSecondaryMenu"
+  class="sticky-header-element bg-sn-white border-b border-solid border-0 border-sn-sleepy-grey rounded-t px-4 py-2 pb-[16px] top-0 sticky flex items-center flex-wrap z-[106]"
+  data-e2e="e2e-CO-taskTopToolbar"
+>
   <div class="flex items-center gap-4 mr-auto">
     <% if can_read_experiment?(@my_module.experiment) %>
       <a class="p-3 border-b-4 border-transparent hover:no-underline uppercase text-bold capitalize <%= is_module_protocols? ? "text-sn-blue" : "text-sn-grey" %>"