diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index 2b6d8696..13f7b867 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -612,7 +612,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>xpath=(//img[@alt='add'])[19]</td>
+	<td>xpath=(//h3[@id='RO_0001025']/a)[2]</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
index 2ed43e52..e70a4e89 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
@@ -170,7 +170,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>If you don't find the appropriate entry on the selection list above:</td>
+	<td>There are no entries in the system from which to select. </td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
index 09fcfcab..0684ffc9 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
@@ -294,16 +294,6 @@
 	<td>Primate Heart Health Service</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Primate Habitat Research Grant</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Habitat Research Grant Grant</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=New Primate Students</td>
@@ -334,6 +324,16 @@
 	<td>Primate History Library Library</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Primate Memorial Building</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primate Memorial Building Building</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=2</td>
@@ -346,12 +346,12 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Primate Memorial Building</td>
+	<td>link=Primate Habitat Research Grant</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Memorial Building Building</td>
+	<td>Primate Habitat Research Grant Grant</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
index c9315781..12baffb0 100644
--- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
+++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html
@@ -292,13 +292,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[6]/span</td>
-	<td>Associate Librarian</td>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
 </tr>
 <tr>
 	<td>verifyText</td>
 	<td>//div[@id='wrapper-content']/div/ul/li[7]/span</td>
+	<td>Associate Librarian</td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>//div[@id='wrapper-content']/div/ul/li[8]/span</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
index ff105f2b..cd90e8b7 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/AddCoAuthors.html
@@ -289,11 +289,6 @@
 	<td>2 in the last 10 full</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>years (4 total)</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Co-author Network</td>
diff --git a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
index ce85ee3a..b349d0d2 100644
--- a/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
+++ b/utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
@@ -363,12 +363,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>2002&nbsp;&nbsp;First Grant</td>
+	<td>2005&nbsp;&nbsp;First Grant</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>2010&nbsp;&nbsp;&nbsp;Last Grant</td>
+	<td>2011&nbsp;&nbsp;&nbsp;Last Grant</td>
 	<td></td>
 </tr>
 <tr>
@@ -665,7 +665,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Nix Nintendo? 2010 -</td>
+	<td>Nix Nintendo? 2011 -</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
index 8b306e15..6c352244 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
@@ -92,14 +92,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[2]</td>
+	<td>M.B.A. in Business Administration, Carroll University , Business Department 1998 - 2000</td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 -</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[3]</td>
+	<td>B.S. in Business Administration, Carroll College , Business Department, Four year full scholarship 1981</td>
 </tr>
 <!--Change department, year, and supplemental info for B.S. degree-->
 <tr>
@@ -169,24 +169,24 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>css=#RO_0000056-EducationalProcess-List &gt; li</td>
+	<td>M.Ed. in Business Education, University of Wisconsin , Graduate School Fellowship 2002 -</td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Department 1998 - 2000</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[2]</td>
+	<td>M.B.A. in Business Administration, Carroll University , Business Department 1998 - 2000</td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 -</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[3]</td>
+	<td>B.S. in Business Administration, Carroll College , Business Department, Four year full scholarship 1981</td>
 </tr>
 <!--Change department for M.B.A. degree-->
 <tr>
 	<td>clickAndWait</td>
-	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[2]/a[2]</td>
+	<td>xpath=(//img[@alt='edit this entry'])[4]</td>
 	<td></td>
 </tr>
 <tr>
@@ -236,19 +236,19 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>css=#RO_0000056-EducationalProcess-List &gt; li</td>
+	<td>M.Ed. in Business Education, University of Wisconsin , Graduate School Fellowship 2002 -</td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[2]</td>
+	<td>M.B.A. in Business Administration, Carroll University , Business Administration Department 1998 - 2000</td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, Graduate School Fellowship 2002 -</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[3]</td>
+	<td>B.S. in Business Administration, Carroll College , Business Department, Four year full scholarship 1981</td>
 </tr>
 <!--Change M.Ed. to add department and delete supplemental info-->
 <tr>
@@ -308,19 +308,19 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>css=#RO_0000056-EducationalProcess-List &gt; li</td>
+	<td>M.Ed. in Business Education, University of Wisconsin , School of Business 2002 -</td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[2]</td>
+	<td>M.B.A. in Business Administration, Carroll University , Business Administration Department 1998 - 2000</td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, School of Business 2002 -</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[3]</td>
+	<td>B.S. in Business Administration, Carroll College , Business Department, Four year full scholarship 1981</td>
 </tr>
 <!--Log out-->
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
index f197075e..933d1f0d 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
@@ -66,19 +66,24 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, School of Business 2002 -</td>
+	<td>selectWindow</td>
+	<td>null</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll University, Business Administration Department 1998 - 2000</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>css=#RO_0000056-EducationalProcess-List &gt; li</td>
+	<td>M.Ed. in Business Education, University of Wisconsin , School of Business 2002 -</td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
-	<td></td>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[2]</td>
+	<td>M.B.A. in Business Administration, Carroll University , Business Administration Department 1998 - 2000</td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>//ul[@id='RO_0000056-EducationalProcess-List']/li[3]</td>
+	<td>B.S. in Business Administration, Carroll College , Business Department, Four year full scholarship 1981</td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>