diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html b/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html
index ad49af14..9cb810b3 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/AddLibrarianClassAutolink.html
@@ -61,7 +61,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 8a814f58..1db5dda2 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteEverythingElse.html
@@ -61,7 +61,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 098bcdd5..97c8e151 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibToFacAssociation.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibToFacAssociation.html
@@ -61,7 +61,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/DeleteLibrarianImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html
index 8ba67477..36ac2750 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteLibrarianImage.html
@@ -61,7 +61,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/DeleteTestOrganization.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html
index 472a38e4..cce1373e 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestOrganization.html
@@ -61,7 +61,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/DeleteTestPeople.html b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html
index 043455f4..03773a88 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestPeople.html
@@ -61,7 +61,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 180e21cf..e0a0dc7a 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/DeleteTestTabs.html
@@ -61,7 +61,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/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
index bdd645b3..074dd0d6 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -114,16 +114,6 @@
 	<td>Country</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=G</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Country</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Germany</td>
@@ -237,7 +227,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany1.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\germany1.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -277,7 +267,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany1.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\germany1.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -431,7 +421,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=edit</td>
+	<td>//div[@id='dprop-vitro-image']/div/div/div/span/a[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -442,7 +432,7 @@
 <tr>
 	<td>type</td>
 	<td>datafile</td>
-	<td>C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany2.jpg</td>
+	<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\germany2.jpg</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>