More test case changes from 1.7 rc 1 by Holly.

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

@@ -231,7 +231,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>
@@ -291,7 +291,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primate Colleges of the World</td>
+	<td>label=Primate Colleges of the World (Consortium)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -696,7 +696,7 @@
 <tr>
 	<td>select</td>
 	<td>id=objectVar</td>
-	<td>label=Primate Info</td>
+	<td>label=Primate Info (Database)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>

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

@@ -361,7 +361,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>
@@ -436,7 +436,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>
@@ -557,7 +557,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/CreateOrganization.html

@@ -211,7 +211,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=B.S. Bachelor of Science</td>
+	<td>label=B.S. Bachelor of Science (Academic Degree)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -637,7 +637,7 @@
 <tr>
 	<td>select</td>
 	<td>objectVar</td>
-	<td>label=Primates-r-us</td>
+	<td>label=Primates-r-us (Company)</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -1349,7 +1349,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>