diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
index 7cacf8a4..1cf2eaca 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html
@@ -166,22 +166,27 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Please select a value in the Organization Type field. Please enter or select a value in the Name field. </td>
+	<td>Please select a value in the Organization Type field. </td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please select a value in the Type of Educational Training field.</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Verify entering just degree is not valid</td>
+	<td class="comment">Verify entering just organization type</td>
 	<td></td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>degree</td>
-	<td>label=B.S. Bachelor of Science</td>
+	<td>id=typeSelector</td>
+	<td>label=College</td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>id=submit</td>
 	<td></td>
 </tr>
 <tr>
@@ -191,109 +196,79 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Please select a value in the Organization Type field. Please enter or select a value in the Name field. </td>
+	<td>Please select a value in the Type of Educational Training field.</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Verify entering just degree and major is not valid</td>
+	<td class="comment">Verify entering just the org type and college name</td>
 	<td></td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>degree</td>
-	<td>label=B.S. Bachelor of Science</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>majorField</td>
-	<td>Business Administration</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Please select a value in the Organization Type field. Please enter or select a value in the Name field. </td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Verify organization must be selected or entered</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>degree</td>
-	<td>label=B.S. Bachelor of Science</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>majorField</td>
-	<td>Business Administration</td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">For now 9999 is a valid year</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>startField-year</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>endField-year</td>
-	<td>1980</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Edit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Please select a value in the Organization Type field. Please enter or select a value in the Name field. </td>
-	<td></td>
-</tr>
-<tr>
-	<td>comment</td>
-	<td class="comment">Enter in new organization name</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>startField-year</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>endField-year</td>
-	<td>1980</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>typeSelector</td>
+	<td>id=typeSelector</td>
 	<td>label=College</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>relatedIndLabel</td>
+	<td>id=relatedIndLabel</td>
 	<td>Carroll College</td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>id=submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Please select a value in the Type of Educational Training field.</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">Verify entering everything</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>id=typeSelector</td>
+	<td>label=College</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>id=relatedIndLabel</td>
+	<td>Carroll College</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=trainingType</td>
+	<td>label=Other</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>degree</td>
+	<td>label=B.S. Bachelor of Science</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>majorField</td>
+	<td>Business Administration</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>startField-year</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>endField-year</td>
+	<td>1980</td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit</td>
@@ -381,9 +356,29 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Add degree from existing organization</td>
+	<td class="comment">Add degree from another new organization</td>
 	<td></td>
 </tr>
+<tr>
+	<td>select</td>
+	<td>id=typeSelector</td>
+	<td>label=University</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>relatedIndLabel</td>
+	<td>Carroll University</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=trainingType</td>
+	<td>label=Other</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>dept</td>
+	<td>Business Department</td>
+</tr>
 <tr>
 	<td>select</td>
 	<td>degree</td>
@@ -404,21 +399,6 @@
 	<td>endField-year</td>
 	<td>2000</td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>typeSelector</td>
-	<td>label=University</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>relatedIndLabel</td>
-	<td>Carroll University</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>dept</td>
-	<td>Business Department</td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit</td>
@@ -464,11 +444,26 @@
 	<td>//h3[@id='educationalTraining']/a/img</td>
 	<td></td>
 </tr>
+<tr>
+	<td>select</td>
+	<td>id=typeSelector</td>
+	<td>label=University</td>
+</tr>
 <tr>
 	<td>assertTitle</td>
 	<td>Edit</td>
 	<td></td>
 </tr>
+<tr>
+	<td>type</td>
+	<td>relatedIndLabel</td>
+	<td>University of Wisconsin</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>name=trainingType</td>
+	<td>label=Other</td>
+</tr>
 <tr>
 	<td>select</td>
 	<td>degree</td>
@@ -479,6 +474,11 @@
 	<td>majorField</td>
 	<td>Business Education</td>
 </tr>
+<tr>
+	<td>type</td>
+	<td>info</td>
+	<td>Graduate School Fellowship</td>
+</tr>
 <tr>
 	<td>type</td>
 	<td>startField-year</td>
@@ -489,21 +489,6 @@
 	<td>endField-year</td>
 	<td></td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>typeSelector</td>
-	<td>label=University</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>relatedIndLabel</td>
-	<td>University of Wisconsin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>info</td>
-	<td>Graduate School Fellowship</td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>submit</td>
diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
index fd9b8437..a44f9abd 100644
--- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
+++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html
@@ -464,6 +464,31 @@
 	<td>VIVO Site Administration</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>type</td>
 	<td>querytext</td>
diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
index 55234412..5997c10a 100644
--- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
+++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html
@@ -176,7 +176,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>relatedIndLabel</td>
+	<td>id=orgLabel</td>
 	<td>Carroll College</td>
 </tr>
 <tr>
@@ -286,7 +286,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>relatedIndLabel</td>
+	<td>id=orgLabel</td>
 	<td>Carroll University</td>
 </tr>
 <tr>
@@ -356,7 +356,7 @@
 </tr>
 <tr>
 	<td>type</td>
-	<td>relatedIndLabel</td>
+	<td>id=orgLabel</td>
 	<td>Cornell University</td>
 </tr>
 <tr>