diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
index 89dc4636..6d5100d3 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
@@ -226,7 +226,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Enter research activity without a start date</td>
+	<td class="comment">Enter research activity without start year</td>
 	<td></td>
 </tr>
 <tr>
@@ -286,7 +286,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Consultant</td>
 </tr>
 <tr>
@@ -299,71 +299,11 @@
 	<td>submit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Add research activity - project</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Create research activity entry for Faculty, Jane</td>
+	<td>This field must not be empty.</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Research Activity Type</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>typeSelector</td>
-	<td>label=Project</td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Create research activity entry for Faculty, Jane</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Research Activity Type</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Project Name</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Role in Project</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Years of Participation in Project</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Start Year</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>End Year</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>relatedIndLabel</td>
-	<td>History of Apes in Africa</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>newIndLabel</td>
-	<td>Consultant</td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>startYear</td>
@@ -481,7 +421,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Researcher</td>
 </tr>
 <tr>
@@ -601,7 +541,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Planner</td>
 </tr>
 <tr>
@@ -721,7 +661,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Creator</td>
 </tr>
 <tr>
@@ -841,7 +781,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Co-Instructor</td>
 </tr>
 <tr>
@@ -971,7 +911,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Designer</td>
 </tr>
 <tr>
@@ -1101,7 +1041,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Founder</td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
index ddf123b4..2077a518 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
@@ -351,7 +351,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Presenter</td>
 </tr>
 <tr>
@@ -406,7 +406,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Presenter</td>
 </tr>
 <tr>
@@ -521,7 +521,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Member of panel</td>
 </tr>
 <tr>
@@ -671,7 +671,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Consultant</td>
 </tr>
 <tr>
@@ -786,12 +786,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
-	<td>Librarian</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Board</td>
 </tr>
 <tr>
@@ -946,7 +941,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Chair</td>
 </tr>
 <tr>
@@ -1061,7 +1056,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Booth</td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
index b347e887..45aae6f7 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
@@ -186,7 +186,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Head Librarian</td>
 </tr>
 <tr>
@@ -301,7 +301,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Member</td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
index 23ba177e..bd44af69 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
@@ -151,7 +151,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>newIndLabel</td>
+	<td>roleLabel</td>
 	<td>Member at Large</td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
index 4374f3e5..b25b9ec8 100644
--- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
+++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
@@ -61,12 +61,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>VIVO</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -136,12 +136,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>ape</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -149,11 +149,21 @@
 	<td>ape - VIVO Search Results</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=courses</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=activities</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=topics</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=events</td>
@@ -226,12 +236,27 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>primate</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=courses</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=activities</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=topics</td>
 	<td></td>
 </tr>
 <tr>
@@ -244,6 +269,16 @@
 	<td>link=organizations</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=equipment</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=locations</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Working with Primates | Workshop</td>
@@ -301,12 +336,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>librarian</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -356,12 +391,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>animal</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -386,12 +421,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>carroll</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -416,12 +451,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>library</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -434,6 +469,11 @@
 	<td>Amercian Library Association | Association</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>MLIS Master of Library and Information Science | Academic Degree</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>B.L.S. Bachelor of Library Science | Academic Degree</td>
@@ -454,6 +494,11 @@
 	<td>link=Amercian Library Association</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=MLIS Master of Library and Information Science</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=B.L.S. Bachelor of Library Science</td>
@@ -476,12 +521,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>search</td>
+	<td>querytext</td>
 	<td>faculty</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Search</td>
 	<td></td>
 </tr>
 <tr>