Holly tweaked various test cases to get them to run smoother.

utilities/acceptance-tests/suites/AddNonPersonThingsVB/CheckIndexView.html

@@ -226,12 +226,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Country (207)</td>
+	<td>Country (208)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Geographic Location (263)</td>
+	<td>Geographic Location (264)</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html

@@ -474,6 +474,16 @@
 	<td>//img[@alt='delete']</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you sure you want to delete this photo?</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Germany</td>

utilities/acceptance-tests/suites/CreatePeopleVB/UploadNonPersonImage.html

@@ -469,6 +469,16 @@
 	<td>//img[@alt='delete']</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you sure you want to delete this photo?</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForPageToLoad</td>
+	<td>5000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Germany</td>

utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html

@@ -311,7 +311,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>carroll college - VIVO Search Results</td>
+	<td>Search for 'carroll college'</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationFormVB/DeleteEducationalBackground.html

@@ -306,7 +306,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>carroll college - VIVO Search Results</td>
+	<td>Search for 'carroll college'</td>
 	<td></td>
 </tr>
 <tr>