Holly made assorted test case changes based on rc2 testing...

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

@@ -371,12 +371,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Primate Heart Health Clinic</td>
+	<td>link=Primate Heart Health</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Primate Heart Health Clinic</td>
+	<td>Primate Heart Health</td>
 	<td></td>
 </tr>
 <tr>
@@ -1789,14 +1789,19 @@
 	<td>Address</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=1234 Northern African Nation Morocco City Morocco</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=1234 Northern African Nation</td>
+	<td>link=1234 Northern African Nation Morocco City Morocco</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>1234 Northern African Nation</td>
+	<td>1234 Northern African Nation Morocco City Morocco</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -396,7 +396,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Pages</td>
+	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
@@ -444,11 +444,6 @@
 	<td class="comment">Add Locations menu</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=submit</td>
-	<td></td>
-</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Edit</td>
@@ -826,7 +821,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Default Menu</td>
+	<td>Pages</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -236,7 +236,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Person, Polly Person</td>
+	<td>Elderly Care Concept</td>
 	<td></td>
 </tr>
 <tr>
@@ -251,7 +251,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Elderly Care Concept</td>
+	<td>Person, Polly Person</td>
 	<td></td>
 </tr>
 <tr>