diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
index 78a8c560..29611ba3 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
@@ -111,12 +111,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>
@@ -136,7 +136,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Create a new position entry for Jane Faculty</td>
+	<td>Create a new position entry for Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -331,7 +331,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -386,7 +386,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -461,7 +461,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/CustomPositionsForm/ChangePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
index 3e755418..b2ce8966 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.html
@@ -116,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>
@@ -206,7 +206,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -296,7 +296,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/CustomPositionsForm/CheckPublicView.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html
index ccdb159f..8ecee14a 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/CheckPublicView.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/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/CustomPositionsForm/CreateTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
index 65ba26fe..3c793122 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/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/CustomPositionsForm/DeletePositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html
index 02b366b5..a4a2979a 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html
@@ -116,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>
@@ -146,7 +146,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -166,7 +166,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -186,7 +186,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/CustomPositionsForm/DeleteTestFacultyMember.html b/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html
index 61726c83..5223bc62 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/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>
@@ -94,6 +89,11 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Navigate to Jane Faculty</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Index</td>
@@ -104,11 +104,6 @@
 	<td>Index to VIVO Contents</td>
 	<td></td>
 </tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Navigate to Jane Faculty</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Faculty Member</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>
@@ -221,7 +191,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Log out</td>
+	<td class="comment">Logout</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
index 9c5a408a..885897c6 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html
@@ -81,12 +81,12 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Jane Faculty | Assistant Professor</td>
+	<td>Faculty, Jane | Assistant Professor</td>
 	<td></td>
 </tr>
 <tr>
@@ -116,7 +116,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -186,7 +186,7 @@
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>Jane Faculty</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
@@ -226,12 +226,12 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Jane Faculty Professor, 1986 -</td>
+	<td>Faculty, Jane Professor, 1986 -</td>
 	<td></td>
 </tr>
 <tr>
@@ -281,7 +281,7 @@
 </tr>
 <tr>
 	<td>verifyElementNotPresent</td>
-	<td>link=Jane Faculty</td>
+	<td>link=Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>