diff --git a/app/javascript/vue/results/results_toolbar.vue b/app/javascript/vue/results/results_toolbar.vue
index 57446c891..f4d296179 100644
--- a/app/javascript/vue/results/results_toolbar.vue
+++ b/app/javascript/vue/results/results_toolbar.vue
@@ -8,7 +8,14 @@
     </div>
 
     <div class="result-toolbar__left flex items-center">
-      <button v-if="canCreate" :title="i18n.t('my_modules.results.add_title')" class="btn btn-secondary" :class="{'mr-3': headerSticked}" @click="$emit('newResult')">
+      <button
+        v-if="canCreate" 
+        :title="i18n.t('my_modules.results.add_title')"
+        class="btn btn-secondary"
+        :class="{'mr-3': headerSticked}"
+        @click="$emit('newResult')"
+        data-e2e="e2e-BT-task-results-createNew"
+      >
         <i class="sn-icon sn-icon-new-task"></i>
         {{ i18n.t('my_modules.results.add_label') }}
       </button>
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb
index 8f6ac492a..8e723c9f9 100644
--- a/app/views/my_modules/protocols.html.erb
+++ b/app/views/my_modules/protocols.html.erb
@@ -35,8 +35,16 @@
     <div class="task-section task-information hidden" data-e2e="e2e-CO-task-details">
       <div id="task-details" class="task-section-header">
         <div class="flex items-center mr-auto">
-          <a class="task-section-caret collapsed" role="button" data-toggle="collapse" href="#details-container" aria-expanded="false" aria-controls="details-container">
-            <i class="sn-icon sn-icon-right" data-e2e="e2e-IC-task-details-visibilityToggle"></i>
+          <a
+            class="task-section-caret collapsed"
+            role="button"
+            data-toggle="collapse"
+            href="#details-container"
+            aria-expanded="false"
+            aria-controls="details-container"
+            data-e2e="e2e-BT-task-details-visibilityToggle"
+          >
+            <i class="sn-icon sn-icon-right"></i>
             <span id="taskDetailsLabel" class="task-section-title">
               <h2 data-e2e="e2e-TX-task-details-title">
                 <%= t('my_modules.details.title') %>
@@ -68,8 +76,16 @@
     <!-- Notes -->
     <div class="task-section hidden">
       <div class="task-section-header">
-        <a class="task-section-caret" role="button" data-toggle="collapse" href="#notes-container" aria-expanded="true" aria-controls="notes-container">
-          <i class="sn-icon sn-icon-right" data-e2e="e2e-IC-task-notes-visibilityToggle"></i>
+        <a
+           class="task-section-caret"
+           role="button"
+           data-toggle="collapse"
+           href="#notes-container"
+           aria-expanded="true"
+           aria-controls="notes-container"
+           data-e2e="e2e-BT-task-notes-visibilityToggle"
+        >
+          <i class="sn-icon sn-icon-right"></i>
           <span class="task-section-title">
             <h2 data-e2e="e2e-TX-task-notes-title"><%= t('my_modules.notes.title') %></h2>
           </span>
diff --git a/app/views/shared/comments/_comments_sidebar.html.erb b/app/views/shared/comments/_comments_sidebar.html.erb
index 5bf58bbbe..b44929974 100644
--- a/app/views/shared/comments/_comments_sidebar.html.erb
+++ b/app/views/shared/comments/_comments_sidebar.html.erb
@@ -1,8 +1,11 @@
-<div class="comments-sidebar" data-comments-url="<%= comments_path %>">
+<div class="comments-sidebar" data-comments-url="<%= comments_path %>" data-e2e="e2e-CO-comments">
   <div class="sidebar-content">
     <div class="sidebar-header">
-      <div class="comments-subject-title"></div>
-      <div class="btn btn-light icon-btn close-btn !bg-transparent">
+      <div class="comments-subject-title" data-e2e="e2e-TX-comments-title"></div>
+      <div
+        class="btn btn-light icon-btn close-btn !bg-transparent"
+        data-e2e="e2e-BT-comments-close"
+      >
         <i class="sn-icon sn-icon-close"></i>
       </div>
       <div class="comments-subject-url">
@@ -14,9 +17,11 @@
       <div class="no-comments-placeholder">
         <%= image_tag 'comments/placeholder.svg', class: 'no-comments-image' %>
         <h1><%= t('comments.empty_state.title') %></h1>
-        <p class="description"><%= t('comments.empty_state.description') %></p>
+        <p class="description" data-e2e="e2e-TX-comments-noCommentDescription">
+          <%= t('comments.empty_state.description') %>
+        </p>
       </div>
-      <div class="loading-placeholder">
+      <div class="loading-placeholder" data-e2e="e2e-CO-comments-commentPlaceholder">
         <% 5.times do |i| %>
           <div class="comment-placeholder <%= i.even? ? 'left' : 'right' %>">
             <div class="comment-user-placeholder"></div>
@@ -27,14 +32,21 @@
     </div>
     <div class="sidebar-footer">
       <div class="comment-input-container !pr-0 grid grid-flow-row">
-        <textarea class="comment-input-field smart-text-area textarea-sm"
-                  placeholder="<%= t('comments.placeholder') %>"></textarea>
-        <i class="sn-icon sn-icon-send send-comment"></i>
+        <textarea
+          class="comment-input-field smart-text-area textarea-sm"
+          placeholder="<%= t('comments.placeholder') %>"
+          data-e2e="e2e-IF-comments-addNew"
+        ></textarea>
+        <i class="sn-icon sn-icon-send send-comment" data-e2e="e2e-BT-comments-send"></i>
       </div>
       <div class="error-container"></div>
       <div class="update-buttons sci-btn-group">
-        <button class="btn btn-secondary cancel-button"><%= t('general.cancel') %></button>
-        <button class="btn btn-primary update-comment"><%= t('comments.save_changes') %></button>
+        <button class="btn btn-secondary cancel-button" data-e2e="e2e-BT-comments-cancel">
+          <%= t('general.cancel') %>
+        </button>
+        <button class="btn btn-primary update-comment" data-e2e="e2e-BT-comments-saveChanges">
+          <%= t('comments.save_changes') %>
+        </button>
       </div>
     </div>
   </div>