diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html
index f2e68c24..ace95897 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminAccount.html
@@ -195,29 +195,39 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>verifyElementPresent</td>
+	<td>link=ConnieCurator@cornell.edu</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>//tr[1]/td[1]</td>
+	<td>SisAdmin@cornell.edu</td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>//tr[1]/td[2]</td>
 	<td>Sis</td>
-	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>verifyText</td>
+	<td>//tr[1]/td[3]</td>
 	<td>Admin</td>
-	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>verifyText</td>
+	<td>//tr[1]/td[4]</td>
 	<td>INACTIVE</td>
-	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>verifyText</td>
+	<td>//tr[1]/td[5]</td>
 	<td>Site Admin</td>
-	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>verifyText</td>
+	<td>//tr[1]/td[6]</td>
 	<td>0</td>
-	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
diff --git a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
index 0afb5327..ad4023cc 100644
--- a/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
+++ b/utilities/acceptance-tests/suites/AdminSecurity/NewAdminDelete.html
@@ -116,7 +116,12 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Accounts</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>User accounts</td>
 	<td></td>
 </tr>
 <tr>
@@ -125,28 +130,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>Sis Admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Sis Admin</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Edit User Account']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Editing Form</td>
+	<td>verifyElementPresent</td>
+	<td>link=SisAdmin@cornell.edu</td>
 	<td></td>
 </tr>
 <tr>
@@ -156,22 +141,22 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>_delete</td>
+	<td>deleteAccount</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
-	<td>Are you SURE you want to delete this user? If in doubt, CANCEL.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>clickAndWait</td>
+	<td>//form[@id='account-display']/section[2]/input</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Accounts</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>User accounts</td>
 	<td></td>
 </tr>
 <tr>
@@ -180,8 +165,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextNotPresent</td>
-	<td>Sis Admin</td>
+	<td>verifyElementNotPresent</td>
+	<td>=SisAdmin@cornell.edu</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
index 7d81815d..3f1949e3 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/CreateNewSelfEditorUser.html
@@ -132,7 +132,7 @@
 <tr>
 	<td>type</td>
 	<td>email-address</td>
-	<td>rickRookie@cornell.edu</td>
+	<td>RickRookie@cornell.edu</td>
 </tr>
 <tr>
 	<td>type</td>
@@ -166,7 +166,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>A new account for Rick Rookie was successfully created. A notification email has been sent to rickRookie@cornell.edu with instructions for activating the account and creating a password. </td>
+	<td>A new account for Rick Rookie was successfully created. A notification email has been sent to rickRookie@cornell.edu with instructions for activating the account and creating a password.</td>
 	<td></td>
 </tr>
 <tr>
@@ -201,7 +201,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td> 	0</td>
+	<td>0</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
index 986a9028..4585ac40 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewCuratorUser.html
@@ -111,37 +111,12 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Accounts</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Connie Curator</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">View the new user account, and edit it.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Connie Curator</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Edit User Account']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Editing Form</td>
+	<td>link=ConnieCurator@cornell.edu</td>
 	<td></td>
 </tr>
 <tr>
@@ -151,27 +126,22 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>_delete</td>
+	<td>deleteAccount</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
-	<td>Are you SURE you want to delete this user? If in doubt, CANCEL.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>clickAndWait</td>
+	<td>delete-account</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Accounts</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=Connie Curator</td>
+	<td>link=ConnieCurator@cornell.edu</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
index 065f0c4e..12568f8a 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewEditorUser.html
@@ -111,37 +111,12 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Accounts</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Eddie Editor</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">View the new user account, and edit it.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Eddie Editor</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Edit User Account']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Editing Form</td>
+	<td>link=EddieEditor@cornell.edu</td>
 	<td></td>
 </tr>
 <tr>
@@ -151,27 +126,22 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>_delete</td>
+	<td>deleteAccount</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
-	<td>Are you SURE you want to delete this user? If in doubt, CANCEL.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>clickAndWait</td>
+	<td>delete-account</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Accounts</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=Eddie Editor</td>
+	<td>link=EddieEditor@cornell.edu</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
index 0f4179c9..a6379e07 100644
--- a/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
+++ b/utilities/acceptance-tests/suites/CreateAccounts/DeleteNewSelfEditorUser.html
@@ -111,37 +111,12 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Accounts</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Rick Rookie</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">View the new user account, and edit it.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Rick Rookie</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Edit User Account']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>User Account Editing Form</td>
+	<td>link=RickRookie@cornell.edu</td>
 	<td></td>
 </tr>
 <tr>
@@ -151,27 +126,22 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>_delete</td>
+	<td>//input[@name='deleteAccount' and @value='http://vivo.mydomain.edu/individual/u2415']</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
-	<td>Are you SURE you want to delete this user? If in doubt, CANCEL.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForPageToLoad</td>
-	<td>5000</td>
+	<td>clickAndWait</td>
+	<td>delete-account</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>User Accounts</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=Rick Rookie</td>
+	<td>link=RickRookie@cornell.edu</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
index dc31b2f4..a40926c7 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddClassGroupTimes.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Add class group called Times</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
index 68d6a98b..6db19ce0 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddIndividualInHours.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Add Individual Daytime hours to Hours class</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
index aaa2ffba..7a187958 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Add sub-class of Hours to class Times</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
index 4b3d52d6..313fb8e7 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Add new sub-class of Minutes to class Times</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
index cdf223eb..67aeb781 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteClassGroupTimes.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Delete test class group Times</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
index 4932ba4a..efbb4d28 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteIndividualInHours.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Delete test Individual Daytime hours</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
index a2654a58..20ef35c2 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassHours.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Delete test sub-class Hours</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
index e4c0c9d8..663b3d1c 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/DeleteSubClassMinutes.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Delete test sub-class Minutes</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
index ce44f313..0039c394 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
@@ -34,6 +34,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">View Class hierarchy</td>
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html
index 5b2780e1..ad5d7c4c 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/AddObjPropVisitingHours.html
@@ -39,6 +39,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
diff --git a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html b/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html
index bdd1207e..ebb0ef31 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/AddPropertyGroupPlace.html
@@ -39,6 +39,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
diff --git a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
index d12e21c8..ea79710f 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/ChangePlaceDisplayRank.html
@@ -39,6 +39,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
diff --git a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html
index bb032f1c..86f205e5 100644
--- a/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html
+++ b/utilities/acceptance-tests/suites/CreateProperties/EditObjPropVisitingHours.html
@@ -39,6 +39,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
diff --git a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
index a3c3c681..790aaf2d 100644
--- a/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
+++ b/utilities/acceptance-tests/suites/OntologyManagement/AddOntology.html
@@ -39,6 +39,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
diff --git a/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html b/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html
index f7ef44ff..a454beb2 100644
--- a/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html
+++ b/utilities/acceptance-tests/suites/OntologyManagement/DeleteOntology.html
@@ -29,6 +29,11 @@
 <thead>
 <tr><td rowspan="1" colspan="3" class="testName">DeleteOntology</td></tr>
 </thead><tbody>
+<tr>
+	<td>setTimeout</td>
+	<td>100000</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Delete added ontology to clean up from test</td>