Updated Selenium tests.

The Selenium tests have been updated to improve robustness.

87 files changed, 1285 insertions, 350 deletions

diff --git a/install/ui/test/functional/group-add-member-user.html b/install/ui/test/functional/group-add-member-user.html
index b0b18f350..6477e7dfc 100644
--- a/install/ui/test/functional/group-add-member-user.html
+++ b/install/ui/test/functional/group-add-member-user.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -63,7 +68,7 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='group']/span[@name='association']//input[@value='testuser']</td>
+	<td>//div[@id='group']//span[@name='association']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -72,8 +77,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/group-add.html b/install/ui/test/functional/group-add.html
index 6d59588df..738136eac 100644
--- a/install/ui/test/functional/group-add.html
+++ b/install/ui/test/functional/group-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>3 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,8 +47,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='group']/span[@name='search']//input[@value='testgroup']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/group-del.html b/install/ui/test/functional/group-del.html
index a05f52cfe..84074cd87 100644
--- a/install/ui/test/functional/group-del.html
+++ b/install/ui/test/functional/group-del.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,8 +42,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>3 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/group-find.html b/install/ui/test/functional/group-find.html
index ebc5624d5..1f9c34826 100644
--- a/install/ui/test/functional/group-find.html
+++ b/install/ui/test/functional/group-find.html
@@ -17,14 +17,19 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
 	<td>search-group-filter</td>
-	<td>testgroup</td>
+	<td>test</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -32,8 +37,33 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 group matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>search-group-filter</td>
+	<td>xxx</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -43,12 +73,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='group']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/group-mod.html b/install/ui/test/functional/group-mod.html
index bc8104080..092bc921e 100644
--- a/install/ui/test/functional/group-mod.html
+++ b/install/ui/test/functional/group-mod.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -77,8 +82,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/group-remove-member-user.html b/install/ui/test/functional/group-remove-member-user.html
index 9b37afcbe..bd44e6439 100644
--- a/install/ui/test/functional/group-remove-member-user.html
+++ b/install/ui/test/functional/group-remove-member-user.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='group']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -38,12 +43,12 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='group']/span[@name='association']//input[@value='testuser']</td>
+	<td>//div[@id='group']//span[@name='association']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='group']/span[@name='association']//input[@value='testuser']</td>
+	<td>//div[@id='group']//span[@name='association']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -67,8 +72,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/hbacrule-activation.html b/install/ui/test/functional/hbacrule-activation.html
index b5397eb02..30f7d6087 100644
--- a/install/ui/test/functional/hbacrule-activation.html
+++ b/install/ui/test/functional/hbacrule-activation.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -61,7 +66,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacrule-add.html b/install/ui/test/functional/hbacrule-add.html
index 2dd46b665..74e43b5a6 100644
--- a/install/ui/test/functional/hbacrule-add.html
+++ b/install/ui/test/functional/hbacrule-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 HBAC rule matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,7 +47,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/hbacrule-del.html b/install/ui/test/functional/hbacrule-del.html
index ca6d0b8e7..c513aff9d 100644
--- a/install/ui/test/functional/hbacrule-del.html
+++ b/install/ui/test/functional/hbacrule-del.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -37,7 +42,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/hbacrule-find.html b/install/ui/test/functional/hbacrule-find.html
index 9fcec8a61..236fb1ffb 100644
--- a/install/ui/test/functional/hbacrule-find.html
+++ b/install/ui/test/functional/hbacrule-find.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -32,7 +37,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -47,7 +57,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -62,11 +77,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacrule-host.html b/install/ui/test/functional/hbacrule-host.html
index bcaff8728..01dbb7773 100644
--- a/install/ui/test/functional/hbacrule-host.html
+++ b/install/ui/test/functional/hbacrule-host.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
@@ -77,11 +87,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacrule-mod.html b/install/ui/test/functional/hbacrule-mod.html
index 18c2be91c..22d46c8f3 100644
--- a/install/ui/test/functional/hbacrule-mod.html
+++ b/install/ui/test/functional/hbacrule-mod.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -81,7 +86,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacrule-service.html b/install/ui/test/functional/hbacrule-service.html
index 980904865..7e777ea3b 100644
--- a/install/ui/test/functional/hbacrule-service.html
+++ b/install/ui/test/functional/hbacrule-service.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
@@ -77,7 +87,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='servicecategory']//span[@name='memberservice_hbacsvc']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/hbacrule-sourcehost.html b/install/ui/test/functional/hbacrule-sourcehost.html
index ae998b803..ac213f5de 100644
--- a/install/ui/test/functional/hbacrule-sourcehost.html
+++ b/install/ui/test/functional/hbacrule-sourcehost.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
@@ -77,7 +87,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='sourcehostcategory']//span[@name='sourcehost_host']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/hbacrule-user.html b/install/ui/test/functional/hbacrule-user.html
index 35d0a52e6..59abc848a 100644
--- a/install/ui/test/functional/hbacrule-user.html
+++ b/install/ui/test/functional/hbacrule-user.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacrule']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td>
 	<td></td>
 </tr>
@@ -77,7 +87,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/hbacsvc-add.html b/install/ui/test/functional/hbacsvc-add.html
index b9a1d890b..98503e6e6 100644
--- a/install/ui/test/functional/hbacsvc-add.html
+++ b/install/ui/test/functional/hbacsvc-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>10 HBAC services matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,7 +47,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/hbacsvc-del.html b/install/ui/test/functional/hbacsvc-del.html
index 030aa9723..50bac348c 100644
--- a/install/ui/test/functional/hbacsvc-del.html
+++ b/install/ui/test/functional/hbacsvc-del.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
@@ -37,7 +42,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/hbacsvc-find.html b/install/ui/test/functional/hbacsvc-find.html
index 77ae0ab5c..71a09f5f9 100644
--- a/install/ui/test/functional/hbacsvc-find.html
+++ b/install/ui/test/functional/hbacsvc-find.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
@@ -32,7 +37,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
@@ -47,7 +57,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
@@ -62,11 +77,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacsvc-mod.html b/install/ui/test/functional/hbacsvc-mod.html
index 0de96ca22..7b4988556 100644
--- a/install/ui/test/functional/hbacsvc-mod.html
+++ b/install/ui/test/functional/hbacsvc-mod.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
@@ -71,7 +76,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacsvcgroup-add-member.html b/install/ui/test/functional/hbacsvcgroup-add-member.html
index 9574d396b..a92d2a210 100644
--- a/install/ui/test/functional/hbacsvcgroup-add-member.html
+++ b/install/ui/test/functional/hbacsvcgroup-add-member.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
@@ -57,11 +62,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacsvcgroup-add.html b/install/ui/test/functional/hbacsvcgroup-add.html
index 71c84df66..b174fad3c 100644
--- a/install/ui/test/functional/hbacsvcgroup-add.html
+++ b/install/ui/test/functional/hbacsvcgroup-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 HBAC service group matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,11 +47,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacsvcgroup-del.html b/install/ui/test/functional/hbacsvcgroup-del.html
index 3027ca399..bc7ade308 100644
--- a/install/ui/test/functional/hbacsvcgroup-del.html
+++ b/install/ui/test/functional/hbacsvcgroup-del.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
@@ -37,11 +42,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacsvcgroup-find.html b/install/ui/test/functional/hbacsvcgroup-find.html
index 2203d1425..78d21ccb3 100644
--- a/install/ui/test/functional/hbacsvcgroup-find.html
+++ b/install/ui/test/functional/hbacsvcgroup-find.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
@@ -32,7 +37,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
@@ -47,7 +57,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
@@ -62,11 +77,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacsvcgroup-mod.html b/install/ui/test/functional/hbacsvcgroup-mod.html
index 68561404f..4ad290097 100644
--- a/install/ui/test/functional/hbacsvcgroup-mod.html
+++ b/install/ui/test/functional/hbacsvcgroup-mod.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
@@ -71,7 +76,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hbacsvcgroup-remove-member.html b/install/ui/test/functional/hbacsvcgroup-remove-member.html
index 4fc731237..b48e9bd60 100644
--- a/install/ui/test/functional/hbacsvcgroup-remove-member.html
+++ b/install/ui/test/functional/hbacsvcgroup-remove-member.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='search']//input[@value='testhbacsvcgroup']</td>
 	<td></td>
 </tr>
@@ -52,11 +57,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='hbacrule']//span[@name='member_hbacsvc']//input[@value='testhbacsvc']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/host-add.html b/install/ui/test/functional/host-add.html
index 9ea659b18..92657a236 100644
--- a/install/ui/test/functional/host-add.html
+++ b/install/ui/test/functional/host-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 host matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,8 +47,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='host']/span[@name='search']//input[@value='test.example.com']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/host-certificate.html b/install/ui/test/functional/host-certificate.html
index 3931204ec..47f3709a2 100644
--- a/install/ui/test/functional/host-certificate.html
+++ b/install/ui/test/functional/host-certificate.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 hosts matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/install/ui/test/functional/host-del.html b/install/ui/test/functional/host-del.html
index 38554bac6..4516fa24e 100644
--- a/install/ui/test/functional/host-del.html
+++ b/install/ui/test/functional/host-del.html
@@ -17,13 +17,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 hosts matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//input[@name='select' and @value='test.example.com']</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,8 +42,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 host matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/host-find.html b/install/ui/test/functional/host-find.html
index cb9235d79..7d2c0030d 100644
--- a/install/ui/test/functional/host-find.html
+++ b/install/ui/test/functional/host-find.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 hosts matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
@@ -32,8 +37,33 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 host matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>search-host-filter</td>
+	<td>xxx</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,8 +77,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 hosts matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/host-mod.html b/install/ui/test/functional/host-mod.html
index 773a9e826..f1f2b2d6b 100644
--- a/install/ui/test/functional/host-mod.html
+++ b/install/ui/test/functional/host-mod.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 hosts matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='host']//span[@name='search']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/install/ui/test/functional/hostgroup-add-member-host.html b/install/ui/test/functional/hostgroup-add-member-host.html
index 1030d6a53..843bdb2eb 100644
--- a/install/ui/test/functional/hostgroup-add-member-host.html
+++ b/install/ui/test/functional/hostgroup-add-member-host.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -63,7 +68,7 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='hostgroup']/span[@name='association']//input[@value='test.example.com']</td>
+	<td>//div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
@@ -72,11 +77,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hostgroup-add.html b/install/ui/test/functional/hostgroup-add.html
index 116c47254..8188adb4c 100644
--- a/install/ui/test/functional/hostgroup-add.html
+++ b/install/ui/test/functional/hostgroup-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>0 hostgroups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,11 +47,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hostgroup-del.html b/install/ui/test/functional/hostgroup-del.html
index e062f6479..6faa4c39b 100644
--- a/install/ui/test/functional/hostgroup-del.html
+++ b/install/ui/test/functional/hostgroup-del.html
@@ -17,13 +17,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//input[@name='select' and @value='testhostgroup']</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,8 +42,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>0 hostgroups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/hostgroup-find.html b/install/ui/test/functional/hostgroup-find.html
index 08476f5ca..13a343289 100644
--- a/install/ui/test/functional/hostgroup-find.html
+++ b/install/ui/test/functional/hostgroup-find.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -28,12 +33,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='hostgroup']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -43,12 +53,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='hostgroup']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>0 hostgroups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -58,15 +73,19 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='hostgroup']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hostgroup-mod b/install/ui/test/functional/hostgroup-mod
index a14029f93..fd31960da 100644
--- a/install/ui/test/functional/hostgroup-mod
+++ b/install/ui/test/functional/hostgroup-mod
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -67,11 +72,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/hostgroup-remove-member-host.html b/install/ui/test/functional/hostgroup-remove-member-host.html
index 7fd1ad582..2ad4f4e8e 100644
--- a/install/ui/test/functional/hostgroup-remove-member-host.html
+++ b/install/ui/test/functional/hostgroup-remove-member-host.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='hostgroup']//span[@name='search']//input[@value='testhostgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -38,12 +43,12 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='hostgroup']/span[@name='association']//input[@value='test.example.com']</td>
+	<td>//div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='hostgroup']/span[@name='association']//input[@value='test.example.com']</td>
+	<td>//div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
@@ -58,7 +63,7 @@
 </tr>
 <tr>
 	<td>waitForElementNotPresent</td>
-	<td>//div[@id='hostgroup']/span[@name='association']//input[@value='test.example.com']</td>
+	<td>//div[@id='hostgroup']//span[@name='association']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
 <tr>
@@ -67,8 +72,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 hostgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/netgroup-add-member-user.html b/install/ui/test/functional/netgroup-add-member-user.html
index e985f2b13..24718fe0e 100644
--- a/install/ui/test/functional/netgroup-add-member-user.html
+++ b/install/ui/test/functional/netgroup-add-member-user.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 netgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -63,10 +68,9 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='netgroup']/span[@name='association']//input[@value='testuser']</td>
+	<td>//div[@id='netgroup']//span[@name='association']//input[@value='testuser']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/netgroup-add.html b/install/ui/test/functional/netgroup-add.html
index d4935ce58..f0e3be72b 100644
--- a/install/ui/test/functional/netgroup-add.html
+++ b/install/ui/test/functional/netgroup-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>0 netgroups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,11 +47,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 netgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/netgroup-del.html b/install/ui/test/functional/netgroup-del.html
index 226c0c1fe..b949fe010 100644
--- a/install/ui/test/functional/netgroup-del.html
+++ b/install/ui/test/functional/netgroup-del.html
@@ -17,13 +17,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 netgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//input[@name='select' and @value='testnetgroup']</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,11 +42,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>0 netgroups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/netgroup-find.html b/install/ui/test/functional/netgroup-find.html
index ac2a0f061..02b4e3e4b 100644
--- a/install/ui/test/functional/netgroup-find.html
+++ b/install/ui/test/functional/netgroup-find.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 netgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -32,8 +37,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 netgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,8 +57,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>0 netgroups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -62,11 +77,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 netgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/netgroup-mod.html b/install/ui/test/functional/netgroup-mod.html
index 03407d0ba..e61c16abf 100644
--- a/install/ui/test/functional/netgroup-mod.html
+++ b/install/ui/test/functional/netgroup-mod.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 netgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -122,16 +127,20 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']/ancestor::tr//span[@name='description' and text()='Test Netgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/netgroup-remove-member-user.html b/install/ui/test/functional/netgroup-remove-member-user.html
index beb3939cd..d9c1c3159 100644
--- a/install/ui/test/functional/netgroup-remove-member-user.html
+++ b/install/ui/test/functional/netgroup-remove-member-user.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 netgroup matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='netgroup']//span[@name='search']//input[@value='testnetgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -61,7 +66,6 @@
 	<td>//div[@id='netgroup']//span[@name='association']//input[@value='testuser']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/permission-add.html b/install/ui/test/functional/permission-add.html
index d8b4afb1f..33094e3b6 100644
--- a/install/ui/test/functional/permission-add.html
+++ b/install/ui/test/functional/permission-add.html
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>//div[@id='role']/div[@class='action-panel']//a[@title='Add']</td>
 	<td></td>
@@ -38,7 +43,7 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>//div[@name='target']//select</td>
+	<td>//span[@name='target']//select</td>
 	<td>label=type</td>
 </tr>
 <tr>
@@ -53,12 +58,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//button[@type='button']</td>
+	<td>//div[@class='ui-dialog-buttonset']//button[@type='button']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testpermission']</td>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/permission-del.html b/install/ui/test/functional/permission-del.html
index 77f7b4df1..5822d3e2e 100644
--- a/install/ui/test/functional/permission-del.html
+++ b/install/ui/test/functional/permission-del.html
@@ -17,13 +17,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testpermission']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testpermission']</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,8 +42,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testpermission']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/permission-find.html b/install/ui/test/functional/permission-find.html
index 1b250838c..d9330a481 100644
--- a/install/ui/test/functional/permission-find.html
+++ b/install/ui/test/functional/permission-find.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testpermission']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
 	<td></td>
 </tr>
 <tr>
@@ -32,8 +37,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testpermission']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,8 +57,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testpermission']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
 	<td></td>
 </tr>
 <tr>
@@ -62,11 +77,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testpermission']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/permission-mod.html b/install/ui/test/functional/permission-mod.html
index ae8489b2c..24022a19b 100644
--- a/install/ui/test/functional/permission-mod.html
+++ b/install/ui/test/functional/permission-mod.html
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testpermission']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>link=testpermission</td>
 	<td></td>
@@ -101,7 +106,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/privilege-add.html b/install/ui/test/functional/privilege-add.html
index 2cc276940..7d68046fa 100644
--- a/install/ui/test/functional/privilege-add.html
+++ b/install/ui/test/functional/privilege-add.html
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>//div[@id='role']/div[@class='action-panel']//a[@title='Add']</td>
 	<td></td>
@@ -42,8 +47,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testprivilege']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/privilege-del.html b/install/ui/test/functional/privilege-del.html
index d206eb4bc..7a069effc 100644
--- a/install/ui/test/functional/privilege-del.html
+++ b/install/ui/test/functional/privilege-del.html
@@ -17,13 +17,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testprivilege']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testprivilege']</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,8 +42,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testprivilege']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/privilege-find.html b/install/ui/test/functional/privilege-find.html
index f7bda6bdf..8161b7697 100644
--- a/install/ui/test/functional/privilege-find.html
+++ b/install/ui/test/functional/privilege-find.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testprivilege']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
 	<td></td>
 </tr>
 <tr>
@@ -32,8 +37,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testprivilege']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,8 +57,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testprivilege']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
 	<td></td>
 </tr>
 <tr>
@@ -62,8 +77,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testprivilege']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/privilege-mod.html b/install/ui/test/functional/privilege-mod.html
index 92a33d820..b29728763 100644
--- a/install/ui/test/functional/privilege-mod.html
+++ b/install/ui/test/functional/privilege-mod.html
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testprivilege']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>link=testprivilege</td>
 	<td></td>
diff --git a/install/ui/test/functional/pwpolicy-add.html b/install/ui/test/functional/pwpolicy-add.html
index c53df39ed..b18261e58 100644
--- a/install/ui/test/functional/pwpolicy-add.html
+++ b/install/ui/test/functional/pwpolicy-add.html
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>//div[@id='pwpolicy']//div[@class='action-panel']//a[@title='Add']</td>
 	<td></td>
@@ -42,7 +47,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/pwpolicy-del.html b/install/ui/test/functional/pwpolicy-del.html
index d9dd0fa75..29dfa092f 100644
--- a/install/ui/test/functional/pwpolicy-del.html
+++ b/install/ui/test/functional/pwpolicy-del.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
@@ -37,11 +42,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/pwpolicy-mod.html b/install/ui/test/functional/pwpolicy-mod.html
index 5e85a38d2..6fab27fab 100644
--- a/install/ui/test/functional/pwpolicy-mod.html
+++ b/install/ui/test/functional/pwpolicy-mod.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='pwpolicy']//span[@name='search']//input[@value='testgroup']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/role-add.html b/install/ui/test/functional/role-add.html
index 9d6bc56aa..4da53f7fb 100644
--- a/install/ui/test/functional/role-add.html
+++ b/install/ui/test/functional/role-add.html
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>//div[@id='role']/div[@class='action-panel']//a[@title='Add']</td>
 	<td></td>
@@ -42,8 +47,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testrole']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/role-del.html b/install/ui/test/functional/role-del.html
index 0f7dcedc1..8a05cf767 100644
--- a/install/ui/test/functional/role-del.html
+++ b/install/ui/test/functional/role-del.html
@@ -17,13 +17,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testrole']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testrole']</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,8 +42,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testrole']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/role-find.html b/install/ui/test/functional/role-find.html
index f8c21b4f3..0757707cd 100644
--- a/install/ui/test/functional/role-find.html
+++ b/install/ui/test/functional/role-find.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testrole']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
 	<td></td>
 </tr>
 <tr>
@@ -32,8 +37,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testrole']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,8 +57,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testrole']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
 	<td></td>
 </tr>
 <tr>
@@ -62,8 +77,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='role']/span[@name='search']//input[@value='testrole']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/role-mod.html b/install/ui/test/functional/role-mod.html
index aa499fda3..343b68105 100644
--- a/install/ui/test/functional/role-mod.html
+++ b/install/ui/test/functional/role-mod.html
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='role']//span[@name='search']//input[@value='testrole']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>link=testrole</td>
 	<td></td>
@@ -71,7 +76,6 @@
 	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/service-add.html b/install/ui/test/functional/service-add.html
index 65bf199bb..42594ef26 100644
--- a/install/ui/test/functional/service-add.html
+++ b/install/ui/test/functional/service-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>4 services matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice//test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,8 +52,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='service']/span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/service-certificate.html b/install/ui/test/functional/service-certificate.html
index 64e18bf1f..bcfce1fa8 100644
--- a/install/ui/test/functional/service-certificate.html
+++ b/install/ui/test/functional/service-certificate.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='service']/span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/install/ui/test/functional/service-del.html b/install/ui/test/functional/service-del.html
index da68b89b9..48848e4ca 100644
--- a/install/ui/test/functional/service-del.html
+++ b/install/ui/test/functional/service-del.html
@@ -17,13 +17,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='service']/span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='service']/span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,11 +42,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
-	<td>//div[@id='service']/span[@name='search']//input[@value='testservice//test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice//test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/service-find.html b/install/ui/test/functional/service-find.html
index f704b5d9e..27fc58fd3 100644
--- a/install/ui/test/functional/service-find.html
+++ b/install/ui/test/functional/service-find.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='service']/span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
 <tr>
@@ -32,8 +37,33 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 service matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>search-service-filter</td>
+	<td>xxx</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,11 +77,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>5 services matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/service-mod.html b/install/ui/test/functional/service-mod.html
index f6a98c93d..54ed89140 100644
--- a/install/ui/test/functional/service-mod.html
+++ b/install/ui/test/functional/service-mod.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='service']/span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='service']//span[@name='search']//input[@value='testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM']</td>
 	<td></td>
 </tr>
 <tr>
@@ -31,7 +36,6 @@
 	<td>testservice/test.example.com@IDM.LAB.BOS.REDHAT.COM:</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudocmd-add.html b/install/ui/test/functional/sudocmd-add.html
index b47f14566..8b32c783a 100644
--- a/install/ui/test/functional/sudocmd-add.html
+++ b/install/ui/test/functional/sudocmd-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>0 sudo command matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,7 +47,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/sudocmd-del.html b/install/ui/test/functional/sudocmd-del.html
index 2d41ee845..b3fa77908 100644
--- a/install/ui/test/functional/sudocmd-del.html
+++ b/install/ui/test/functional/sudocmd-del.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
@@ -37,7 +42,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/sudocmd-find.html b/install/ui/test/functional/sudocmd-find.html
index 358e34bdc..02b099c01 100644
--- a/install/ui/test/functional/sudocmd-find.html
+++ b/install/ui/test/functional/sudocmd-find.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
@@ -32,7 +37,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
@@ -47,7 +57,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
@@ -58,15 +73,19 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='sudorule']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudocmd-membership.html b/install/ui/test/functional/sudocmd-membership.html
index db0c91033..7742a4507 100644
--- a/install/ui/test/functional/sudocmd-membership.html
+++ b/install/ui/test/functional/sudocmd-membership.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='memberof_sudocmdgroup']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
@@ -77,11 +87,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='memberof_sudocmdgroup']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudocmd-mod.html b/install/ui/test/functional/sudocmd-mod.html
index 69d4a9533..de2cfd881 100644
--- a/install/ui/test/functional/sudocmd-mod.html
+++ b/install/ui/test/functional/sudocmd-mod.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
@@ -71,7 +76,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudocmdgroup-add.html b/install/ui/test/functional/sudocmdgroup-add.html
index e467de096..83c403a38 100644
--- a/install/ui/test/functional/sudocmdgroup-add.html
+++ b/install/ui/test/functional/sudocmdgroup-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>0 sudo command groups matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
 <tr>
@@ -42,7 +47,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/sudocmdgroup-del.html b/install/ui/test/functional/sudocmdgroup-del.html
index b74ea6468..1905e4c76 100644
--- a/install/ui/test/functional/sudocmdgroup-del.html
+++ b/install/ui/test/functional/sudocmdgroup-del.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
@@ -37,7 +42,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/sudocmdgroup-find.html b/install/ui/test/functional/sudocmdgroup-find.html
index 585d2af38..44bfe9c4a 100644
--- a/install/ui/test/functional/sudocmdgroup-find.html
+++ b/install/ui/test/functional/sudocmdgroup-find.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
@@ -32,7 +37,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
@@ -47,7 +57,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
@@ -62,11 +77,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudocmdgroup-member.html b/install/ui/test/functional/sudocmdgroup-member.html
index 38115813d..06e9ca584 100644
--- a/install/ui/test/functional/sudocmdgroup-member.html
+++ b/install/ui/test/functional/sudocmdgroup-member.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='member_sudocmd']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
@@ -77,11 +87,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='member_sudocmd']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudocmdgroup-mod.html b/install/ui/test/functional/sudocmdgroup-mod.html
index c4d87a1c7..0be7c20c2 100644
--- a/install/ui/test/functional/sudocmdgroup-mod.html
+++ b/install/ui/test/functional/sudocmdgroup-mod.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudocmdgroup']</td>
 	<td></td>
 </tr>
@@ -71,7 +76,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudorule-activation.html b/install/ui/test/functional/sudorule-activation.html
index e5ecc423a..99c18050a 100644
--- a/install/ui/test/functional/sudorule-activation.html
+++ b/install/ui/test/functional/sudorule-activation.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -61,7 +66,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudorule-add.html b/install/ui/test/functional/sudorule-add.html
index 4770d7de5..20dc9b093 100644
--- a/install/ui/test/functional/sudorule-add.html
+++ b/install/ui/test/functional/sudorule-add.html
@@ -22,6 +22,11 @@
 	<td></td>
 </tr>
 <tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>//div[@id='sudorule']/div[@class='action-panel']//a[@title='Add']</td>
 	<td></td>
@@ -42,11 +47,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudorule-allow-command.html b/install/ui/test/functional/sudorule-allow-command.html
index b1bf71975..03f25ff8e 100644
--- a/install/ui/test/functional/sudorule-allow-command.html
+++ b/install/ui/test/functional/sudorule-allow-command.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
@@ -77,11 +87,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='cmdcategory']//span[@name='memberallowcmd_sudocmd']//input[@value='testsudocmd']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudorule-del.html b/install/ui/test/functional/sudorule-del.html
index fff437bc0..d265bbabc 100644
--- a/install/ui/test/functional/sudorule-del.html
+++ b/install/ui/test/functional/sudorule-del.html
@@ -22,7 +22,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -47,7 +47,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/sudorule-find.html b/install/ui/test/functional/sudorule-find.html
index 20d8db88f..cab6bca09 100644
--- a/install/ui/test/functional/sudorule-find.html
+++ b/install/ui/test/functional/sudorule-find.html
@@ -22,7 +22,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -33,11 +33,16 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='sudorule']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -48,11 +53,16 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='sudorule']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -63,15 +73,19 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='sudorule']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudorule-host.html b/install/ui/test/functional/sudorule-host.html
index 8b552d6a3..c0e0e7b07 100644
--- a/install/ui/test/functional/sudorule-host.html
+++ b/install/ui/test/functional/sudorule-host.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
@@ -77,7 +87,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='hostcategory']//span[@name='memberhost_host']//input[@value='test.example.com']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/sudorule-mod.html b/install/ui/test/functional/sudorule-mod.html
index 1e869edaf..adddb65b2 100644
--- a/install/ui/test/functional/sudorule-mod.html
+++ b/install/ui/test/functional/sudorule-mod.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -71,7 +76,6 @@
 	<td>undo</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/install/ui/test/functional/sudorule-runasuser.html b/install/ui/test/functional/sudorule-runasuser.html
index d78a9fcb2..7119f53d1 100644
--- a/install/ui/test/functional/sudorule-runasuser.html
+++ b/install/ui/test/functional/sudorule-runasuser.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//input[@value='testuser']</td>
 	<td></td>
 </tr>
@@ -77,7 +87,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='ipasudorunasusercategory']//span[@name='ipasudorunas_user']//input[@value='testuser']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/sudorule-user.html b/install/ui/test/functional/sudorule-user.html
index 5846b293c..153fd441e 100644
--- a/install/ui/test/functional/sudorule-user.html
+++ b/install/ui/test/functional/sudorule-user.html
@@ -17,7 +17,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='search']//input[@value='testsudorule']</td>
 	<td></td>
 </tr>
@@ -57,7 +62,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
 	<td>//div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td>
 	<td></td>
 </tr>
@@ -77,7 +87,12 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementNotPresent</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
 	<td>//div[@id='sudorule']//span[@name='usercategory']//span[@name='memberuser_user']//input[@value='testuser']</td>
 	<td></td>
 </tr>
diff --git a/install/ui/test/functional/user-activation.html b/install/ui/test/functional/user-activation.html
index 6110311fb..f75616d2d 100644
--- a/install/ui/test/functional/user-activation.html
+++ b/install/ui/test/functional/user-activation.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -72,8 +77,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/user-add.html b/install/ui/test/functional/user-add.html
index d5a226797..28e65b535 100644
--- a/install/ui/test/functional/user-add.html
+++ b/install/ui/test/functional/user-add.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 user matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,8 +52,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='user']/span[@name='search']//input[@value='testuser']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/user-del.html b/install/ui/test/functional/user-del.html
index 3d1267604..21e622453 100644
--- a/install/ui/test/functional/user-del.html
+++ b/install/ui/test/functional/user-del.html
@@ -17,13 +17,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//input[@name='select' and @value='testuser']</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -37,8 +42,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 user matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/user-find.html b/install/ui/test/functional/user-find.html
index 8d4b588a8..0b065baab 100644
--- a/install/ui/test/functional/user-find.html
+++ b/install/ui/test/functional/user-find.html
@@ -17,23 +17,53 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
 	<td>search-user-filter</td>
-	<td>testuser</td>
+	<td>test</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='user']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>1 user matched</td>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>search-user-filter</td>
+	<td>xxx</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementNotPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -43,12 +73,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='user']/span/div[1]/span[1]/a/span</td>
+	<td>link=Find</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 </tbody></table>
diff --git a/install/ui/test/functional/user-mod.html b/install/ui/test/functional/user-mod.html
index 25643615f..218682039 100644
--- a/install/ui/test/functional/user-mod.html
+++ b/install/ui/test/functional/user-mod.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -68,8 +73,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//div[@id='user']/span[@name='search']//input[@value='testuser']</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/install/ui/test/functional/user-password-reset.html b/install/ui/test/functional/user-password-reset.html
index 4ca6891a9..b4f1de1a5 100644
--- a/install/ui/test/functional/user-password-reset.html
+++ b/install/ui/test/functional/user-password-reset.html
@@ -17,8 +17,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>//div[@id='user']//span[@name='search']//input[@value='testuser']</td>
 	<td></td>
 </tr>
 <tr>
@@ -67,8 +72,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForTextPresent</td>
-	<td>2 users matched</td>
+	<td>waitForNotVisible</td>
+	<td>//span[@id='header-network-activity-indicator']</td>
 	<td></td>
 </tr>
 </tbody></table>