diff --git a/tests/baseCaseTests.js b/tests/baseCaseTests.js
index 7924473..dd0d441 100644
--- a/tests/baseCaseTests.js
+++ b/tests/baseCaseTests.js
@@ -65,7 +65,6 @@ test('can walk through an nih submission workflow and make a submission - base c
     'Quantitative profiling of carbonyl metabolites directly in crude biological extracts using chemoselective tagging and nanoESI-FTMS'
   );
   await submissionMetadataPage.verifyJournalTitle('The Analyst');
-  await submissionMetadataPage.inputPublicationDate('05/02/2010');
 
   await submissionMetadataPage.clickNextToFiles();
 
diff --git a/tests/commonTest.js b/tests/commonTest.js
index 50ea3e7..c5caca3 100644
--- a/tests/commonTest.js
+++ b/tests/commonTest.js
@@ -57,7 +57,7 @@ async function loginSsoMs() {
 export async function logout() {
   return await t
     .click('#user-menu-name') // Open the app menu to make logout btn visible
-    .click(Selector('#user-menu a').withText('Logout'));
+    .click(Selector('a.dropdown-item').withText('Logout'));
 }
 
 export async function verifyJScholarshipDepositStatusIfNeeded(
diff --git a/tests/page_model/SubmissionMetadata.js b/tests/page_model/SubmissionMetadata.js
index 9d89593..883132b 100644
--- a/tests/page_model/SubmissionMetadata.js
+++ b/tests/page_model/SubmissionMetadata.js
@@ -20,33 +20,31 @@ class SubmissionMetadata {
   constructor() {}
 
   async verifyArticleTitle(expectedArticleTitle) {
-    const articleTitle = Selector('textarea').withAttribute('name', 'title');
+    const articleTitle = Selector('div[data-name=title] input');
     await t.expect(articleTitle.value).eql(expectedArticleTitle);
   }
 
   async verifyJournalTitle(expectedJournalTitle) {
-    const journalTitle = Selector('input').withAttribute(
-      'name',
-      'journal-title'
-    );
+    const journalTitle = Selector('div[data-name=journal-title] input');
     await t.expect(journalTitle.value).eql(expectedJournalTitle);
   }
 
   async inputAuthor(authorName) {
-    const authorInput = Selector('input').withAttribute(
-      'name',
-      'authors_0_author'
-    );
+    const createAuthorButton = Selector('div[data-name=authors] button');
+    const authorInput = Selector('div[data-name=author] input');
+
     await t
+      .expect(createAuthorButton.exists)
+      .ok()
+      .click(createAuthorButton)
       .expect(authorInput.exists)
       .ok()
       .typeText(authorInput, authorName, { paste: true, speed: 0.75 });
   }
 
   async inputPublicationDate(date) {
-    const publicationDateInput = Selector('input').withAttribute(
-      'name',
-      'publicationDate'
+    const publicationDateInput = Selector(
+      'div[data-name=publicationDate] input'
     );
     await t
       .expect(publicationDateInput.exists)
@@ -56,7 +54,10 @@ class SubmissionMetadata {
   }
 
   async clickNextToFiles() {
-    const goToFilesButton = Selector('.alpaca-form-button-Next');
+    const goToFilesButton = Selector('button').withAttribute(
+      'data-test-workflow-metadata-next'
+    );
+
     await t.expect(goToFilesButton.exists).ok();
     await t.click(goToFilesButton);
     await t
diff --git a/tests/page_model/SubmissionReview.js b/tests/page_model/SubmissionReview.js
index 4928e58..3acabf1 100644
--- a/tests/page_model/SubmissionReview.js
+++ b/tests/page_model/SubmissionReview.js
@@ -28,7 +28,7 @@ class SubmissionReview {
   async verifyJournal(expectedJournal) {
     const reviewJournal = Selector('ul.list-unstyled')
       .child('li')
-      .withText('Journal title : ' + expectedJournal);
+      .withText('Journal Title : ' + expectedJournal);
     await t.expect(reviewJournal.exists).ok();
   }
 
diff --git a/tests/page_model/SubmissionThankYou.js b/tests/page_model/SubmissionThankYou.js
index 58c6091..c88860d 100644
--- a/tests/page_model/SubmissionThankYou.js
+++ b/tests/page_model/SubmissionThankYou.js
@@ -27,7 +27,7 @@ class SubmissionThankYou {
     const linkToSubmission = Selector('a').withText('here');
     await t.expect(linkToSubmission.exists).ok();
     await t.click(linkToSubmission);
-    const submissionDetailsBody = Selector('h2', {
+    const submissionDetailsBody = Selector('h1', {
       timeout: TIMEOUT_LENGTH,
     }).withText('Submission Detail');
     await t.expect(submissionDetailsBody.exists).ok();