diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
index 506fe16e..296a4212 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
@@ -1721,7 +1721,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
+	<td>//input[@value=&quot;Edit This Individual&quot;]</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
index 60050391..f272e047 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
@@ -509,6 +509,11 @@
 	<td>link=Service (1)</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Service</td>
@@ -539,6 +544,11 @@
 	<td>link=Course (1)</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Course</td>
@@ -569,6 +579,11 @@
 	<td>link=Equipment (2)</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Equipment</td>
@@ -601,7 +616,12 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>link=Address (4)</td>
+	<td>link=Address (1)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
@@ -609,26 +629,16 @@
 	<td>link=1234 Northern African Nation</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=CIT, Cornell University, Ithaca, NY, 14853</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Jungle 1234, Africa, 1234-56789</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=The Jungle, Africa, 12345678</td>
-	<td></td>
-</tr>
 <tr>
 	<td>click</td>
 	<td>link=Building (1)</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Building</td>
@@ -639,11 +649,56 @@
 	<td>link=Jane Memorial Building</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>link=Campus (1)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Primate Research Laboratory</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Facility (3)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Jane Memorial Building</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Lab Admin Office</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Primate Research Lab Room 123</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>link=Room (1)</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Room</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
index a0efe0e0..063e1158 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
@@ -346,7 +346,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Lily Librarian</td>
+	<td>link=Librarian, Lily</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
index 714cf586..7bcf929f 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteFacultyInfo.html
@@ -306,7 +306,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>50000</td>
+	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
@@ -326,7 +326,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>50000</td>
+	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
@@ -346,7 +346,7 @@
 </tr>
 <tr>
 	<td>waitForPageToLoad</td>
-	<td>50000</td>
+	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
index babb43aa..d4554a08 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteLibToFacAssociation.html
@@ -154,6 +154,16 @@
 	<td class="comment">Is association gone?</td>
 	<td></td>
 </tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td>10000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>refreshAndWait</td>
+	<td>10000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Faculty Member (1)</td>