Another commit for rc 1 test case changes from Holly.

utilities/acceptance-tests/suites/AddNonPersonThings/CreateEquipment.html

@@ -181,7 +181,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primate Research Laboratory</td>
+	<td>label=Primate Research Laboratory (Laboratory)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -299,7 +299,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Heart Health</td>
+	<td>label=Primate Heart Health (Service)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -324,7 +324,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate University of America</td>
+	<td>label=Primate University of America (University)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -349,7 +349,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Health Check</td>
+	<td>label=Primate Health Check (Event)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>

utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html

@@ -536,7 +536,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primate Health Check</td>
+	<td>label=Primate Health Check (Event)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -662,7 +662,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Health and Fitness</td>
+	<td>label=Primate Health and Fitness (Invited Talk)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -707,7 +707,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Happenings</td>
+	<td>label=Primate Happenings (Blog Posting)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>

utilities/acceptance-tests/suites/AddNonPersonThings/CreateLocation.html

@@ -288,7 +288,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Heart Health</td>
+	<td>label=Primate Heart Health (Service)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -313,7 +313,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate University of America</td>
+	<td>label=Primate University of America (University)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -338,7 +338,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Health Check</td>
+	<td>label=Primate Health Check (Event)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>

utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html

@@ -319,6 +319,11 @@
 	<td>New Primate Students Workshop</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=2</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Primate History Library</td>
@@ -329,11 +334,6 @@
 	<td>Primate History Library Library</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=2</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Primate Memorial Building</td>