diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index dd487b18..05eeced9 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -266,7 +266,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Add an entry to: event within</td>
+	<td>Add an entry to: taught by</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
index 0e0e5582..c22939ad 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html
@@ -259,21 +259,11 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Edit &quot;in facility&quot; entry for Primate Feeder</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Primate Feeder</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
 	<td>name</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index 7adc8eb8..2cbe7eb4 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -261,12 +261,17 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Conference</td>
+	<td>link=Index</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Edit</td>
+	<td>Index to VIVO Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Conference</td>
 	<td></td>
 </tr>
 <tr>
@@ -284,26 +289,6 @@
 	<td>Primate Health Conference</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Add an entry to: proceedings</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>There are no entries in the system to select from.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Index</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Index to VIVO Contents</td>
-	<td></td>
-</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Test research entry</td>
@@ -449,11 +434,6 @@
 	<td>//div[@id='startDate']/a</td>
 	<td></td>
 </tr>
-<tr>
-	<td></td>
-	<td></td>
-	<td></td>
-</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Edit</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
index 206a414c..85712ff5 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html
@@ -279,11 +279,6 @@
 	<td>//div[@id='geographicallyContains']/a</td>
 	<td></td>
 </tr>
-<tr>
-	<td></td>
-	<td></td>
-	<td></td>
-</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Edit</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index 071d872e..d589671f 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -734,11 +734,6 @@
 	<td>startYear</td>
 	<td>1999</td>
 </tr>
-<tr>
-	<td>open</td>
-	<td>/vivo/edit/editRequestDispatch.jsp?subjectUri=http%3A%2F%2Fvivo.local.edu%2Findividual%2Fn3441&amp;predicateUri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23organizationForPosition</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit</td>
@@ -825,7 +820,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyText</td>
+	<td>verifyTextPresent</td>
 	<td>Create membership entry for Primate College of America</td>
 	<td></td>
 </tr>
@@ -859,11 +854,6 @@
 	<td>Primate College of America</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>//div[@id='hasCollaborator']/a</td>
@@ -875,7 +865,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyText</td>
+	<td>verifyTextPresent</td>
 	<td>Add an entry to: collaborator</td>
 	<td></td>
 </tr>
@@ -1219,11 +1209,6 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Primate College of America</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Add new entry for: abbreviation</td>
@@ -1346,7 +1331,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>ME Tarzan Dr., 1999 - </td>
+	<td>ME Tarzan Dr., 1999 -</td>
 	<td></td>
 </tr>
 <tr>