diff --git a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
index 934214a7..b3519299 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/AddFacultyInfo.html
@@ -204,16 +204,6 @@
 	<td>Edit</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@id='hasCollaborator']/a</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit</td>
@@ -381,7 +371,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@id='submit' and @value='add a new item to this list']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteEverythingElse.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteEverythingElse.html
index d0a13cc5..7130b667 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteEverythingElse.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteEverythingElse.html
@@ -4,7 +4,7 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
-<title>DeleteEverythingElse</title>
+<title>DeleteEverythingElsen</title>
 <style type="text/css">
 .testName {
   color: blue;
@@ -27,7 +27,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3" class="testName">DeleteEverythingElse</td></tr>
+<tr><td rowspan="1" colspan="3" class="testName">DeleteEverythingElsen</td></tr>
 </thead><tbody>
 <tr>
 	<td>comment</td>
@@ -69,6 +69,16 @@
 	<td class="comment">Login a sys admin</td>
 	<td></td>
 </tr>
+<tr>
+	<td>type</td>
+	<td>loginName</td>
+	<td>testAdmin</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>loginPassword</td>
+	<td>Password</td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>loginForm</td>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html
index 8dafc571..c08d3e1f 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/DeleteTestOrganization.html
@@ -105,23 +105,63 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
-	<td>link=Academic Department</td>
+	<td>comment</td>
+	<td class="comment">Veirfy 4 organizations exist</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertTitle</td>
-	<td>Academic Department</td>
+	<td>verifyTextPresent</td>
+	<td>Academic Department (3)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Department (3)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Foundation (1)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Organization (4)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Testing Department</td>
+	<td>link=Organization</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Testing Department</td>
+	<td>Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Apes Rock | Academic Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primates Rock and Roll | Academic Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Primates-R-Us | Foundation</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Testing Department | Academic Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Delete 4 organizations</td>
 	<td></td>
 </tr>
 <tr>
@@ -129,6 +169,26 @@
 	<td>200000</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Apes Rock</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Apes Rock</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=edit this individual</td>
@@ -149,11 +209,6 @@
 	<td>Individual Editing Form</td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Delete Testing Department</td>
-	<td></td>
-</tr>
 <tr>
 	<td>click</td>
 	<td>_delete</td>
@@ -164,11 +219,6 @@
 	<td>Are you SURE you want to delete this entity? If in doubt, CANCEL.</td>
 	<td></td>
 </tr>
-<tr>
-	<td>waitForPageToLoad</td>
-	<td>5000</td>
-	<td></td>
-</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>VIVO Site Administration</td>
@@ -184,6 +234,241 @@
 	<td>Index to VIVO Contents</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Primates Rock and Roll</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Primates Rock and Roll</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=edit this individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Control Panel</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//input[@value='Edit This Individual']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Editing Form</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>_delete</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you SURE you want to delete this entity? If in doubt, CANCEL.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index to VIVO Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Primates-R-Us</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Primates-R-Us</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=edit this individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Control Panel</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//input[@value='Edit This Individual']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Editing Form</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>_delete</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you SURE you want to delete this entity? If in doubt, CANCEL.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index to VIVO Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Organization</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Testing Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Testing Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=edit this individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Control Panel</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//input[@value='Edit This Individual']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Editing Form</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>_delete</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertConfirmation</td>
+	<td>Are you SURE you want to delete this entity? If in doubt, CANCEL.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Index</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Index to VIVO Contents</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Academic Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Academic Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Testing Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Testing Department</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=edit this individual</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Control Panel</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//input[@value='Edit This Individual']</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Editing Form</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Take a break for indexing</td>
@@ -221,12 +506,7 @@
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>Department (1)</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextNotPresent</td>
-	<td>Organization (1)</td>
+	<td>organizations</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CreatePeople/Suite.html b/utilities/acceptance-tests/suites/CreatePeople/Suite.html
index 19385641..c7b93bd3 100644
--- a/utilities/acceptance-tests/suites/CreatePeople/Suite.html
+++ b/utilities/acceptance-tests/suites/CreatePeople/Suite.html
@@ -42,7 +42,7 @@ href="UploadFacultyImage.html">UploadFacultyImage</a></td></tr>
 <tr><td><a href="DeleteTestTabs.html">DeleteTestTabs</a></td></tr>
 <tr><td><a href="DeleteTestOrganization.html">DeleteTestOrganization</a></td></tr>
 <tr><td><a 
-href="DeleteEverythingElse.html">DeleteEverythingElsen</a></td></tr>
+href="DeleteEverythingElse.html">DeleteEverythingElse</a></td></tr>
 <tr><td><a href="UploadNonPersonImage.html">UploadNonPersonImage</a></td></tr>
 </tbody></table>
 </body>
