diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
index 4277c030..50e3d5c6 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
@@ -116,7 +116,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Validate adding menu item with Activities</td>
+	<td class="comment">Add Activities menu</td>
 	<td></td>
 </tr>
 <tr>
@@ -129,171 +129,21 @@
 	<td>Add Menu Item</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Name *</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Pretty URL *</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>(Format: / - ie. /people)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Template *</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Default</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Custom template</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Select content type for the associated page *</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>or Cancel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Cancel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>* required fields</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Cancel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Default Menu</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Add menu item</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Add Menu Item</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>submit-Add</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>You must supply a Name</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</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></td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>menuName</td>
 	<td>Activities</td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>submit-Add</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</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></td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>prettyUrl</td>
 	<td>/activities</td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>submit-Add</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>You must supply a Content type</td>
-	<td></td>
-</tr>
 <tr>
 	<td>select</td>
 	<td>selectClassGroup</td>
 	<td>label=activities</td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Selected content type for the associated page</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>activities Change content type</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>changeContentType</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Select content to display *</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Only display within my institution</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>To enable this option, you must first select an institutional internal class for your instance</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=institutional internal class</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit-Add</td>
@@ -605,43 +455,43 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>There is currently no Activities content in the system</td>
+	<td>click</td>
+	<td>link=Agreement (3)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You can add content and manage this site from the Site Administration page.</td>
+	<td>Agreement</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=add content and manage this site</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>link=Primate Elderly Care</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=index page</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Expecting content?</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Try rebuilding the search index.</td>
+	<td>link=Primate Habitat Research Grant</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=rebuilding the search index</td>
+	<td>link=Primate Survival Planning Grant</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Service (1)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Service</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Primate Heart Health Clinic</td>
 	<td></td>
 </tr>
 <tr>
@@ -660,43 +510,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>There is currently no Courses content in the system</td>
+	<td>click</td>
+	<td>link=Course (1)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You can add content and manage this site from the Site Administration page.</td>
+	<td>Course</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=add content and manage this site</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></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=index page</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Expecting content?</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Try rebuilding the search index.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=rebuilding the search index</td>
+	<td>link=Introduction to Primate Health</td>
 	<td></td>
 </tr>
 <tr>
@@ -715,43 +540,23 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>There is currently no Equipment content in the system</td>
+	<td>click</td>
+	<td>link=Equipment (2)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>You can add content and manage this site from the Site Administration page.</td>
+	<td>Equipment</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=add content and manage this site</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>link=Portable Primate Habitat</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=index page</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Expecting content?</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Try rebuilding the search index.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=rebuilding the search index</td>
+	<td>link=Primate Feeder</td>
 	<td></td>
 </tr>
 <tr>
@@ -769,149 +574,34 @@
 	<td>Locations</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>link=Building (1)</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Locations</td>
+	<td>Building</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Jane Memorial Building</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>link=Geographic Location (37)</td>
+	<td>link=Room (1)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Geographic Location</td>
+	<td>Room</td>
 	<td></td>
 </tr>
 <tr>
-	<td>comment</td>
-	<td class="comment">Change People menu name</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Site Admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Menu management</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Default Menu</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>css=img.edit-individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit Menu Item</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>menuName</td>
-	<td>People at CU</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>submit-Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Default Menu</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=People</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>People at CU</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>There is currently no People at CU content in the system</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Change People menu name back</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Site Admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Menu management</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Default Menu</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>css=img.edit-individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit Menu Item</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>menuName</td>
-	<td>People</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>submit-Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Default Menu</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=People</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>People</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>There is currently no People content in the system</td>
+	<td>verifyElementPresent</td>
+	<td>link=Lab Admin Office</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
index 60a3a5b1..3fa11501 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/suite.html
@@ -1,27 +1,28 @@
-<?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="CreateLibrarian.html">CreateLibrarian</a></td></tr>
-<tr><td><a href="CreateOrganization.html">CreateOrganization</a></td></tr>
-<tr><td><a href="CreateCourse.html">CreateCourse</a></td></tr>
-<tr><td><a href="CreateActivity.html">CreateActivity</a></td></tr>
-<tr><td><a href="CreateEvent.html">CreateEvent</a></td></tr>
-<tr><td><a href="CreateTopic.html">CreateTopic</a></td></tr>
-<tr><td><a href="CreateEquipment.html">CreateEquipment</a></td></tr>
-<tr><td><a href="CreateLocation.html">CreateLocation</a></td></tr>
-<tr><td><a href="VerifyAllThingsSearchable.html">VerifyAllThingsSearchable</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="CheckBrowseOptions.html">CheckBrowseOptions</a></td></tr>
-<tr><td><a href="DeleteIndexStuff.html">DeleteIndexStuff</a></td></tr>
-<tr><td><a href="DeleteOtherStuff.html">DeleteOtherStuff</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="CreateLibrarian.html">CreateLibrarian</a></td></tr>
+<tr><td><a href="CreateOrganization.html">CreateOrganization</a></td></tr>
+<tr><td><a href="CreateCourse.html">CreateCourse</a></td></tr>
+<tr><td><a href="CreateActivity.html">CreateActivity</a></td></tr>
+<tr><td><a href="CreateEvent.html">CreateEvent</a></td></tr>
+<tr><td><a href="CreateTopic.html">CreateTopic</a></td></tr>
+<tr><td><a href="CreateEquipment.html">CreateEquipment</a></td></tr>
+<tr><td><a href="CreateLocation.html">CreateLocation</a></td></tr>
+<tr><td><a href="VerifyAllThingsSearchable.html">VerifyAllThingsSearchable</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="CheckBrowseOptions.html">CheckBrowseOptions</a></td></tr>
+<tr><td><a href="TestMenuManagement.html">TestMenuManagement</a></td></tr>
+<tr><td><a href="DeleteIndexStuff.html">DeleteIndexStuff</a></td></tr>
+<tr><td><a href="DeleteOtherStuff.html">DeleteOtherStuff</a></td></tr>
+</tbody></table>
+</body>
+</html>