diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
index 67aeb781..444df4a6 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
@@ -156,7 +156,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>10000</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
index bd173bfc..1cd171b0 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/SearchFacultyInfo.html
@@ -164,16 +164,6 @@
 	<td>Primate Expert Association Certificate</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Primate Experts</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Expert</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Licensed Primate Instructor</td>
@@ -181,7 +171,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Licensed Primate Instructor</td>
+	<td>Licensed Primate Instructor Licensure</td>
 	<td></td>
 </tr>
 <tr>
@@ -191,7 +181,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Licensed Primate Expert</td>
+	<td>Licensed Primate Expert Licensure</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Primate Experts</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primate Experts Credential</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
index 82ef10ca..451a1c3e 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
@@ -259,6 +259,16 @@
 	<td>Carroll College</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Edit this individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Control Panel</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
@@ -274,6 +284,16 @@
 	<td>_delete</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you SURE you want to delete this individual? If in doubt, CANCEL.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
@@ -291,12 +311,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>carroll college - VIVO Search Results</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextNotPresent</td>
-	<td>Carroll College</td>
+	<td>Search for 'carroll college'</td>
 	<td></td>
 </tr>
 <tr>
@@ -456,7 +471,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>carroll university - VIVO Search Results</td>
+	<td>Search for 'carroll university'</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
index a78ea3fd..f75c97d1 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
@@ -139,6 +139,16 @@
 	<td>_delete</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you SURE you want to delete this individual? If in doubt, CANCEL.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
index 2824e6aa..a2586c1d 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
@@ -236,7 +236,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Link to Carroll College to verify Jane Faculty is listed</td>
+	<td class="comment">Link to Carroll College to verify Jane Faculty is not listed</td>
 	<td></td>
 </tr>
 <tr>
@@ -249,16 +249,6 @@
 	<td>Carroll College</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Affiliation</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>people</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementNotPresent</td>
 	<td>link=Faculty, Jane</td>
@@ -294,6 +284,11 @@
 	<td>Search results for 'university'</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=people</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=organizations</td>
diff --git a/utilities/acceptance-tests/suites/InitialSetup/Suite.html b/utilities/acceptance-tests/suites/InitialSetup/Suite.html
index c2cde1d2..262f6d65 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/Suite.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/Suite.html
@@ -1,17 +1,17 @@
-<?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="EditSiteInfo.html">EditSiteInfo</a></td></tr>
-<tr><td><a href="CheckDefaultMenus.html">CheckDefaultMenus</a></td></tr>
-<tr><td><a href="ValidateNewMenus.html">ValidateNewMenus</a></td></tr>
-<tr><td><a href="RemoveMenuChanges.html">RemoveMenuChanges</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="EditSiteInfo.html">EditSiteInfo</a></td></tr>
+<tr><td><a href="CheckDefaultMenus.html">CheckDefaultMenus</a></td></tr>
+<tr><td><a href="ValidateNewMenus.html">ValidateNewMenus</a></td></tr>
+<tr><td><a href="RemoveMenuChanges.html">RemoveMenuChanges</a></td></tr>
+</tbody></table>
+</body>
+</html>
diff --git a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
index 4277c030..9ff502d7 100644
--- a/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
+++ b/utilities/acceptance-tests/suites/InitialSetup/ValidateNewMenus.html
@@ -206,17 +206,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You must supply a Name</td>
+	<td>You must supply a name</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You must supply a Pretty URL</td>
+	<td>You must supply a pretty URL</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You must supply a Content type</td>
+	<td>You must supply a content type</td>
 	<td></td>
 </tr>
 <tr>
@@ -231,12 +231,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You must supply a Pretty URL</td>
+	<td>You must supply a pretty URL</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You must supply a Content type</td>
+	<td>You must supply a content type</td>
 	<td></td>
 </tr>
 <tr>
@@ -251,7 +251,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You must supply a Content type</td>
+	<td>You must supply a content type</td>
 	<td></td>
 </tr>
 <tr>
@@ -774,16 +774,6 @@
 	<td>Locations</td>
 	<td></td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>link=Geographic Location (37)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Geographic Location</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Change People menu name</td>
@@ -836,7 +826,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=People</td>
+	<td>link=People at CU</td>
 	<td></td>
 </tr>
 <tr>