diff --git a/automation/Libs/TempTestCase1521183642560.groovy b/automation/Libs/TempTestCase1521183642560.groovy
deleted file mode 100644
index 5db2393492b973a590302b01512c84c092bd4fa2..0000000000000000000000000000000000000000
--- a/automation/Libs/TempTestCase1521183642560.groovy
+++ /dev/null
@@ -1,25 +0,0 @@
-import com.kms.katalon.core.main.TestCaseMain
-import com.kms.katalon.core.logging.KeywordLogger
-import groovy.lang.MissingPropertyException
-import com.kms.katalon.core.testcase.TestCaseBinding
-import com.kms.katalon.core.driver.internal.DriverCleanerCollector
-import com.kms.katalon.core.model.FailureHandling
-import com.kms.katalon.core.configuration.RunConfiguration
-import com.kms.katalon.core.webui.contribution.WebUiDriverCleaner
-import com.kms.katalon.core.mobile.contribution.MobileDriverCleaner
-
-
-DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner())
-DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner())
-
-
-RunConfiguration.setExecutionSettingFile('/var/folders/3h/5jvs258x4lng1yz2s32ryr4r0000gn/T/Katalon/Test Cases/Add a new user/Add a new user/20180316_090042/execution.properties')
-
-TestCaseMain.beforeStart()
-try {
-    
-	    TestCaseMain.runTestCase('Test Cases/Add a new user/Add a new user', new TestCaseBinding('Test Cases/Add a new user/Add a new user', [:]), FailureHandling.STOP_ON_FAILURE )
-    
-} catch (Exception e) {
-    TestCaseMain.logError(e, 'Test Cases/Add a new user/Add a new user')
-}
diff --git a/automation/Libs/TempTestCase1521183683788.groovy b/automation/Libs/TempTestCase1521183683788.groovy
deleted file mode 100644
index a5365f2dfffd3ddede27b98f15911f34660b2286..0000000000000000000000000000000000000000
--- a/automation/Libs/TempTestCase1521183683788.groovy
+++ /dev/null
@@ -1,25 +0,0 @@
-import com.kms.katalon.core.main.TestCaseMain
-import com.kms.katalon.core.logging.KeywordLogger
-import groovy.lang.MissingPropertyException
-import com.kms.katalon.core.testcase.TestCaseBinding
-import com.kms.katalon.core.driver.internal.DriverCleanerCollector
-import com.kms.katalon.core.model.FailureHandling
-import com.kms.katalon.core.configuration.RunConfiguration
-import com.kms.katalon.core.webui.contribution.WebUiDriverCleaner
-import com.kms.katalon.core.mobile.contribution.MobileDriverCleaner
-
-
-DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.webui.contribution.WebUiDriverCleaner())
-DriverCleanerCollector.getInstance().addDriverCleaner(new com.kms.katalon.core.mobile.contribution.MobileDriverCleaner())
-
-
-RunConfiguration.setExecutionSettingFile('/var/folders/3h/5jvs258x4lng1yz2s32ryr4r0000gn/T/Katalon/Test Cases/Add a new user/Add a new user/20180316_090123/execution.properties')
-
-TestCaseMain.beforeStart()
-try {
-    
-	    TestCaseMain.runTestCase('Test Cases/Add a new user/Add a new user', new TestCaseBinding('Test Cases/Add a new user/Add a new user', [:]), FailureHandling.STOP_ON_FAILURE )
-    
-} catch (Exception e) {
-    TestCaseMain.logError(e, 'Test Cases/Add a new user/Add a new user')
-}
diff --git a/automation/Object Repository/NewUser/addUser.rs b/automation/Object Repository/NewUser/addUser.rs
index 11ddfded4642cff7ecae421a7ad544b29b096267..9a821d12d3b7f7817c73c132751d505947cf47ed 100644
--- a/automation/Object Repository/NewUser/addUser.rs	
+++ b/automation/Object Repository/NewUser/addUser.rs	
@@ -7,14 +7,14 @@
    <selectorCollection>
       <entry>
          <key>XPATH</key>
-         <value></value>
+         <value>//button/*[1]</value>
       </entry>
       <entry>
          <key>CSS</key>
-         <value>button[class=&quot;sc-hgHYgh ljXRif&quot;]</value>
+         <value>button:first-child</value>
       </entry>
    </selectorCollection>
-   <selectorMethod>CSS</selectorMethod>
+   <selectorMethod>XPATH</selectorMethod>
    <useRalativeImagePath>false</useRalativeImagePath>
    <webElementProperties>
       <isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewUser/admin.rs b/automation/Object Repository/NewUser/admin.rs
index 6f4db1db20ab428a4f605489b8874e39320aa1a0..d46e98fc39661dc1a0b179c86d868c1d75524cd1 100644
--- a/automation/Object Repository/NewUser/admin.rs	
+++ b/automation/Object Repository/NewUser/admin.rs	
@@ -7,11 +7,10 @@
    <selectorCollection>
       <entry>
          <key>XPATH</key>
-         <value>//div[@class=&quot;sc-iQKALj gyquxk&quot;]/div/span[contains(text(),'admin')]</value>
+         <value>//span[contains(text(),'admin')]</value>
       </entry>
       <entry>
          <key>CSS</key>
-         <value></value>
       </entry>
    </selectorCollection>
    <selectorMethod>XPATH</selectorMethod>
diff --git a/automation/Object Repository/NewUser/roleAdmin.rs b/automation/Object Repository/NewUser/roleAdmin.rs
index be4985bd6c507fbb4e8b90487fe2cac24272c4d3..e568d0ea2dc034399094c8528fb379685d58ee0a 100644
--- a/automation/Object Repository/NewUser/roleAdmin.rs	
+++ b/automation/Object Repository/NewUser/roleAdmin.rs	
@@ -7,10 +7,14 @@
    <selectorCollection>
       <entry>
          <key>XPATH</key>
-         <value>//label[@class=&quot;sc-kAzzGY dnReMb&quot;]/input[@name=&quot;admin&quot;]</value>
+         <value>//div[contains(text(),'Editor in Chief')]</value>
+      </entry>
+      <entry>
+         <key>CSS</key>
+         <value>div[data-test=&quot;role-selector&quot;] div[role=&quot;option&quot;]:last-child</value>
       </entry>
    </selectorCollection>
-   <selectorMethod>XPATH</selectorMethod>
+   <selectorMethod>CSS</selectorMethod>
    <useRalativeImagePath>false</useRalativeImagePath>
    <webElementProperties>
       <isSelected>true</isSelected>
diff --git a/automation/Object Repository/NewUser/users.rs b/automation/Object Repository/NewUser/users.rs
index 699f97dd4f678aa4c4a6264a46a71c5e1311b3cb..741e7f5528791d64e35ab023b30a877a1422ef02 100644
--- a/automation/Object Repository/NewUser/users.rs	
+++ b/automation/Object Repository/NewUser/users.rs	
@@ -6,15 +6,15 @@
    <elementGuidId>fc06cfc7-c7e0-449f-b85c-d7c1f34f21c3</elementGuidId>
    <selectorCollection>
       <entry>
-         <key>CSS</key>
-         <value>#root > div > div > div.sc-drKuOJ.fmUpkt > div > div > div:nth-child(2)</value>
+         <key>XPATH</key>
+         <value>//span[contains(text(),'Users')]</value>
       </entry>
       <entry>
-         <key>XPATH</key>
-         <value>//div[@class=&quot;sc-eXNvrr hVBWZK&quot;]/span[contains(text(),'Users')]</value>
+         <key>CSS</key>
+         <value>//span[contains(text(),'Users')]</value>
       </entry>
    </selectorCollection>
-   <selectorMethod>CSS</selectorMethod>
+   <selectorMethod>XPATH</selectorMethod>
    <useRalativeImagePath>false</useRalativeImagePath>
    <webElementProperties>
       <isSelected>true</isSelected>
diff --git a/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy b/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy
index dac24ae8c6919f8f98d425d5b42e9fada5a456ed..dd4ee208c49b4487a73fae05934a1a88cb44e876 100644
--- a/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy	
+++ b/automation/Scripts/Add a new user/Add a new user/Script1521123804636.groovy	
@@ -20,59 +20,84 @@ import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI
 import internal.GlobalVariable as GlobalVariable
 
 WebUI.openBrowser(null)
+
 WebUI.navigateToUrl('https://xpub-faraday.now.sh')
 
-username = findTestObject("NewUser/username")
+username = findTestObject('NewUser/username')
+
 WebUI.click(username)
+
 WebUI.setText(username, 'admin')
 
-password = findTestObject("NewUser/password")
+password = findTestObject('NewUser/password')
+
 WebUI.click(password)
+
 WebUI.setText(password, 'admin123')
 
-login = findTestObject("NewUser/login")
+login = findTestObject('NewUser/login')
+
 WebUI.click(login)
 
-admin = findTestObject("NewUser/admin")
+admin = findTestObject('NewUser/admin')
+
 WebUI.click(admin)
 
-adminDashboard = findTestObject("NewUser/adminDashboard")
+adminDashboard = findTestObject('NewUser/adminDashboard')
+
 WebUI.click(adminDashboard)
 
-users = findTestObject("NewUser/users")
+users = findTestObject('NewUser/users')
+
 WebUI.waitForElementVisible(users, 2)
+
 WebUI.click(users)
 
-addUser = findTestObject("NewUser/addUser")
+addUser = findTestObject('NewUser/addUser')
+
 WebUI.click(addUser)
 
-email = findTestObject("NewUser/email")
+email = findTestObject('NewUser/email')
+
 WebUI.click(email)
-WebUI.setText(email, 'vlad.stegaru+newuser@thinslices.com')
 
-roleDropDown = findTestObject("NewUser/roleDropDown")
+WebUI.setText(email, 'bogdan.cochior+1@thinslices.com')
+
+roleDropDown = findTestObject('NewUser/roleDropDown')
+
 WebUI.click(roleDropDown)
 
-author = findTestObject("NewUser/author")
+author = findTestObject('NewUser/author')
+
 WebUI.click(author)
 
-firstName = findTestObject("NewUser/firstName")
+firstName = findTestObject('NewUser/firstName')
+
 WebUI.click(firstName)
-WebUI.setText(firstName, 'Vlad')
 
-lastName = findTestObject("NewUser/lastName")
+WebUI.setText(firstName, 'Bogdan Author')
+
+lastName = findTestObject('NewUser/lastName')
+
 WebUI.click(lastName)
+
 WebUI.setText(lastName, 'Stegaru')
 
-affiliation = findTestObject("NewUser/affiliation")
+affiliation = findTestObject('NewUser/affiliation')
+
 WebUI.click(affiliation)
+
 WebUI.setText(affiliation, 'College')
 
-title = findTestObject("NewUser/titleDropDown")
+title = findTestObject('NewUser/titleDropDown')
+
 WebUI.click(title)
 
-dr = findTestObject("NewUser/Dr")
+dr = findTestObject('NewUser/Dr')
+
 WebUI.click(dr)
 
-save = findTestObject("NewUser/save")
-WebUI.click(save)
\ No newline at end of file
+save = findTestObject('NewUser/save')
+
+WebUI.click(save)
+
diff --git a/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy b/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy
index c102e9844af5d89516038ceb5c8494bbab3c5771..de38d51f58d176fe41cb72d88137550c9cd7d9ba 100644
--- a/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy	
+++ b/automation/Scripts/Add new manuscript/Add a new manuscript/Script1520433593112.groovy	
@@ -56,11 +56,6 @@ hindawiFaraday = findTestObject('NewManuscript/journalfFieldSelection/HindawiFar
 WebUI.waitForElementVisible(newButton, 2)
 
 WebUI.click(hindawiFaraday)
-<<<<<<< HEAD
-=======
-
-WebUI.click(hindawiFaraday)
->>>>>>> 475d50779205932ca31f13cfd3a6f6e7faefb161
 
 issue = findTestObject('NewManuscript/journalfFieldSelection/Issue')
 
diff --git a/packages/components-faraday/src/components/Admin/AdminDashboard.js b/packages/components-faraday/src/components/Admin/AdminDashboard.js
index b36d692ea13982415d60c8355ff33d8293b159c8..5b138406023bf787f602ed026686d3e47d32a5fe 100644
--- a/packages/components-faraday/src/components/Admin/AdminDashboard.js
+++ b/packages/components-faraday/src/components/Admin/AdminDashboard.js
@@ -12,7 +12,7 @@ const AdminDashboard = ({ history, theme }) => (
         </Icon>
         <span>Journal configuration</span>
       </Card>
-      <Card onClick={() => history.push('/admin/users')}>
+      <Card data-test="card-users" onClick={() => history.push('/admin/users')}>
         <Icon color={theme.colorPrimary} size={6}>
           users
         </Icon>
diff --git a/packages/components-faraday/src/components/Admin/AdminUsers.js b/packages/components-faraday/src/components/Admin/AdminUsers.js
index 0970cde4a1b677301662acab71d5689adce0e4b0..4185c022c7a6c704fdacb35f20039c4d29690789 100644
--- a/packages/components-faraday/src/components/Admin/AdminUsers.js
+++ b/packages/components-faraday/src/components/Admin/AdminUsers.js
@@ -71,7 +71,10 @@ const Users = ({
           <span>Admin Dashboard</span>
           <span>Users</span>
         </BreadCrumbs>
-        <AddButton onClick={() => history.push('/admin/users/add')}>
+        <AddButton
+          data-test="button-add-user"
+          onClick={() => history.push('/admin/users/add')}
+        >
           <Icon color={theme.colorPrimary} size={3}>
             plus-circle
           </Icon>