diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
index 8792b636..21f861ef 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckBrowseOptions.html
@@ -101,7 +101,7 @@
 </tr>
 <tr>
 	<td>verifyElementPresent</td>
-	<td>link=Locations (314)</td>
+	<td>link=Locations (318)</td>
 	<td></td>
 </tr>
 <tr>
@@ -124,6 +124,11 @@
 	<td>Librarian</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Person</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>link=Activities (4)</td>
@@ -269,6 +274,11 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Award or Honor</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Book</td>
@@ -301,7 +311,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>link=Locations (314)</td>
+	<td>link=Locations (318)</td>
 	<td></td>
 </tr>
 <tr>
@@ -314,21 +324,61 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Address</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Building</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Campus</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Continent</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Country</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Facility</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Geographic Region</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Geographic Location</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Room</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>State Or Province</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Transnational Region</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td class="comment">Verify People menu option </td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
index d3ade4a4..88706aa0 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
@@ -214,6 +214,11 @@
 	<td>Webpage (1)</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Address (4)</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Building (1)</td>
@@ -221,12 +226,32 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Country (207)</td>
+	<td>Campus (1)</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Geographic Location (313)</td>
+	<td>Continent (7)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Country (208)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Facility (3)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Geographic Location (314)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Geographic Region (310)</td>
 	<td></td>
 </tr>
 <tr>
@@ -239,6 +264,16 @@
 	<td>State Or Province (50)</td>
 	<td></td>
 </tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Geographic Location (314)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Transnational Region (27)</td>
+	<td></td>
+</tr>
 <tr>
 	<td>comment</td>
 	<td>Verify links correct</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
index 68277116..17049d2a 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html
@@ -366,7 +366,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@id='submit' and @value='Add a new item of this type']</td>
 	<td></td>
 </tr>
 <tr>
@@ -996,7 +996,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>//input[@id='submit' and @value='Add a new item of this type']</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
index 1bfd7b52..60050391 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
@@ -599,6 +599,31 @@
 	<td>Locations</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>link=Address (4)</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=1234 Northern African Nation</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=CIT, Cornell University, Ithaca, NY, 14853</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Jungle 1234, Africa, 1234-56789</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=The Jungle, Africa, 12345678</td>
+	<td></td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>link=Building (1)</td>