diff --git a/packages/component-faraday-ui/src/AuthorCard.js b/packages/component-faraday-ui/src/AuthorCard.js
index 3778a82ba5217bb4b4a8158baebee8fba68414a7..bb4112cc6cb8edb64be1702b5132d208737f6dc7 100644
--- a/packages/component-faraday-ui/src/AuthorCard.js
+++ b/packages/component-faraday-ui/src/AuthorCard.js
@@ -158,6 +158,7 @@ const AuthorEdit = ({
         <Label required>Email</Label>
         <ValidatedField
           component={TextField}
+          data-test-id="author-card-email"
           name="email"
           validate={[required, validators.emailValidator]}
         />
@@ -166,6 +167,7 @@ const AuthorEdit = ({
         <Label required>First name</Label>
         <ValidatedField
           component={TextField}
+          data-test-id="author-card-firstname"
           name="firstName"
           validate={[required]}
         />
@@ -174,6 +176,7 @@ const AuthorEdit = ({
         <Label required>Last name</Label>
         <ValidatedField
           component={TextField}
+          data-test-id="author-card-lastname"
           name="lastName"
           validate={[required]}
         />
@@ -182,6 +185,7 @@ const AuthorEdit = ({
         <Label required>Affiliation</Label>
         <ValidatedField
           component={TextField}
+          data-test-id="author-card-affiliation"
           name="affiliation"
           validate={[required]}
         />
@@ -192,6 +196,7 @@ const AuthorEdit = ({
           component={input => (
             <Menu {...input} options={countries} placeholder="Please select" />
           )}
+          data-test-id="author-card-country"
           name="country"
         />
       </Item>
diff --git a/packages/component-faraday-ui/src/SortableList.js b/packages/component-faraday-ui/src/SortableList.js
index f6bd63d6e33fc049676783818ffb6378691fb58a..b0bca13ab7bff9fa9b41d6c12dd61d488baf4b92 100644
--- a/packages/component-faraday-ui/src/SortableList.js
+++ b/packages/component-faraday-ui/src/SortableList.js
@@ -101,6 +101,7 @@ const SortableList = ({
   <Fragment>
     {items.map((item, i) => (
       <DecoratedItem
+        data-test-id={`add-author-id-${i}`}
         dragHandle={dragHandle}
         index={i}
         item={item}
diff --git a/packages/component-faraday-ui/src/WizardAuthors.js b/packages/component-faraday-ui/src/WizardAuthors.js
index 29d3c90a5a53dcb2d49d3fb97653edd0f3abebaf..7ea00f08d3c6b3118b2db4edbcd84bb152977f6a 100644
--- a/packages/component-faraday-ui/src/WizardAuthors.js
+++ b/packages/component-faraday-ui/src/WizardAuthors.js
@@ -73,7 +73,11 @@ const WizardAuthors = ({
     <Row alignItems="center" justify="flex-start">
       <Item>
         <Label>Authors</Label>
-        <ActionLink icon="plus" onClick={addNewAuthor}>
+        <ActionLink
+          data-test-id="add-author"
+          icon="plus"
+          onClick={addNewAuthor}
+        >
           ADD AUTHOR
         </ActionLink>
       </Item>
diff --git a/packages/component-faraday-ui/src/modals/MultiAction.js b/packages/component-faraday-ui/src/modals/MultiAction.js
index c947ac0f9f778d70f7c15558b85d70fcbd87c18f..348be329d5b6a469c1db77531f8ce6e22affe5dc 100644
--- a/packages/component-faraday-ui/src/modals/MultiAction.js
+++ b/packages/component-faraday-ui/src/modals/MultiAction.js
@@ -32,8 +32,10 @@ const MultiAction = ({
         <Spinner size={3} />
       ) : (
         <Fragment>
-          <Button onClick={onClose}>{cancelText}</Button>
-          <Button onClick={onConfirm} primary>
+          <Button data-test-id="modal-cancel" onClick={onClose}>
+            {cancelText}
+          </Button>
+          <Button data-test-id="modal-confirm" onClick={onConfirm} primary>
             {confirmText}
           </Button>
         </Fragment>
diff --git a/packages/component-faraday-ui/src/modals/SingleActionModal.js b/packages/component-faraday-ui/src/modals/SingleActionModal.js
index 49a9ec10906007ff593dcb0b087be7016f76b89d..44385a9e75b20df802e0bb1c0248563ad84b4bb2 100644
--- a/packages/component-faraday-ui/src/modals/SingleActionModal.js
+++ b/packages/component-faraday-ui/src/modals/SingleActionModal.js
@@ -21,7 +21,7 @@ const SingleActionModal = ({
     </Icon>
     {title && <H2>{title}</H2>}
     {subtitle && <Text secondary>{subtitle}</Text>}
-    <Button onClick={onClick} primary>
+    <Button data-test-id="modal-confirm" onClick={onClick} primary>
       {confirmText}
     </Button>
   </Root>
diff --git a/packages/components-faraday/src/components/Admin/AdminUsers.js b/packages/components-faraday/src/components/Admin/AdminUsers.js
index 0fc5130192cda78f6ac5dba1b246dde4d7d1bc86..b29d70d4221431fbfdb750fbd965ccbb13dd00b0 100644
--- a/packages/components-faraday/src/components/Admin/AdminUsers.js
+++ b/packages/components-faraday/src/components/Admin/AdminUsers.js
@@ -45,7 +45,12 @@ const Users = ({
   <Fragment>
     <Row alignItems="center" justify="space-between" mb={1}>
       <Item alignItems="center">
-        <ActionLink icon="arrow-left" mr={2} onClick={history.goBack}>
+        <ActionLink
+          data-test-id="go-to-dashboard"
+          icon="arrow-left"
+          mr={2}
+          onClick={history.goBack}
+        >
           Admin Dashboard
         </ActionLink>
         <AddUser