diff --git a/utilities/acceptance-tests/suites/InitialSetupVB/AddCollectionTabs.html b/utilities/acceptance-tests/suites/InitialSetupVB/AddCollectionTabs.html
index 9fbeb4f2..0c2795c2 100644
--- a/utilities/acceptance-tests/suites/InitialSetupVB/AddCollectionTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetupVB/AddCollectionTabs.html
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -170,13 +170,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Add existing tab as parent tab']</td>
+	<td>assertTitle</td>
+	<td>Tab Control Panel</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertTitle</td>
-	<td>Super/Subtab Editing Form</td>
+	<td>clickAndWait</td>
+	<td>//input[@value='Add existing tab as parent tab']</td>
 	<td></td>
 </tr>
 <tr>
@@ -309,6 +309,11 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -319,7 +324,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/InitialSetupVB/AddPrimaryTabs.html b/utilities/acceptance-tests/suites/InitialSetupVB/AddPrimaryTabs.html
index 23b638d9..cbe0d3bc 100644
--- a/utilities/acceptance-tests/suites/InitialSetupVB/AddPrimaryTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetupVB/AddPrimaryTabs.html
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -239,6 +239,11 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -249,7 +254,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/InitialSetupVB/AddSecondaryTabs.html b/utilities/acceptance-tests/suites/InitialSetupVB/AddSecondaryTabs.html
index 32e8bc61..e39581f5 100644
--- a/utilities/acceptance-tests/suites/InitialSetupVB/AddSecondaryTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetupVB/AddSecondaryTabs.html
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -314,6 +314,11 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -324,7 +329,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/InitialSetupVB/DeleteNewTabs.html b/utilities/acceptance-tests/suites/InitialSetupVB/DeleteNewTabs.html
index 85e464ee..39b011db 100644
--- a/utilities/acceptance-tests/suites/InitialSetupVB/DeleteNewTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetupVB/DeleteNewTabs.html
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -231,7 +231,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='contentwrap']/div/table/tbody/tr[3]/td[2]/a</td>
+	<td>//a[contains(@href, './tabEdit?id=983349090&amp;home=1')]</td>
 	<td></td>
 </tr>
 <tr>
@@ -351,7 +351,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='contentwrap']/div/table/tbody/tr[3]/td[2]/a</td>
+	<td>//a[contains(@href, './tabEdit?id=2084405211&amp;home=1')]</td>
 	<td></td>
 </tr>
 <tr>
@@ -429,6 +429,11 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -439,7 +444,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/InitialSetupVB/EditHomeTab.html b/utilities/acceptance-tests/suites/InitialSetupVB/EditHomeTab.html
index a1012ce9..69fe67c9 100644
--- a/utilities/acceptance-tests/suites/InitialSetupVB/EditHomeTab.html
+++ b/utilities/acceptance-tests/suites/InitialSetupVB/EditHomeTab.html
@@ -5,29 +5,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="" />
 <title>EditHomeTab</title>
-<style type="text/css">
-.testName {
-  color: blue;
-  background: rgb(80%, 80%, 80%);
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: center;
-}
-.comment {
-  color: blue;
-  background: rgb(80%, 80%, 80%);
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: larger;
-  text-align: center;
-}
-</style>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3" class="testName">EditHomeTab</td></tr>
+<tr><td rowspan="1" colspan="3">EditHomeTab</td></tr>
 </thead><tbody>
 <tr>
 	<td>deleteAllVisibleCookies</td>
@@ -36,7 +18,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Edit Home Tab Body (then reset it to default)</td>
+	<td>Edit Home Tab Body (then reset it to default)</td>
 	<td></td>
 </tr>
 <tr>
@@ -51,7 +33,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Must be logged out</td>
+	<td>Must be logged out</td>
 	<td></td>
 </tr>
 <tr>
@@ -61,12 +43,12 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Must login as site admin</td>
+	<td>Must login as site admin</td>
 	<td></td>
 </tr>
 <tr>
@@ -91,7 +73,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Navigate to Tab Management</td>
+	<td>Navigate to Tab Management</td>
 	<td></td>
 </tr>
 <tr>
@@ -116,7 +98,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='contentwrap']/div/table/tbody/tr[2]/td[2]/a</td>
+	<td>//a[contains(@href, './tabEdit?id=1&amp;home=1')]</td>
 	<td></td>
 </tr>
 <tr>
@@ -136,7 +118,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Edit Home Tab body to add the word "test" between VIVO and !</td>
+	<td>Edit Home Tab body to add the word &quot;test&quot; between VIVO and !</td>
 	<td></td>
 </tr>
 <tr>
@@ -166,17 +148,17 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Verify that Home Tab body text has changed</td>
+	<td>Verify that Home Tab body text has changed</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Welcome! You have successfully installed VIVO test!</td>
+	<td>This is the home page of the VIVO vivo-basic theme.</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Site Administration</td>
+	<td>link=Site Admin</td>
 	<td></td>
 </tr>
 <tr>
@@ -206,7 +188,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='contentwrap']/div/table/tbody/tr[2]/td[2]/a</td>
+	<td>//a[contains(@href, './tabEdit?id=1&amp;home=1')]</td>
 	<td></td>
 </tr>
 <tr>
@@ -226,7 +208,7 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Reset Home Tab body to installation default</td>
+	<td>Reset Home Tab body to installation default</td>
 	<td></td>
 </tr>
 <tr>
@@ -256,17 +238,22 @@
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Verify Home Tab body is back to default</td>
+	<td>Verify Home Tab body is back to default</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Welcome! You have successfully installed VIVO!</td>
+	<td>This is the home page of the VIVO vivo-basic theme.</td>
 	<td></td>
 </tr>
 <tr>
 	<td>comment</td>
-	<td class="comment">Logout</td>
+	<td>Logout</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
 	<td></td>
 </tr>
 <tr>
@@ -279,7 +266,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/InitialSetupVB/EditSiteInfo.html b/utilities/acceptance-tests/suites/InitialSetupVB/EditSiteInfo.html
index 565bfa43..0b48976d 100644
--- a/utilities/acceptance-tests/suites/InitialSetupVB/EditSiteInfo.html
+++ b/utilities/acceptance-tests/suites/InitialSetupVB/EditSiteInfo.html
@@ -41,12 +41,12 @@
 </tr>
 <tr>
 	<td>open</td>
-	<td>/vivo/siteAdmin?home=1&amp;login=block</td>
+	<td>/vivo/</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -209,19 +209,24 @@
 	<td class="comment">Verify that changes were set back to the default</td>
 	<td></td>
 </tr>
+<tr>
+	<td>open</td>
+	<td>/vivo/</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>VIVO Project</td>
 	<td></td>
 </tr>
 <tr>
-	<td>open</td>
-	<td>/vivo/siteAdmin?home=1</td>
+	<td>comment</td>
+	<td class="comment">Logout</td>
 	<td></td>
 </tr>
 <tr>
-	<td>comment</td>
-	<td class="comment">Logout</td>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
 	<td></td>
 </tr>
 <tr>
@@ -239,7 +244,6 @@
 	<td>Log in</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/utilities/acceptance-tests/suites/InitialSetupVB/ReorderPrimaryTabs.html b/utilities/acceptance-tests/suites/InitialSetupVB/ReorderPrimaryTabs.html
index 5fffc9f8..a92fa015 100644
--- a/utilities/acceptance-tests/suites/InitialSetupVB/ReorderPrimaryTabs.html
+++ b/utilities/acceptance-tests/suites/InitialSetupVB/ReorderPrimaryTabs.html
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>VIVO Site Administration</td>
+	<td>VIVO</td>
 	<td></td>
 </tr>
 <tr>
@@ -89,6 +89,16 @@
 	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Tab management</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Tabs</td>
+	<td></td>
+</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>People</td>
@@ -101,22 +111,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=People</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>People</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>edit tab: People</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//div[@id='contents']/div[2]/a/em</td>
+	<td>//a[contains(@href, './tabEdit?id=983349090&amp;home=1')]</td>
 	<td></td>
 </tr>
 <tr>
@@ -161,22 +156,27 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Academic Units</td>
+	<td>link=Site Admin</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTitle</td>
-	<td>Academic Units</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Academic Units</td>
+	<td>VIVO Site Administration</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//div[@id='contents']/div[2]/a/em</td>
+	<td>link=Tab management</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Tabs</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//a[contains(@href, './tabEdit?id=2084405211&amp;home=1')]</td>
 	<td></td>
 </tr>
 <tr>
@@ -234,6 +234,11 @@
 	<td class="comment">Logout</td>
 	<td></td>
 </tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Home</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Log out</td>
@@ -244,7 +249,6 @@
 	<td>VIVO</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>