diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
index 39343750..d02f49cd 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassHours.html
@@ -189,11 +189,6 @@
 	<td>vivo:Hours</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>no comments yet</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Times</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
index 229137dc..23688204 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/AddSubClassMinutes.html
@@ -189,11 +189,6 @@
 	<td>vivo:Minutes</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>no comments yet</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Times</td>
diff --git a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
index f0597a60..7d3f309b 100644
--- a/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
+++ b/utilities/acceptance-tests/suites/CreateClasses/ViewClassHierarchy.html
@@ -121,17 +121,17 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>vivo:Hour</td>
+	<td>exact:vivo:Hours</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Times</td>
+	<td>Class Group:	Times</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>VIVO core</td>
+	<td>Ontology:	VIVO core</td>
 	<td></td>
 </tr>
 <tr>
@@ -165,18 +165,98 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>vivo:Hours</td>
+	<td>verifyElementPresent</td>
+	<td>link=exact:vivo:Hours</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Times</td>
+	<td>Class Group:	Times</td>
 	<td></td>
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>VIVO core</td>
+	<td>Ontology:	VIVO core</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=exact:vivo:Hours</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Class Control Panel</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Class groups</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>comment</td>
+	<td class="comment">View class groups</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Site Admin</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO Site Administration</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>link=Class groups</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>VIVO</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Times</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Classes:	Hours</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyElementPresent</td>
+	<td>link=Hours</td>
 	<td></td>
 </tr>
 <tr>