diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index 8db97e69..55588fd0 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -709,6 +709,31 @@
 	<td>Introduction to Primate Health</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//div[@id='courseCredits']/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>tinymce</td>
+	<td>9</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Introduction to Primate Health</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Verify everything entered is displaying properly</td>
@@ -799,6 +824,11 @@
 	<td>Animal Health | Subject Area</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>9</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Logout</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index 8a574584..c55ac1ec 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -591,7 +591,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Health and Fitness | Invited Talk</td>
+	<td>Primate Health Conference</td>
 	<td></td>
 </tr>
 <tr>
@@ -601,7 +601,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>self_governing</td>
+	<td>info@primateconf.org</td>
 	<td></td>
 </tr>
 <tr>
@@ -619,11 +619,6 @@
 	<td>Congo_the</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>info@primateconf.org</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>2011-01-05</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index 6f4445b0..00d8d0b8 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -616,11 +616,6 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
 	<td>Create position history entry for Primate College of America</td>
 	<td></td>
 </tr>
@@ -684,6 +679,31 @@
 	<td>Primate College of America</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//div[@id='affiliatedOrganization']/a</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>objectVar</td>
+	<td>label=Primates-r-us</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Primate College of America</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//div[@id='hasMemberRole']/a</td>
@@ -1201,7 +1221,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Primate Research Laboratory | Laboratory</td>
+	<td>Primates-r-us | Founder</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primates-r-us | Organization</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/BrowseIndex.html b/utilities/acceptance-tests/suites/CreatePeople/BrowseIndex.html
index ca0b748a..b134097f 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/BrowseIndex.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/BrowseIndex.html
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO</td>
+	<td>Log in to VIVO</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleLinks.html b/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleLinks.html
index 25d91afc..6ede7d55 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleLinks.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/CheckPeopleLinks.html
@@ -101,7 +101,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Faculty</td>
+	<td>link=Faculty Member (1)</td>
 	<td></td>
 </tr>
 <tr>
@@ -111,7 +111,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Faculty</td>
+	<td>People</td>
 	<td></td>
 </tr>
 <tr>
@@ -121,7 +121,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Librarians</td>
+	<td>Librarian</td>
 	<td></td>
 </tr>
 <tr>