diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
index 98db39b2..381e5ecb 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
@@ -96,7 +96,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Locations (321)</td>
+	<td>link=Locations (320)</td>
 	<td></td>
 </tr>
 <tr>
@@ -281,7 +281,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>link=Locations (321)</td>
+	<td>link=Locations (320)</td>
 	<td></td>
 </tr>
 <tr>
@@ -360,18 +360,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>There is currently no People content in the system</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>You can browse all of the public content currently in the system using the index page.</td>
+	<td>verifyElementPresent</td>
+	<td>link=Person (1)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=index page</td>
+	<td>link=Person, Polly</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
index 6253d048..0aca71fd 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckPublicView.html
@@ -1929,21 +1929,6 @@
 	<td>Jane Memorial Building</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>facility for</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Primate Research Laboratory</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Research Laboratory</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>rooms</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
index 0911e271..4c30c388 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@@ -567,7 +567,7 @@
 <tr>
 	<td>type</td>
 	<td>id=object</td>
-	<td>primate</td>
+	<td>primate health chec</td>
 </tr>
 <tr>
 	<td>click</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
index a44d0315..2bb1610f 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
@@ -334,54 +334,19 @@
 	<td>Primate Research Lab Room 123</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>css=a.add-facilityFor &gt; img.add-individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=object</td>
-	<td>Producing primate food.</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Cancel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Primate Research Lab Room 123</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Primate Feeder</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Verify everything entered is displaying properly</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Research Laboratory</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Primate Research Lab Room 123</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>Animal Diet</td>
+	<td>verifyElementPresent</td>
+	<td>link=Primate Feeder</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index 0531b898..18e5968d 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -352,7 +352,7 @@
 <tr>
 	<td>type</td>
 	<td>id=object</td>
-	<td>Ken</td>
+	<td>Keny</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -392,7 +392,7 @@
 <tr>
 	<td>type</td>
 	<td>id=object</td>
-	<td>Con</td>
+	<td>Cong</td>
 </tr>
 <tr>
 	<td>click</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
index 3bea1670..70c33c19 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
@@ -349,11 +349,6 @@
 	<td>id=ui-active-menuitem</td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Verify everything entered is displaying properly</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>id=submit</td>
@@ -364,6 +359,11 @@
 	<td>Jane Memorial Building</td>
 	<td></td>
 </tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Verify everything entered is displaying properly</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Primate Research Laboratory</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
index a19f1d91..8c2f7943 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
@@ -394,51 +394,6 @@
 	<td>id=submit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=pageName</td>
-	<td>Courses</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>name=prettyUrl</td>
-	<td>/courses</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>id=typeSelect</td>
-	<td>label=Browse Class Group</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>id=selectClassGroup</td>
-	<td>label=courses</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>css=option[value=&quot;http://vivoweb.org/ontology#vitroClassGroupactivities&quot;]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=doneWithContent</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=menuCheckbox</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=pageSave</td>
-	<td></td>
-</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Pages</td>
@@ -651,7 +606,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Primate Heart Health Clinic</td>
+	<td>link=Primate Heart Health</td>
 	<td></td>
 </tr>
 <tr>
@@ -756,7 +711,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=1234 Northern African Nation</td>
+	<td>link=1234 Northern African Nation Morocco City Morocco</td>
 	<td></td>
 </tr>
 <tr>
@@ -866,7 +821,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Menu management</td>
+	<td>link=Page management</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
index e1c8d388..7b4057bf 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
@@ -151,12 +151,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Elderly Care Grant</td>
+	<td>Portable Primate Habitat Equipment</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Portable Primate Habitat Equipment</td>
+	<td>Primate Elderly Care Grant</td>
 	<td></td>
 </tr>
 <tr>
@@ -164,11 +164,6 @@
 	<td>Introduction to Primate Health Course</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Primate Colleges of the World Consortium</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Primate Health Check Event</td>
@@ -176,12 +171,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Health Conference Conference</td>
+	<td>Primate Colleges of the World Consortium</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Research Laboratory Campus</td>
+	<td>Primate Health Conference Conference</td>
 	<td></td>
 </tr>
 <tr>
@@ -194,6 +189,11 @@
 	<td>Primate History Library Library</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primate Research Laboratory Campus</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Primate Student of the Year Award or Honor</td>
@@ -231,17 +231,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Ape Health</td>
+	<td>Ape Health Concept</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>1234 Northern African Nation Address</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Elderly Care Concept</td>
+	<td>Person, Polly Person</td>
 	<td></td>
 </tr>
 <tr>
@@ -254,6 +249,11 @@
 	<td>primates - VIVO Search Results</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Elderly Care Concept</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Jane Memorial Building Building</td>
@@ -269,6 +269,11 @@
 	<td>PHC Proceedings Proceedings</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>1234 Northern African Nation Morocco City Morocco Address</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>northern Africa Transnational Region</td>
@@ -279,11 +284,6 @@
 	<td>Africa Continent</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Congo Country</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Liberia Country</td>
@@ -294,6 +294,11 @@
 	<td>Kenya Country</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Congo Country</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Home</td>