diff --git a/views/lib/components/files-storage/files-card.hbs b/views/lib/components/files-storage/files-card.hbs
index e5796aa400..6ff4429655 100644
--- a/views/lib/components/files-storage/files-card.hbs
+++ b/views/lib/components/files-storage/files-card.hbs
@@ -11,7 +11,7 @@
 			tabindex="0"
 			aria-label="{{$t "files.label.clickToOpenFile" (dict "name" this.name)}}"
 			role="button">
-			<div class="card-title" data-testid="file-title-card">
+			<div class="card-title" data-testid="file-title-card-{{fileIndex}}">
 				<div class="file-preview-wrapper col-sm-1 no-padding hidden-xs-down">
 				<div class="file-preview" style="background-image: url({{getThumbnailIcon this.name}}); -webkit-background-size: 25px ;background-size: 25px;"></div>
 				</div>
@@ -37,7 +37,7 @@
 						data-file-name="{{../this.name}}"
 						class="file-btn"
 						data-method="download"
-                        data-testid="file-download-btn"
+                        data-testid="file-download-btn-{{../fileIndex}}"
 						title="{{$t "files.label.downloadFile"}}">
 						<i aria-hidden="true" class="fa fa-cloud-download"></i>
 					</button>
@@ -48,13 +48,15 @@
 							data-file-id="{{../this.id}}"
 							data-file-name="{{../this.name}}"
 							title="{{$t "files.label.renameFile"}}"
-							class="file-btn fa fa-edit file-name-edit">
+							class="file-btn fa fa-edit file-name-edit"
+                            data-testid="file-rename-btn-{{../fileIndex}}">
 						</button>
 					{{/userHasPermission}}
 					{{#userHasPermission "FILESTORAGE_REMOVE"}}
 						<button
 							class="file-btn"
 							data-method="delete"
+                            data-testid="file-delete-btn-{{../fileIndex}}"
 							title="{{$t "files.label.deleteFile"}}"
 							data-file-id="{{../this.id}}"
 							data-file-name="{{../this.name}}">
diff --git a/views/lib/components/files-storage/files-grid.hbs b/views/lib/components/files-storage/files-grid.hbs
index 25e24c0361..e60fc413d8 100644
--- a/views/lib/components/files-storage/files-grid.hbs
+++ b/views/lib/components/files-storage/files-grid.hbs
@@ -2,7 +2,7 @@
 	<div class="row">
 		{{#each files}}
 			<div class="col-sm-12">
-				{{> "lib/components/files-storage/files-card" readonly=../readonly}}
+				{{> "lib/components/files-storage/files-card" readonly=../readonly fileIndex=@index}}
 			</div>
 		{{/each}}
 	</div>
diff --git a/views/lib/components/files-storage/forms/form-name-edit.hbs b/views/lib/components/files-storage/forms/form-name-edit.hbs
index d484431de3..46831266d2 100644
--- a/views/lib/components/files-storage/forms/form-name-edit.hbs
+++ b/views/lib/components/files-storage/forms/form-name-edit.hbs
@@ -1,9 +1,10 @@
-<div class="form-group">
-    <label for="newNameInput">{{$t "files.label.chooseANewName"}}</label>
-    <input id="newNameInput" class="form-control" type="text" />
-    <input
-        id="fileRecordId"
-        class="form-control"
-        type="hidden"
-    />
+<div class='form-group'>
+  <label for='newNameInput'>{{$t 'files.label.chooseANewName'}}</label>
+  <input
+    id='newNameInput'
+    data-testid='rename-file-input'
+    class='form-control'
+    type='text'
+  />
+  <input id='fileRecordId' class='form-control' type='hidden' />
 </div>
diff --git a/views/teams/team.hbs b/views/teams/team.hbs
index aaa376905c..87b2b6f6a7 100644
--- a/views/teams/team.hbs
+++ b/views/teams/team.hbs
@@ -305,13 +305,13 @@
 {{#embed "lib/components/modal-form" class="create-event-modal" action=../createEventAction collapseId=1
 userId=../userId teamId=../teamId}}
     {{#content "fields"}}
-    {{> "calendar/forms/form-create-event" showVideoconferenceOption=@root.showVideoconferenceOption}}
+    {{> "calendar/forms/form-create-event" showVideoconferenceOption=@root.showVideoconferenceOption testIdPrefix="create"}}
     {{/content}}
 {{/embed}}
 
 {{#embed "lib/components/modal-form" method="put" action="/calendar/events/" class="edit-event-modal"}}
     {{#content "fields"}}
-    {{> "calendar/forms/form-create-event" collapseIdCourse="4" collapseIdTeam="5"}}
+    {{> "calendar/forms/form-create-event" collapseIdCourse="4" collapseIdTeam="5" testIdPrefix="edit"}}
     {{/content}}
     {{#content "additional-actions"}}
     <button type="button" class="btn btn-primary btn-danger btn-delete pull-left" data-testid="delete_team_event">