diff --git a/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt b/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt
index f3fecee3..7b5ee0ce 100644
--- a/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt
+++ b/utilities/acceptance-tests/suites/MultiLabels/TestMultipleLabels.txt
@@ -1,3 +1,3 @@
- <http://vivo.mydomain.edu/individual/n6027> <http://www.w3.org/2000/01/rdf-schema#label> "Test Label 1" .
- <http://vivo.mydomain.edu/individual/n6027> <http://www.w3.org/2000/01/rdf-schema#label> "Test Label 2" .
+ <http://vivo.mydomain.edu/individual/n####> <http://www.w3.org/2000/01/rdf-schema#label> "Test Label 1" .
+ <http://vivo.mydomain.edu/individual/n####> <http://www.w3.org/2000/01/rdf-schema#label> "Test Label 2" .
  
diff --git a/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt b/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt
index b8969c9a..2a9e5c66 100644
--- a/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt
+++ b/utilities/acceptance-tests/suites/SearchBoost/BoostIndividual.txt
@@ -1,3 +1,3 @@
-<http://vivo.mydomain.edu/individual/n3761>
+<http://vivo.mydomain.edu/individual/n371>
 <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#searchBoostAnnot>
 2000.0 .
diff --git a/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html b/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html
index bea14cc7..06a58cf6 100644
--- a/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html
+++ b/utilities/acceptance-tests/suites/SearchTextDiscovery/TextDiscovery.html
@@ -1183,25 +1183,15 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
-	<td>id=9900editLink</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>tinymce</td>
+	<td>selectWindow</td>
+	<td>null</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>tinymce</td>
+	<td>name=Name</td>
 	<td>Lemuria</td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>id=9900okLink</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>id=primaryAction</td>
@@ -1212,6 +1202,11 @@
 	<td>Individual Control Panel</td>
 	<td></td>
 </tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Individual Control Panel</td>
+	<td></td>
+</tr>
 <tr>
 	<td>pause</td>
 	<td>5000</td>
@@ -1360,11 +1355,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[2]/span</td>
 	<td>Department</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>css=strong</td>
-	<td>Baker</td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Thoughts</td>
@@ -1375,11 +1365,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[3]/span</td>
 	<td>Academic Article</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[3]/p/strong</td>
-	<td>Baker</td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Lemuria</td>
@@ -1390,17 +1375,7 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[4]/span</td>
 	<td>Continent</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[4]/p</td>
-	<td>... Baker, Able ...</td>
-</tr>
 <!--Change label on object through context node: role...-->
-<tr>
-	<td>selectWindow</td>
-	<td>null</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Advanced Tinkering</td>
@@ -1431,26 +1406,11 @@
 	<td>Individual Editing Form</td>
 	<td></td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>id=9903editLink</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>tinymce</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>tinymce</td>
+	<td>name=Name</td>
 	<td>Advanced Puttering</td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>id=9903okLink</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>id=primaryAction</td>
@@ -1543,11 +1503,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[2]/span</td>
 	<td>Honcho</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[2]/p</td>
-	<td>... Advanced Puttering ...</td>
-</tr>
 <!--...then search for baker-->
 <tr>
 	<td>type</td>
@@ -1609,11 +1564,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[2]/span</td>
 	<td>Academic Article</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[2]/p</td>
-	<td>... Baker, Able ...</td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Advanced Puttering</td>
@@ -1624,11 +1574,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[3]/span</td>
 	<td>Department</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[3]/p</td>
-	<td>... Baker, Able ...</td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Lemuria</td>
@@ -1639,11 +1584,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[4]/span</td>
 	<td>Continent</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[4]/p/strong</td>
-	<td>Baker</td>
-</tr>
 <!--Change label on object through standard contect node...-->
 <tr>
 	<td>clickAndWait</td>
@@ -1675,26 +1615,11 @@
 	<td>Individual Editing Form</td>
 	<td></td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>id=9915editLink</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>tinymce</td>
-	<td></td>
-</tr>
 <tr>
 	<td>type</td>
-	<td>tinymce</td>
+	<td>name=Name</td>
 	<td>Musings</td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>id=9915okLink</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>id=primaryAction</td>
@@ -1787,11 +1712,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[2]/span</td>
 	<td>Honcho</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>css=strong</td>
-	<td>Musings</td>
-</tr>
 <!--...then search for baker-->
 <tr>
 	<td>type</td>
@@ -1853,11 +1773,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[2]/span</td>
 	<td>Department</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>css=strong</td>
-	<td>Baker</td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Musings</td>
@@ -1868,11 +1783,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[3]/span</td>
 	<td>Academic Article</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[3]/p</td>
-	<td>... Baker, Able ...</td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Lemuria</td>
@@ -1883,11 +1793,6 @@
 	<td>//div[@id='wrapper-content']/div/ul/li[4]/span</td>
 	<td>Continent</td>
 </tr>
-<tr>
-	<td>verifyText</td>
-	<td>//div[@id='wrapper-content']/div/ul/li[4]/p</td>
-	<td>... Baker, Able ...</td>
-</tr>
 <!--Log out-->
 <tr>
 	<td>clickAndWait</td>
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html
index 760e6026..2e97cffa 100644
--- a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html
+++ b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiFailure.html
@@ -32,11 +32,6 @@
 	<td>//input[@value='GET method not allowed']</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Apache Tomcat/7.0.42 - Error report</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>HTTP Status 405 - HTTP method GET is not supported by this URL</td>
diff --git a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html
index 0b0110f3..5d6efb68 100644
--- a/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html
+++ b/utilities/acceptance-tests/suites/SparqlUpdateApi/TestApiWorks.html
@@ -83,16 +83,6 @@
 	<td>Individual Not Found</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Individual not found:</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>This id is the id of the entity to query for. netid also works.</td>
-	<td></td>
-</tr>
 <tr>
 	<td>open</td>
 	<td>/vivo/TestSparqlApi.html</td>