diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
index b955898b..e522628f 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
@@ -151,12 +151,12 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>allSelected</td>
+	<td>submit-Add</td>
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
-	<td>submit-Add</td>
+	<td>pause</td>
+	<td>5000</td>
 	<td></td>
 </tr>
 <tr>
@@ -241,16 +241,6 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>allSelected</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>allSelected</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
 	<td>submit-Add</td>
 	<td></td>
 </tr>
@@ -326,16 +316,6 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>allSelected</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>allSelected</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
 	<td>submit-Add</td>
 	<td></td>
 </tr>
@@ -414,16 +394,6 @@
 	<td>selectClassGroup</td>
 	<td>label=locations</td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>allSelected</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>allSelected</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit-Add</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
index 3ecaf088..9243e9df 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
@@ -286,12 +286,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>northern Africa geographical_region</td>
+	<td>northern Africa Geographical Region</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Africa geographical_region</td>
+	<td>Africa Continent</td>
 	<td></td>
 </tr>
 <tr>