Holly made modifications due to display change in RC1.

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

@@ -136,7 +136,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='oprop-core-educationalBackground']/a</td>
+	<td>//div[@id='educationalTraining']/a</td>
 	<td></td>
 </tr>
 <tr>
@@ -161,7 +161,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='oprop-core-educationalBackground']/a</td>
+	<td>//div[@id='educationalTraining']/a</td>
 	<td></td>
 </tr>
 <tr>
@@ -186,7 +186,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Must either choose an existing organization or create a new one.</td>
+	<td>Must either select an existing organization or create a new one.</td>
 	<td></td>
 </tr>
 <tr>
@@ -216,7 +216,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Must either choose an existing organization or create a new one.</td>
+	<td>Must either select an existing organization or create a new one.</td>
 	<td></td>
 </tr>
 <tr>
@@ -246,12 +246,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>This field must not be empty.</td>
+	<td>Must either select an existing organization or create a new one.</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Must either choose an existing organization or create a new one.</td>
 	<td></td>
 </tr>
 <tr>
@@ -291,7 +286,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Must either choose an existing organization or create a new one.</td>
+	<td>Must either select an existing organization or create a new one.</td>
 	<td></td>
 </tr>
 <tr>
@@ -331,7 +326,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Must either choose an existing organization or create a new one.</td>
+	<td>Must specify an organization.</td>
 	<td></td>
 </tr>
 <tr>
@@ -441,12 +436,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, 1980</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, 1980</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='oprop-core-educationalBackground']/a</td>
+	<td>//div[@id='educationalTraining']/a</td>
 	<td></td>
 </tr>
 <tr>
@@ -531,12 +526,12 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, 1980</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, 1980</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll College, Business Department, 2000</td>
+	<td>M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000</td>
 	<td></td>
 </tr>
 <tr>
@@ -546,7 +541,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='oprop-core-educationalBackground']/a</td>
+	<td>//div[@id='educationalTraining']/a</td>
 	<td></td>
 </tr>
 <tr>
@@ -631,17 +626,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
+	<td>M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll College, Business Department, 2000</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, 1980</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, 1980</td>
+	<td>M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -146,17 +146,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, 9999</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, 1980</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll College, Business Department, 2000</td>
+	<td>M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
+	<td>M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
 	<td></td>
 </tr>
 <tr>
@@ -166,7 +166,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='oprop-core-educationalBackground']/ul/li[1]/span/span/a[1]</td>
+	<td>//div[@id='educationalTraining']/ul/li[2]/span/span/a[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -216,17 +216,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, Carroll College, Business Department, 2000</td>
+	<td>M.B.A. Master of Business Administration in Business Administration, Carroll College, Business Department, 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
+	<td>M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
 	<td></td>
 </tr>
 <tr>
@@ -236,7 +236,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='oprop-core-educationalBackground']/ul/li[2]/span/span/a[1]</td>
+	<td>//div[@id='educationalTraining']/ul/li[3]/span/span/a[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -286,17 +286,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, University of Illinois, Business Department, 2000</td>
+	<td>M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
+	<td>M.Ed. Master of Education in Business Education, University of Wisconsin, 2005, Graduate School Fellowship</td>
 	<td></td>
 </tr>
 <tr>
@@ -306,7 +306,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='oprop-core-educationalBackground']/ul/li[3]/span/span/a[1]</td>
+	<td>//div[@id='educationalTraining']/ul/li[1]/span/span/a[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -351,17 +351,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration, University of Illinois, Business Department, 2000</td>
+	<td>M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education, University of Wisconsin, School of Business, 2005</td>
+	<td>M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005</td>
 	<td></td>
 </tr>
 <tr>

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

@@ -136,17 +136,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.Ed. in Business Education</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>B.S. in Business Administration</td>
+	<td>M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>M.B.A. in Business Administration</td>
+	<td>M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005</td>
 	<td></td>
 </tr>
 <tr>
@@ -221,17 +221,17 @@
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>M.Ed. in Business Education</td>
+	<td>B.S. Bachelor of Science in Business Administration, Carroll College, Business Department, 1981, Four year full scholarship</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>B.S. in Business Administration</td>
+	<td>M.B.A. Master of Business Administration in Business Administration, University of Illinois, Business Department, 2000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextNotPresent</td>
-	<td>M.B.A. in Business Administration</td>
+	<td>M.Ed. Master of Education in Business Education, University of Wisconsin, School of Business, 2005</td>
 	<td></td>
 </tr>
 <tr>
@@ -251,7 +251,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>carroll college - VIVO Search Results</td>
+	<td>carroll college - VIVO Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -316,7 +316,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>carroll college - VIVO Search Results</td>
+	<td>carroll college - VIVO Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -336,7 +336,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>wisconsin - VIVO Search Results</td>
+	<td>wisconsin - VIVO Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -401,7 +401,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>wisconsin - VIVO Search Results</td>
+	<td>wisconsin - VIVO Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -421,7 +421,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>illinois - VIVO Search Results</td>
+	<td>illinois - VIVO Search</td>
 	<td></td>
 </tr>
 <tr>
@@ -486,7 +486,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>illinois - VIVO Search Results</td>
+	<td>illinois - VIVO Search</td>
 	<td></td>
 </tr>
 <tr>