diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
index 097cde6b..a52a9cf9 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index 12b7418e..0e9916b4 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
index 1625a91b..9faf3919 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index cf001d27..ddcfd2f0 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html
index 377701b4..b283ccf6 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateFacultyMember.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
index 0ba0227e..2b9203aa 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLibrarian.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
index e79296c9..53fe6109 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index b0ab37ee..88cbf6f4 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
index edb8e54e..95d0b9ad 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateTopic.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
index 82e0e82a..f4d43233 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html
index 097cde6b..a52a9cf9 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateActivity.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html
index cd22f480..0e9916b4 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateCourse.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
@@ -102,11 +112,11 @@
 <tr>
 	<td>select</td>
 	<td>VClassURI</td>
-	<td>label=Semester Class (core)</td>
+	<td>label=Course (core)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value='Add individual of this class']</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -116,7 +126,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Create a new Semester Class</td>
+	<td>Create a new Course</td>
 	<td></td>
 </tr>
 <tr>
@@ -137,11 +147,11 @@
 <tr>
 	<td>select</td>
 	<td>VClassURI</td>
-	<td>label=Semester Class (core)</td>
+	<td>label=Course (core)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value='Add individual of this class']</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -151,7 +161,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Create a new Semester Class</td>
+	<td>Create a new Course</td>
 	<td></td>
 </tr>
 <tr>
@@ -226,7 +236,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='taughtBy']/a</td>
+	<td>//div[@id='courseOfferedBy']/a</td>
 	<td></td>
 </tr>
 <tr>
@@ -236,7 +246,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Add an entry to: taught by</td>
+	<td>Add an entry to: offered by</td>
 	<td></td>
 </tr>
 <tr>
@@ -631,7 +641,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Test related documents</td>
+	<td class="comment">Test additional document info</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html
index 1625a91b..9faf3919 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEquipment.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html
index cf001d27..ddcfd2f0 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateEvent.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateFacultyMember.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateFacultyMember.html
index 377701b4..b283ccf6 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateFacultyMember.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateFacultyMember.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLibrarian.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLibrarian.html
index 065ff3c3..2b9203aa 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLibrarian.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLibrarian.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
@@ -189,31 +199,6 @@
 	<td>Assistant Librarian</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Index</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Index to VIVO Contents</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Librarian</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Librarian</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Librarian</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Logout</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html
index e79296c9..53fe6109 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateLocation.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html
index 026f26d1..88cbf6f4 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
@@ -429,6 +439,11 @@
 	<td>submit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>name</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html
index edb8e54e..95d0b9ad 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateTopic.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html
index 82e0e82a..f4d43233 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/DeleteIndexStuff.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html
index e141c3c3..501d9243 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/VerifyAllThingsSearchable.html
@@ -66,7 +66,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html
index 92e3f589..c35861c3 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddArticle.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddArticle.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddBook.html b/utilities/acceptance-tests/suites/AddPublications/AddBook.html
index 74774d94..3bb76b1e 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddBook.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddBook.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html
index 4117d37d..d95ebe40 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddChapter.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddChapter.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddConference.html b/utilities/acceptance-tests/suites/AddPublications/AddConference.html
index 3da87e57..91c1b4f8 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddConference.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddConference.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html b/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html
index 667f14b5..3e671a16 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddTestFaculty.html
@@ -89,6 +89,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html b/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html
index f5fbaa9c..892d9a98 100644
--- a/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html
+++ b/utilities/acceptance-tests/suites/AddPublications/AddTestFacultyBack.html
@@ -89,6 +89,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html b/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html
index 7f586f3b..c5392c36 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteArticle.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html b/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html
index 42fc5547..ee824ccf 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteBook.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html b/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html
index d9c09cf8..b6ee97cb 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteChapter.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html b/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html
index 4df13ab5..a5a5ca07 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteConference.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
index e18f4fff..057c556a 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteIndexStuff.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html
index 894ca60e..387c2e0f 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteTestFaculty.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
index 432c86ac..c4ce45fd 100644
--- a/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
+++ b/utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublications/Suite.html b/utilities/acceptance-tests/suites/AddPublications/Suite.html
index 6e833d27..733f6dfd 100644
--- a/utilities/acceptance-tests/suites/AddPublications/Suite.html
+++ b/utilities/acceptance-tests/suites/AddPublications/Suite.html
@@ -1,45 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
-<tr><td><a href="AddTestFaculty.html">AddTestFaculty</a></td></tr>
-<tr><td><a href="ValidateFields.html">ValidateFields</a></td></tr>
-<tr><td><a 
-href="DeleteValidationStuff.html">DeleteValidationStuff</a></td></tr>
-<tr><td><a 
-href="AddTestFacultyBack.html">AddTestFacultyBack</a></td></tr>
-<tr><td><a 
-href="AddBook.html">AddBook</a></td></tr>
-<tr><td><a 
-href="AddArticle.html">AddArticle</a></td></tr>
-<tr><td><a 
-href="AddChapter.html">AddChapter</a></td></tr>
-<tr><td><a 
-href="AddConference.html">AddConference</a></td></tr>
-<tr><td><a 
-href="CheckPublicView.html">CheckPublicView</a></td></tr>
-<tr><td><a 
-href="CheckIndexView.html">CheckIndexView</a></td></tr>
-<tr><td><a 
-href="SearchPublications.html">SearchPublications</a></td></tr>
-<tr><td><a 
-href="DeleteConference.html">DeleteConference</a></td></tr>
-<tr><td><a 
-href="DeleteChapter.html">DeleteChapter</a></td></tr>
-<tr><td><a 
-href="DeleteArticle.html">DeleteArticle</a></td></tr>
-<tr><td><a 
-href="DeleteBook.html">DeleteBook</a></td></tr>
-<tr><td><a 
-href="DeleteIndexStuff.html">DeleteIndexStuff</a></td></tr>
-<tr><td><a href="DeleteTestFaculty.html">DeleteTestFaculty</a></td></tr>
-</tbody></table>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
+<tr><td><a href="AddTestFaculty.html">AddTestFaculty</a></td></tr>
+<tr><td><a href="ValidateFields.html">ValidateFields</a></td></tr>
+<tr><td><a href="DeleteValidationStuff.html">DeleteValidationStuff</a></td></tr>
+<tr><td><a href="AddTestFacultyBack.html">AddTestFacultyBack</a></td></tr>
+<tr><td><a href="AddBook.html">AddBook</a></td></tr>
+<tr><td><a href="AddArticle.html">AddArticle</a></td></tr>
+<tr><td><a href="AddChapter.html">AddChapter</a></td></tr>
+<tr><td><a href="AddConference.html">AddConference</a></td></tr>
+<tr><td><a href="CheckPublicView.html">CheckPublicView</a></td></tr>
+<tr><td><a href="CheckIndexView.html">CheckIndexView</a></td></tr>
+<tr><td><a href="SearchPublications.html">SearchPublications</a></td></tr>
+<tr><td><a href="DeleteConference.html">DeleteConference</a></td></tr>
+<tr><td><a href="DeleteChapter.html">DeleteChapter</a></td></tr>
+<tr><td><a href="DeleteArticle.html">DeleteArticle</a></td></tr>
+<tr><td><a href="DeleteBook.html">DeleteBook</a></td></tr>
+<tr><td><a href="DeleteIndexStuff.html">DeleteIndexStuff</a></td></tr>
+<tr><td><a href="DeleteTestFaculty.html">DeleteTestFaculty</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
index ecc3c67a..63e02248 100644
--- a/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
+++ b/utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html
index 92e3f589..c35861c3 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddArticle.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html
index 74774d94..3bb76b1e 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddBook.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html
index 4117d37d..d95ebe40 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddChapter.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html
index 3da87e57..91c1b4f8 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddConference.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFaculty.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFaculty.html
index 667f14b5..3e671a16 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFaculty.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFaculty.html
@@ -89,6 +89,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFacultyBack.html b/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFacultyBack.html
index f5fbaa9c..892d9a98 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFacultyBack.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/AddTestFacultyBack.html
@@ -89,6 +89,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteArticle.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteArticle.html
index 7f586f3b..c5392c36 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteArticle.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteArticle.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteBook.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteBook.html
index 42fc5547..ee824ccf 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteBook.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteBook.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteChapter.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteChapter.html
index d9c09cf8..b6ee97cb 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteChapter.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteChapter.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteConference.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteConference.html
index 4df13ab5..a5a5ca07 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteConference.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteConference.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html
index e18f4fff..057c556a 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteIndexStuff.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteTestFaculty.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteTestFaculty.html
index 894ca60e..387c2e0f 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteTestFaculty.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteTestFaculty.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html
index 432c86ac..c4ce45fd 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/DeleteValidationStuff.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html b/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html
index c375aec0..791eeb12 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html
@@ -71,7 +71,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -206,7 +206,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -301,7 +301,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -376,7 +376,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -456,7 +456,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -511,7 +511,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html
index ecc3c67a..63e02248 100644
--- a/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html
+++ b/utilities/acceptance-tests/suites/AddPublicationsVB/ValidateFields.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
index 572a67cc..23517d13 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
index 6d5100d3..5abbd8b7 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
index 2077a518..dde23b74 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
index 45aae6f7..8140343a 100644
--- a/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
index bd44af69..da37e8b7 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
index dbc57078..f2048196 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
index ec8be538..dffbbf5f 100644
--- a/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
+++ b/utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
index 2ef9b525..76209f2e 100644
--- a/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html
index 38b1b33c..239a2470 100644
--- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestFacultyMember.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html
index 372c1b85..1c2ce928 100644
--- a/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html
+++ b/utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/suite.html b/utilities/acceptance-tests/suites/AddRoles/suite.html
index 519c68a5..cd6ac736 100644
--- a/utilities/acceptance-tests/suites/AddRoles/suite.html
+++ b/utilities/acceptance-tests/suites/AddRoles/suite.html
@@ -1,32 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
-<tr><td><a href="CreateTestFacultyMember.html">CreateTestFacultyMember</a></td></tr>
-<tr><td><a href="CreateTestLibrarian.html">CreateTestLibrarian</a></td></tr>
-<tr><td><a href="AddFacultyMemberRoles1.html">AddFacultyMemberRoles1</a></td></tr>
-<tr><td><a href="AddFacultyMemberRoles2.html">AddFacultyMemberRoles2</a></td></tr>
-<tr><td><a 
-href="AddLibrarianRoles1.html">AddLibrarianRoles1</a></td></tr>
-<tr><td><a href="AddLibrarianRoles2.html">AddLibrarianRoles2</a></td></tr>
-<tr><td><a href="VerifyAllRolesSearchable.html">VerifyAllRolesSearchable</a></td></tr>
-<tr><td><a 
-href="CheckPublicView.html">CheckPublicView</a></td></tr>
-<tr><td><a 
-href="CheckIndexView.html">CheckIndexView</a></td></tr>
-<tr><td><a 
-href="CheckRepairMode.html">CheckRepairMode</a></td></tr>
-<tr><td><a href="DeleteTestFacultyMember.html">DeleteTestFacultyMember</a></td></tr>
-<tr><td><a 
-href="DeleteTestLibrarian.html">DeleteTestLibrarian</a></td></tr>
-<tr><td><a href="DeleteIndexStuff.html">DeleteIndexStuff</a></td></tr>
-</tbody></table>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
+<tr><td><a href="CreateTestFacultyMember.html">CreateTestFacultyMember</a></td></tr>
+<tr><td><a href="CreateTestLibrarian.html">CreateTestLibrarian</a></td></tr>
+<tr><td><a href="AddFacultyMemberRoles1.html">AddFacultyMemberRoles1</a></td></tr>
+<tr><td><a href="AddFacultyMemberRoles2.html">AddFacultyMemberRoles2</a></td></tr>
+<tr><td><a href="AddLibrarianRoles1.html">AddLibrarianRoles1</a></td></tr>
+<tr><td><a href="AddLibrarianRoles2.html">AddLibrarianRoles2</a></td></tr>
+<tr><td><a href="VerifyAllRolesSearchable.html">VerifyAllRolesSearchable</a></td></tr>
+<tr><td><a href="CheckPublicView.html">CheckPublicView</a></td></tr>
+<tr><td><a href="CheckIndexView.html">CheckIndexView</a></td></tr>
+<tr><td><a href="CheckRepairMode.html">CheckRepairMode</a></td></tr>
+<tr><td><a href="DeleteTestFacultyMember.html">DeleteTestFacultyMember</a></td></tr>
+<tr><td><a href="DeleteTestLibrarian.html">DeleteTestLibrarian</a></td></tr>
+<tr><td><a href="DeleteIndexStuff.html">DeleteIndexStuff</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles1.html b/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles1.html
index 572a67cc..23517d13 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles1.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles2.html b/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles2.html
index 6d5100d3..5abbd8b7 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/AddFacultyMemberRoles2.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles1.html b/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles1.html
index 2077a518..dde23b74 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles1.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles1.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles2.html b/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles2.html
index 45aae6f7..8140343a 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles2.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/AddLibrarianRoles2.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/CheckRepairMode.html b/utilities/acceptance-tests/suites/AddRolesVB/CheckRepairMode.html
index bd44af69..da37e8b7 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/CheckRepairMode.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/CheckRepairMode.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRolesVB/CreateTestFacultyMember.html
index dbc57078..f2048196 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/CreateTestFacultyMember.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/CreateTestLibrarian.html b/utilities/acceptance-tests/suites/AddRolesVB/CreateTestLibrarian.html
index ec8be538..dffbbf5f 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/CreateTestLibrarian.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/CreateTestLibrarian.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html
index 2ef9b525..76209f2e 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/DeleteIndexStuff.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestFacultyMember.html
index 38b1b33c..239a2470 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestFacultyMember.html
@@ -91,7 +91,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestLibrarian.html b/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestLibrarian.html
index 372c1b85..1c2ce928 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestLibrarian.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/DeleteTestLibrarian.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRolesVB/VerifyAllRolesSearchable.html
index e71f9b90..003e760f 100644
--- a/utilities/acceptance-tests/suites/AddRolesVB/VerifyAllRolesSearchable.html
+++ b/utilities/acceptance-tests/suites/AddRolesVB/VerifyAllRolesSearchable.html
@@ -66,7 +66,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -141,7 +141,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -236,7 +236,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -311,7 +311,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -366,7 +366,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -396,7 +396,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -426,7 +426,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
@@ -496,7 +496,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@value='Search']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteEverythingElse.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteEverythingElse.html
index 1db5dda2..e1fb9922 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteEverythingElse.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteEverythingElse.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
index 97c8e151..2f9e3883 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html
index cce1373e..e35d9cea 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestTabs.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestTabs.html
index 23c39dbc..eb143c25 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestTabs.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestTabs.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/Suite.html b/utilities/acceptance-tests/suites/CreatePeople/Suite.html
index c1a77083..c16c57de 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/Suite.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/Suite.html
@@ -1,52 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
-  <title>Test Suite</title>
-</head>
-<body>
-<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
-<tr><td><b>Test Suite</b></td></tr>
-<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
-<tr><td><a href="CreateFacultyMember.html">CreateFacultyMember</a></td></tr>
-<tr><td><a 
-href="CreateLibrarian.html">CreateLibrarian</a></td></tr>
-<tr><td><a 
-href="AddFacultyInfo.html">AddFacultyInfo</a></td></tr>
-<tr><td><a 
-href="EditFacultyInfo.html">EditFacultyInfo</a></td></tr>
-<tr><td><a 
-href="AddFacultyInfo2.html">AddFacultyInfo2</a></td></tr>
-<tr><td><a 
-href="PublicFacultyInfo.html">PublicFacultyInfo</a></td></tr>
-<tr><td><a 
-href="SearchFacultyInfo.html">SearchFacultyInfo</a></td></tr>
-<tr><td><a href="DeleteFacultyInfo.html">DeleteFacultyInfo</a></td></tr>
-<tr><td><a 
-href="UploadFacultyImage.html">UploadFacultyImage</a></td></tr>
-<tr><td><a href="ChangeFacultyImage.html">ChangeFacultyImage</a></td></tr>
-<tr><td><a href="VerifyImageDisplay.html">VerifyImageDisplay</a></td></tr>
-<tr><td><a href="UploadLibrarianImage.html">UploadLibrarianImage</a></td></tr>
-<tr><td><a href="ChangeLibrarianImage.html">ChangeLibrarianImage</a></td></tr>
-<tr><td><a href="SetupTestTabs.html">SetupTestTabs</a></td></tr>
-<tr><td><a href="AddFacultyClassAutolink.html">AddFacultyClassAutolink</a></td></tr>
-<tr><td><a href="AddLibrarianClassAutolink.html">AddLibrarianClassAutolink</a></td></tr>
-<tr><td><a href="AddFacultyPosition.html">AddFacultyPosition</a></td></tr>
-<tr><td><a href="AssociateLibToFac.html">AssociateLibToFac</a></td></tr>
-<tr><td><a href="CheckPeopleLinks.html">CheckPeopleLinks</a></td></tr>
-<tr><td><a href="SearchPeople.html">SearchPeople</a></td></tr>
-<tr><td><a href="BrowseIndex.html">BrowseIndex</a></td></tr>
-<tr><td><a href="DeleteFacultyImage.html">DeleteFacultyImage</a></td></tr>
-<tr><td><a href="DeleteLibrarianImage.html">DeleteLibrarianImage</a></td></tr>
-<tr><td><a href="DeleteTestPeople.html">DeleteTestPeople</a></td></tr>
-<tr><td><a href="DeleteTestTabs.html">DeleteTestTabs</a></td></tr>
-<tr><td><a 
-href="DeleteLibtoFacAssociation.html">DeleteLibtoFacAssociation</a></td></tr>
-<tr><td><a href="DeleteTestOrganization.html">DeleteTestOrganization</a></td></tr>
-<tr><td><a 
-href="DeleteEverythingElse.html">DeleteEverythingElse</a></td></tr>
-<tr><td><a href="UploadNonPersonImage.html">UploadNonPersonImage</a></td></tr>
-</tbody></table>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="SetDefaultTheme.html">SetDefaultTheme</a></td></tr>
+<tr><td><a href="CreateFacultyMember.html">CreateFacultyMember</a></td></tr>
+<tr><td><a href="CreateLibrarian.html">CreateLibrarian</a></td></tr>
+<tr><td><a href="AddFacultyInfo.html">AddFacultyInfo</a></td></tr>
+<tr><td><a href="EditFacultyInfo.html">EditFacultyInfo</a></td></tr>
+<tr><td><a href="AddFacultyInfo2.html">AddFacultyInfo2</a></td></tr>
+<tr><td><a href="PublicFacultyInfo.html">PublicFacultyInfo</a></td></tr>
+<tr><td><a href="SearchFacultyInfo.html">SearchFacultyInfo</a></td></tr>
+<tr><td><a href="DeleteFacultyInfo.html">DeleteFacultyInfo</a></td></tr>
+<tr><td><a href="UploadFacultyImage.html">UploadFacultyImage</a></td></tr>
+<tr><td><a href="ChangeFacultyImage.html">ChangeFacultyImage</a></td></tr>
+<tr><td><a href="VerifyImageDisplay.html">VerifyImageDisplay</a></td></tr>
+<tr><td><a href="UploadLibrarianImage.html">UploadLibrarianImage</a></td></tr>
+<tr><td><a href="ChangeLibrarianImage.html">ChangeLibrarianImage</a></td></tr>
+<tr><td><a href="SetupTestTabs.html">SetupTestTabs</a></td></tr>
+<tr><td><a href="AddFacultyClassAutolink.html">AddFacultyClassAutolink</a></td></tr>
+<tr><td><a href="AddLibrarianClassAutolink.html">AddLibrarianClassAutolink</a></td></tr>
+<tr><td><a href="AddFacultyPosition.html">AddFacultyPosition</a></td></tr>
+<tr><td><a href="AssociateLibToFac.html">AssociateLibToFac</a></td></tr>
+<tr><td><a href="CheckPeopleLinks.html">CheckPeopleLinks</a></td></tr>
+<tr><td><a href="SearchPeople.html">SearchPeople</a></td></tr>
+<tr><td><a href="BrowseIndex.html">BrowseIndex</a></td></tr>
+<tr><td><a href="DeleteFacultyImage.html">DeleteFacultyImage</a></td></tr>
+<tr><td><a href="DeleteLibrarianImage.html">DeleteLibrarianImage</a></td></tr>
+<tr><td><a href="DeleteTestPeople.html">DeleteTestPeople</a></td></tr>
+<tr><td><a href="DeleteTestTabs.html">DeleteTestTabs</a></td></tr>
+<tr><td><a href="DeleteLibtoFacAssociation.html">DeleteLibtoFacAssociation</a></td></tr>
+<tr><td><a href="DeleteTestOrganization.html">DeleteTestOrganization</a></td></tr>
+<tr><td><a href="DeleteEverythingElse.html">DeleteEverythingElse</a></td></tr>
+<tr><td><a href="UploadNonPersonImage.html">UploadNonPersonImage</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
index 2a5bba9f..90a1299c 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html
index 1db5dda2..e1fb9922 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibToFacAssociation.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibToFacAssociation.html
index 97c8e151..2f9e3883 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibToFacAssociation.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibToFacAssociation.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html
index cce1373e..e35d9cea 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html
index 23c39dbc..eb143c25 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html
@@ -84,6 +84,16 @@
 	<td>loginForm</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
index 2a5bba9f..90a1299c 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
@@ -86,7 +86,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>