Holly's first batch of test case changes for RC 2

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

@@ -35,11 +35,6 @@
 	<td></td>
 </tr>
 <!--Verify all 3 organization entries appear properly-->
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=College</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>College (1)</td>
@@ -47,7 +42,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Organization</td>
+	<td>link=College</td>
 	<td></td>
 </tr>
 <tr>
@@ -57,7 +52,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=University</td>
+	<td>link=Organization</td>
 	<td></td>
 </tr>
 <tr>
@@ -65,6 +60,11 @@
 	<td>University (2)</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=University</td>
+	<td></td>
+</tr>
 <!--Go back to the beginning-->
 <tr>
 	<td>clickAndWait</td>

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

@@ -80,6 +80,21 @@
 	<td>B.S. in Business Administration, Carroll College, Business Department, Four year full scholarship 1981</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=University of Wisconsin</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Carroll University</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Carroll College</td>
+	<td></td>
+</tr>
 <!--Go back to the beginning-->
 <tr>
 	<td>clickAndWait</td>

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

@@ -49,12 +49,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Carroll College College</td>
+	<td>Search results for 'carroll'</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Carroll College</td>
+	<td>link=organizations</td>
 	<td></td>
 </tr>
 <tr>
@@ -67,9 +67,14 @@
 	<td>link=Carroll University</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Carroll College College</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Faculty, Jane</td>
+	<td>link=Carroll College</td>
 	<td></td>
 </tr>
 <tr>
@@ -89,12 +94,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>University of Wisconsin University</td>
+	<td>Search results for 'wisconsin'</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=University of Wisconsin</td>
+	<td>link=organizations</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=locations</td>
 	<td></td>
 </tr>
 <tr>
@@ -107,9 +117,24 @@
 	<td>link=Wisconsin</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>University of Wisconsin University</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Faculty, Jane</td>
+	<td>link=University of Wisconsin</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>United States of America Country</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=United States of America</td>
 	<td></td>
 </tr>
 <tr>