diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
index 87a6a50d..e76bec87 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
@@ -194,6 +194,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Return</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Faculty, Jane</td>
@@ -994,6 +999,11 @@
 	<td>Add new entry for: eRA Commons id</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
index 71b9e13e..1c5d034c 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
@@ -129,9 +129,14 @@
 	<td class="comment">Edit all fields</td>
 	<td></td>
 </tr>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//ul[@id='individual-hasResearchArea']/li/a[2]/img</td>
+	<td>css=a.add-hasResearchArea &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -139,9 +144,14 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>id=showAddFormButton</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@id='submit' and @value='Add a new item of this type']</td>
+	<td>link=exact:Can't find the concept you want? Create your own.</td>
 	<td></td>
 </tr>
 <tr>
@@ -151,12 +161,37 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>name</td>
+	<td>id=relatedIndLabel</td>
 	<td>Primatia Africana</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Return to Manage Concepts</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Return</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
@@ -204,6 +239,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -249,6 +289,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -277,7 +322,17 @@
 <tr>
 	<td>select</td>
 	<td>typeOfNew</td>
-	<td>label=Country (core)</td>
+	<td>label=Country (vivo)</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//input[@id='submit' and @value='Add a new item of this type']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -349,6 +404,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -374,6 +434,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -469,6 +534,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -494,6 +564,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -544,6 +619,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -604,6 +684,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -629,6 +714,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -654,6 +744,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -679,6 +774,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -704,6 +804,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -729,6 +834,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>
@@ -762,7 +872,7 @@
 <tr>
 	<td>select</td>
 	<td>typeOfNew</td>
-	<td>label=License (core)</td>
+	<td>label=License (vivo)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -802,7 +912,7 @@
 <tr>
 	<td>select</td>
 	<td>typeOfNew</td>
-	<td>label=Licensure (core)</td>
+	<td>label=Licensure (vivo)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -839,6 +949,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>tinymce</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>tinymce</td>