More test case changes from Holly.

utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles1.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>
@@ -206,12 +211,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2010</td>
 </tr>
 <tr>
@@ -316,12 +321,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2007</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
@@ -486,12 +491,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
@@ -596,12 +601,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2010</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.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>
@@ -286,12 +291,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2010</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>
@@ -406,12 +411,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1980</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>1985</td>
 </tr>
 <tr>
@@ -521,12 +526,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
@@ -636,12 +641,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2000</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2001</td>
 </tr>
 <tr>
@@ -751,12 +756,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2000</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2005</td>
 </tr>
 <tr>
@@ -876,12 +881,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1990</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>1991</td>
 </tr>
 <tr>
@@ -1001,12 +1006,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1993</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles1.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>
@@ -346,7 +351,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
@@ -456,7 +461,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2003</td>
 </tr>
 <tr>
@@ -591,12 +596,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2010</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>
@@ -706,12 +711,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2001</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2003</td>
 </tr>
 <tr>
@@ -846,12 +851,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>
@@ -961,12 +966,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2001</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2001</td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddRoles/AddLibrarianRoles2.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>
@@ -181,12 +186,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>2009</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>
@@ -296,12 +301,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1988</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddRoles/CheckRepairMode.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>

utilities/acceptance-tests/suites/AddRoles/CreateTestFacultyMember.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>
@@ -146,42 +151,27 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Edit this individual</td>
+	<td>css=a.add-preferredTitle &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
+	<td>Edit</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>select</td>
-	<td>Moniker</td>
-	<td>label=[new moniker]</td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>MonikerSelectAlt</td>
+	<td>tinymce</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>primaryAction</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
+	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddRoles/CreateTestLibrarian.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>
@@ -146,42 +151,27 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Edit this individual</td>
+	<td>css=a.add-preferredTitle &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
+	<td>Edit</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>select</td>
-	<td>Moniker</td>
-	<td>label=[new moniker]</td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>MonikerSelectAlt</td>
+	<td>tinymce</td>
 	<td>Associate Librarian</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>primaryAction</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
+	<td>Librarian, Lily</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/AddRoles/DeleteIndexStuff.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>

utilities/acceptance-tests/suites/AddRoles/DeleteTestLibrarian.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>

utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html

@@ -151,7 +151,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//img[@alt='delete']</td>
+	<td>css=a.delete-educationalTraining &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -171,7 +171,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//img[@alt='delete']</td>
+	<td>css=a.delete-educationalTraining &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -191,7 +191,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//img[@alt='delete']</td>
+	<td>css=a.delete-educationalTraining &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -261,17 +261,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Edit this individual</td>
+	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</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>
@@ -280,20 +270,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>_delete</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Are you SURE you want to delete this individual? 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>
@@ -349,14 +329,9 @@
 	<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>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -441,7 +416,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value='Edit This Individual']</td>
+	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomEducationForm/DeleteTestFacultyMember.html

@@ -124,14 +124,9 @@
 	<td class="comment">Delete Jane Faculty</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>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -140,20 +135,10 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>_delete</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertConfirmation</td>
-	<td>Are you SURE you want to delete this individual? 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>

utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.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>
@@ -226,12 +231,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1971</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>
@@ -291,12 +296,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1981</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>1985</td>
 </tr>
 <tr>
@@ -361,12 +366,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1986</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>2010</td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomPositionsForm/ChangePositions.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>
@@ -151,12 +156,12 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>startField.year</td>
+	<td>startField-year</td>
 	<td>1977</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td>1981</td>
 </tr>
 <tr>
@@ -311,7 +316,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>endField.year</td>
+	<td>endField-year</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomPositionsForm/CreateTestFacultyMember.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>
@@ -145,57 +150,42 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
+	<td>assertTextPresent</td>
-	<td>link=Edit this individual</td>
+	<td>Faculty Member</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>css=a.add-preferredTitle &gt; img.add-individual</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Editing Form</td>
+	<td>Edit</td>
 	<td></td>
 </tr>
 <tr>
-	<td>select</td>
+	<td>verifyTextPresent</td>
-	<td>Moniker</td>
+	<td>Add new entry for: preferred title</td>
-	<td>label=[new moniker]</td>
+	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>MonikerSelectAlt</td>
+	<td>tinymce</td>
 	<td>Assistant Professor</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>primaryAction</td>
+	<td>submit</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Individual Control Panel</td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Verify that account was created</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
 	<td>Faculty, Jane</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
+	<td>assertTextPresent</td>
 	<td>Assistant Professor</td>
 	<td></td>
 </tr>

utilities/acceptance-tests/suites/CustomPositionsForm/DeletePositions.html

@@ -35,13 +35,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>setTimeout</td>
+	<td>deleteAllVisibleCookies</td>
-	<td>200000</td>
+	<td></td>
 	<td></td>
 </tr>
 <tr>
-	<td>deleteAllVisibleCookies</td>
+	<td>setTimeout</td>
-	<td></td>
+	<td>200000</td>
 	<td></td>
 </tr>
 <tr>
@@ -126,7 +126,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//img[@alt='delete']</td>
+	<td>css=a.delete-personInPosition &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -146,7 +146,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//img[@alt='delete']</td>
+	<td>css=a.delete-personInPosition &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -166,7 +166,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//img[@alt='delete']</td>
+	<td>css=a.delete-personInPosition &gt; img.delete-individual</td>
 	<td></td>
 </tr>
 <tr>
@@ -226,7 +226,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@value='Edit This Individual']</td>
+	<td>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -284,14 +284,9 @@
 	<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>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -349,14 +344,9 @@
 	<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>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
 	<td></td>
 </tr>
 <tr>

utilities/acceptance-tests/suites/CustomPositionsForm/DeleteTestFacultyMember.html

@@ -124,14 +124,9 @@
 	<td class="comment">Delete Jane Faculty</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>//input[@value=&quot;Edit This Individual's Datatype Properties&quot;]</td>
 	<td></td>
 </tr>
 <tr>
@@ -140,7 +135,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>clickAndWait</td>
 	<td>_delete</td>
 	<td></td>
 </tr>

utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html

@@ -89,6 +89,11 @@
 	<td>link=Carroll College</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>College</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Faculty, Jane</td>
@@ -96,7 +101,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Faculty, Jane | Assistant Professor</td>
+	<td>Assistant Professor</td>
 	<td></td>
 </tr>
 <tr>
@@ -141,7 +146,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Faculty, Jane | Assistant Professor</td>
+	<td>Assistant Professor</td>
 	<td></td>
 </tr>
 <tr>
@@ -149,11 +154,21 @@
 	<td>link=Carroll University</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>University</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Cornell University</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>University</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Search for Carroll, which should bring up 2 organizations</td>
@@ -179,6 +194,11 @@
 	<td>Search results for 'carroll'</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=people</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=organizations</td>
@@ -189,11 +209,31 @@
 	<td>link=Carroll College</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>College</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Carroll University</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>University</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Faculty, Jane</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Assistant Professor</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Link to Carroll College to verify Jane Faculty is listed</td>
@@ -264,11 +304,21 @@
 	<td>link=Cornell University</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>University</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Carroll University</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>University</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Make sure Jane Faculty is associated with Carroll and Cornell</td>
@@ -284,16 +334,6 @@
 	<td>Carroll University</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Affiliation</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>people</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementNotPresent</td>
 	<td>link=Faculty, Jane</td>