diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
index 4aef0a91..6ae7a440 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
@@ -121,12 +121,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -151,7 +151,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -426,7 +426,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -511,7 +511,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -611,7 +611,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
index 283c9611..cc181e0f 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html
@@ -121,12 +121,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -216,7 +216,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -301,7 +301,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -381,7 +381,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
index d3cf62e9..03e0ad8f 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/CheckPublicView.html
@@ -81,12 +81,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
index 65ba26fe..3c793122 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/CreateTestFacultyMember.html
@@ -39,11 +39,6 @@
 	<td></td>
 	<td></td>
 </tr>
-<tr>
-	<td>setTimeout</td>
-	<td>100000</td>
-	<td></td>
-</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
@@ -111,29 +106,64 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Editing Form</td>
+	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Add Assistant Professor Jane Faculty</td>
+	<td class="comment">Add Jane Faculty</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>Name</td>
-	<td>Jane Faculty</td>
+	<td>firstName</td>
+	<td>Jane</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>lastName</td>
+	<td>Faculty</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Edit Jane Faculty to add title</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Faculty, Jane</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>type</td>
 	<td>MonikerSelectAlt</td>
 	<td>Assistant Professor</td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Creating New Record</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>primaryAction</td>
@@ -151,7 +181,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Assistant Professor</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
index cfb0a422..18efaa25 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
@@ -121,12 +121,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,7 +171,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -191,7 +191,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -211,7 +211,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
index f6d81051..5223bc62 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html
@@ -39,11 +39,6 @@
 	<td></td>
 	<td></td>
 </tr>
-<tr>
-	<td>setTimeout</td>
-	<td>100000</td>
-	<td></td>
-</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/</td>
@@ -121,12 +116,12 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -189,31 +184,6 @@
 	<td>Index to VIVO Contents</td>
 	<td></td>
 </tr>
-<tr>
-	<td>refreshAndWait</td>
-	<td>10000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>refreshAndWait</td>
-	<td>10000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>refreshAndWait</td>
-	<td>10000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>refreshAndWait</td>
-	<td>10000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>refreshAndWait</td>
-	<td>10000</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextNotPresent</td>
 	<td>Faculty Member</td>