diff --git a/packages/component-faraday-ui/src/InviteReviewers.js b/packages/component-faraday-ui/src/InviteReviewers.js
index cfbafc866de4254aa2ae35ec7bf818cb42685279..7c93ebb316f9a1d7a10c664548a6ee94c6864cdd 100644
--- a/packages/component-faraday-ui/src/InviteReviewers.js
+++ b/packages/component-faraday-ui/src/InviteReviewers.js
@@ -46,6 +46,7 @@ const InviteReviewers = ({ countries, handleSubmit, reset }) => (
         <Label required>Email</Label>
         <ValidatedField
           component={TextField}
+          data-test-id="invite-reviewer-email"
           name="email"
           validate={[required, validators.emailValidator]}
         />
@@ -54,6 +55,7 @@ const InviteReviewers = ({ countries, handleSubmit, reset }) => (
         <Label required>First Name</Label>
         <ValidatedField
           component={TextField}
+          data-test-id="invite-reviewer-first-name"
           name="firstName"
           validate={[required]}
         />
@@ -62,6 +64,7 @@ const InviteReviewers = ({ countries, handleSubmit, reset }) => (
         <Label required>Last Name</Label>
         <ValidatedField
           component={TextField}
+          data-test-id="invite-reviewer-last-name"
           name="lastName"
           validate={[required]}
         />
@@ -70,6 +73,7 @@ const InviteReviewers = ({ countries, handleSubmit, reset }) => (
         <Label required>Affiliation</Label>
         <ValidatedField
           component={TextField}
+          data-test-id="invite-reviewer-affiliation"
           name="affiliation"
           validate={[required]}
         />
diff --git a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
index 8e242820b8a3077267b79efe84b7355b6d7029d0..232c2798046f6b1d50feba48c94b8d46a4ba3066 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
@@ -57,6 +57,7 @@ const ReviewerDetails = ({
           <Fragment>
             <TabsHeader>
               <TabButton
+                data-test-id="reviewer-tab-details"
                 ml={1}
                 mr={1}
                 onClick={() => changeTab(0)}
@@ -66,6 +67,7 @@ const ReviewerDetails = ({
               </TabButton>
               {canInviteReviewers && (
                 <TabButton
+                  data-test-id="reviewer-tab-suggestions"
                   ml={1}
                   mr={1}
                   onClick={() => changeTab(2)}
@@ -75,6 +77,7 @@ const ReviewerDetails = ({
                 </TabButton>
               )}
               <TabButton
+                data-test-id="reviewer-tab-reports"
                 ml={1}
                 mr={1}
                 onClick={() => changeTab(1)}
diff --git a/packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js b/packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js
index cd568ff1c9afd710040804d97e8e1d7988c5b17d..7e98eef25418e5b6cfdf9c0050568ee58b87b1fa 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js
@@ -43,7 +43,11 @@ const ReviewerReportForm = ({
   >
     <Root>
       <Row justify="flex-start">
-        <ItemOverrideAlert flex={0} vertical>
+        <ItemOverrideAlert
+          data-test-id="form-report-recommendation"
+          flex={0}
+          vertical
+        >
           <Label required>Recommendation</Label>
           <ValidatedField
             component={input => <Menu {...input} options={recommendations} />}
@@ -53,7 +57,12 @@ const ReviewerReportForm = ({
         </ItemOverrideAlert>
       </Row>
 
-      <Row alignItems="center" justify="space-between" mt={1}>
+      <Row
+        alignItems="center"
+        data-test-id="form-report-upload-file"
+        justify="space-between"
+        mt={1}
+      >
         <Item>
           <Label required>Your report</Label>
           {!formValues.file && (
@@ -71,7 +80,7 @@ const ReviewerReportForm = ({
       </Row>
 
       <Row mb={1 / 2}>
-        <ItemOverrideAlert vertical>
+        <ItemOverrideAlert data-test-id="form-report-textarea" vertical>
           <ValidatedField component={Textarea} name="public" />
         </ItemOverrideAlert>
       </Row>
@@ -80,6 +89,7 @@ const ReviewerReportForm = ({
         <Row justify="flex-start" mb={1}>
           <Item flex={0}>
             <FileItem
+              data-test-id="form-report-file-item-actions"
               item={formValues.file}
               onDelete={removeFile}
               onDownload={downloadFile}
@@ -96,14 +106,18 @@ const ReviewerReportForm = ({
               <Label>Confidential note for the Editorial Team</Label>
             </Item>
             <Item justify="flex-end">
-              <ActionLink icon="x" onClick={removeNote}>
+              <ActionLink
+                data-test-id="form-report-remove-note"
+                icon="x"
+                onClick={removeNote}
+              >
                 Remove
               </ActionLink>
             </Item>
           </Fragment>
         ) : (
           <Item>
-            <ActionLink onClick={addNote}>
+            <ActionLink data-test-id="form-report-add-note" onClick={addNote}>
               Add Confidential note for the Editorial Team
             </ActionLink>
           </Item>
@@ -112,7 +126,10 @@ const ReviewerReportForm = ({
 
       {hasNote && (
         <Row>
-          <ItemOverrideAlert vertical>
+          <ItemOverrideAlert
+            data-test-id="textarea-form-report-add-note"
+            vertical
+          >
             <ValidatedField component={Textarea} name="confidential" />
           </ItemOverrideAlert>
         </Row>
@@ -128,7 +145,12 @@ const ReviewerReportForm = ({
         {isFetching ? (
           <Spinner />
         ) : (
-          <Button onClick={handleSubmit} primary size="medium">
+          <Button
+            data-test-id="button-submit-report"
+            onClick={handleSubmit}
+            primary
+            size="medium"
+          >
             Submit report
           </Button>
         )}
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.js b/packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.js
index 9b4827c3f263a15da561c4e9f3543d88bea3ce5d..a638617e4a1adb041b45b48c310df51e95be1c29 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.js
@@ -49,7 +49,7 @@ const ResponseToInvitation = ({
           component={input => (
             <Row
               alignItems="center"
-              data-test-id="he-respond-to-invitation"
+              data-test-id="radio-respond-to-invitation"
               justify="space-between"
             >
               <RadioGroup inline name="decision" options={options} {...input} />
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js
index 2f1794281d784ee183df364b9322a61c56c5f251..642099f9136951bec02aef4983b0a2e796eea196 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js
@@ -8,17 +8,17 @@ const DashboardFilters = ({
   changeFilterValue,
   getDefaultFilterValue,
 }) => (
-  <Row
-    alignItems="flex-end"
-    data-test-id="dashboard-filters"
-    justify="flex-start"
-    mb={1}
-    mt={2}
-  >
+  <Row alignItems="flex-end" justify="flex-start" mb={1} mt={2}>
     <Text mr={1} pb={1} secondary>
       Filters
     </Text>
-    <Item alignItems="flex-start" flex={0} mr={1} vertical>
+    <Item
+      alignItems="flex-start"
+      data-test-id="dashboard-filter-priority"
+      flex={0}
+      mr={1}
+      vertical
+    >
       <Label>Priority</Label>
       <Menu
         inline
@@ -28,7 +28,12 @@ const DashboardFilters = ({
         value={getDefaultFilterValue('priority')}
       />
     </Item>
-    <Item alignItems="flex-start" flex={0} vertical>
+    <Item
+      alignItems="flex-start"
+      data-test-id="dashboard-filter-order"
+      flex={0}
+      vertical
+    >
       <Label>Order</Label>
       <Menu
         inline