diff --git a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html
index 80fa873f..4a5a585e 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThingsVB/CreateOrganization.html
@@ -429,11 +429,6 @@
 	<td>submit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Primate College of America</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>name</td>
diff --git a/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html b/utilities/acceptance-tests/suites/AddPublicationsVB/SearchPublications.html
index db09f129..c375aec0 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>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -206,7 +206,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -301,7 +301,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -376,7 +376,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -456,7 +456,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -511,7 +511,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRolesVB/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRolesVB/VerifyAllRolesSearchable.html
index b25b9ec8..047266c6 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>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -141,7 +141,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -241,7 +241,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -341,7 +341,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -396,7 +396,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -426,7 +426,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -456,7 +456,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -526,7 +526,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Search</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
index 074dd0d6..2a5bba9f 100644
--- a/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
+++ b/utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html
@@ -306,7 +306,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>
@@ -371,7 +371,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>
@@ -382,7 +382,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>
diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html
index 7841568b..12347855 100644
--- a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html
@@ -179,11 +179,6 @@
 	<td>This field must not be empty.</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Must either select an existing organization or create a new one.</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Verify entering just degree is not valid</td>
@@ -191,7 +186,7 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>degreeUri</td>
+	<td>degree</td>
 	<td>label=B.S. Bachelor of Science</td>
 </tr>
 <tr>
@@ -209,11 +204,6 @@
 	<td>This field must not be empty.</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Must either select an existing organization or create a new one.</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Verify entering just degree and major is not valid</td>
@@ -221,7 +211,7 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>degreeUri</td>
+	<td>degree</td>
 	<td>label=B.S. Bachelor of Science</td>
 </tr>
 <tr>
@@ -241,7 +231,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Must either select an existing organization or create a new one.</td>
+	<td>This field must not be empty.</td>
 	<td></td>
 </tr>
 <tr>
@@ -251,7 +241,7 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>degreeUri</td>
+	<td>degree</td>
 	<td>label=B.S. Bachelor of Science</td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/Suite.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/Suite.html
index 445eda34..d19de8a9 100644
--- a/utilities/acceptance-tests/suites/CustomEducationFormVB/Suite.html
+++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/Suite.html
@@ -1,21 +1,21 @@
-<?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="CreateTestFacultyMember.html">CreateTestFacultyMember</a></td></tr>
-<tr><td><a href="AddEducationBackground.html">AddEducationBackground</a></td></tr>
-<tr><td><a href="ChangeEducationBackground.html">ChangeEducationBackground</a></td></tr>
-<tr><td><a href="SearchEducationBackground.html">SearchEducationBackground</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="DeleteEducationalBackground.html">DeleteEducationalBackground</a></td></tr>
-<tr><td><a href="DeleteTestFacultyMember.html">DeleteTestFacultyMember</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="CreateTestFacultyMember.html">CreateTestFacultyMember</a></td></tr>
+<tr><td><a href="AddEducationBackground.html">AddEducationBackground</a></td></tr>
+<tr><td><a href="ChangeEducationBackground.html">ChangeEducationBackground</a></td></tr>
+<tr><td><a href="SearchEducationBackground.html">SearchEducationBackground</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="DeleteEducationalBackground.html">DeleteEducationalBackground</a></td></tr>
+<tr><td><a href="DeleteTestFacultyMember.html">DeleteTestFacultyMember</a></td></tr>
+</tbody></table>
+</body>
+</html>