diff --git a/selenium/src/test/java/org/vivoweb/vivo/selenium/suites/AddNonPersonThings.java b/selenium/src/test/java/org/vivoweb/vivo/selenium/suites/AddNonPersonThings.java
index cf53bf6d..127f80d9 100644
--- a/selenium/src/test/java/org/vivoweb/vivo/selenium/suites/AddNonPersonThings.java
+++ b/selenium/src/test/java/org/vivoweb/vivo/selenium/suites/AddNonPersonThings.java
@@ -6,6 +6,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite.SuiteClasses;
 import org.vivoweb.vivo.selenium.DriverFactory;
 import org.vivoweb.vivo.selenium.VIVOSuite;
+import org.vivoweb.vivo.selenium.tests.CheckPublicView;
 import org.vivoweb.vivo.selenium.tests.CreateActivity;
 import org.vivoweb.vivo.selenium.tests.CreateCourses;
 import org.vivoweb.vivo.selenium.tests.CreateEquipment;
@@ -21,6 +22,7 @@ import org.vivoweb.vivo.selenium.tests.DeleteLocations;
 import org.vivoweb.vivo.selenium.tests.DeleteOrganization;
 import org.vivoweb.vivo.selenium.tests.DeleteResearch;
 import org.vivoweb.vivo.selenium.tests.RebuildSearchIndex;
+import org.vivoweb.vivo.selenium.tests.VerifyAllThingsSearchable;
 
 @RunWith(VIVOSuite.class)
 @SuiteClasses(
@@ -33,6 +35,11 @@ import org.vivoweb.vivo.selenium.tests.RebuildSearchIndex;
                 CreateTopic.class,
                 CreateEquipment.class,
                 CreateLocation.class,
+                RebuildSearchIndex.class,
+                VerifyAllThingsSearchable.class,
+                CheckPublicView.class,
+//                CheckIndexView.class,
+//                TestMenuManagement.class,
                 DeleteActivities.class,
                 DeleteCourses.class,
                 DeleteLocations.class,
diff --git a/selenium/src/test/java/org/vivoweb/vivo/selenium/tests/CheckPublicView.java b/selenium/src/test/java/org/vivoweb/vivo/selenium/tests/CheckPublicView.java
new file mode 100644
index 00000000..8ba20dd6
--- /dev/null
+++ b/selenium/src/test/java/org/vivoweb/vivo/selenium/tests/CheckPublicView.java
@@ -0,0 +1,458 @@
+package org.vivoweb.vivo.selenium.tests;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+
+public class CheckPublicView extends AbstractVIVOSeleniumTest {
+    @Test
+    public void checkPublicView() {
+        deleteAllVisibleCookies();
+
+        open("/");
+        assertTitle("VIVO");
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Project"));
+        assertTitle("Project");
+
+        clickAndWait(By.linkText("Human and Ape Brain Comparison"));
+        assertTitle("Human and Ape Brain Comparison");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Research Project"));
+        assertTitle("Research Project");
+
+        clickAndWait(By.linkText("Human and Ape Brain Comparison"));
+        assertTitle("Human and Ape Brain Comparison");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Service"));
+        assertTitle("Service");
+
+        clickAndWait(By.linkText("Primate Heart Health"));
+        assertTitle("Primate Heart Health");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Service"));
+        assertTitle("Service");
+
+        clickAndWait(By.linkText("Gorilla Moving Company"));
+        assertTitle("Gorilla Moving Company");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Transport Service"));
+        assertTitle("Transport Service");
+
+        clickAndWait(By.linkText("Gorilla Moving Company"));
+        assertTitle("Gorilla Moving Company");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Course"));
+        assertTitle("Course");
+
+        clickAndWait(By.linkText("Introduction to Primate Health"));
+        assertTitle("Introduction to Primate Health");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Course"));
+        assertTitle("Course");
+
+        clickAndWait(By.linkText("Introduction to Primates"));
+        assertTitle("Introduction to Primates");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Conference"));
+        assertTitle("Conference");
+
+        clickAndWait(By.linkText("Primate Health Conference"));
+        assertTitle("Primate Health Conference");
+
+        verifyElementPresent(By.linkText("Primate Health and Fitness"));
+    	verifyElementPresent(By.linkText("Animal Health"));
+	    verifyElementPresent(By.linkText("PHC Proceedings"));
+
+        verifyTextPresent(
+                "has subject area",
+                "Animal Health",
+                "description"
+        );
+
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Invited Talk"));
+        assertTitle("Invited Talk");
+
+        clickAndWait(By.linkText("Primate Health and Fitness"));
+        assertTitle("Primate Health and Fitness");
+
+        verifyElementPresent(By.linkText("Introduction to Primate Health"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Performance"));
+        assertTitle("Performance");
+
+        clickAndWait(By.linkText("Primates in the Wild"));
+        assertTitle("Primates in the Wild");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Presentation"));
+        assertTitle("Presentation");
+
+        clickAndWait(By.linkText("Primate Health and Fitness"));
+        assertTitle("Primate Health and Fitness");
+
+        verifyElementPresent(By.linkText("Introduction to Primate Health"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Seminar Series"));
+        assertTitle("Seminar Series");
+
+        clickAndWait(By.linkText("Primate Health Talks"));
+        assertTitle("Primate Health Talks");
+
+        verifyElementPresent(By.linkText("Introduction to Primate Health"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Workshop"));
+        assertTitle("Workshop");
+
+        clickAndWait(By.linkText("New Primate Students"));
+        assertTitle("New Primate Students");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("College"));
+        assertTitle("College");
+
+        clickAndWait(By.linkText("Primate College of America"));
+        assertTitle("Primate College of America");
+
+        verifyElementPresent(By.linkText("B.S. Bachelor of Science"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("College"));
+        assertTitle("College");
+
+        clickAndWait(By.linkText("Primate College of New York"));
+        assertTitle("Primate College of New York");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Company"));
+        assertTitle("Company");
+
+        clickAndWait(By.linkText("Primates-r-us"));
+        assertTitle("Primates-r-us");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Consortium"));
+        assertTitle("Consortium");
+
+        clickAndWait(By.linkText("Primate Colleges of the World"));
+        assertTitle("Primate Colleges of the World");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Laboratory"));
+        assertTitle("Laboratory");
+
+        clickAndWait(By.linkText("Primate Research Laboratory"));
+        assertTitle("Primate Research Laboratory");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Library"));
+        assertTitle("Library");
+
+        clickAndWait(By.linkText("Primate History Library"));
+        assertTitle("Primate History Library");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("University"));
+        assertTitle("University");
+
+        clickAndWait(By.linkText("Primate University of America"));
+        assertTitle("Primate University of America");
+
+        verifyElementPresent(By.linkText("Jane Memorial Building"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Organization"));
+        assertTitle("Organization");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+        verifyElementPresent(By.linkText("Primate College of New York"));
+        verifyElementPresent(By.linkText("Primate Colleges of the World"));
+        verifyElementPresent(By.linkText("Primate History Library"));
+        verifyElementPresent(By.linkText("Primate Research Laboratory"));
+        verifyElementPresent(By.linkText("Primate University of America"));
+        verifyElementPresent(By.linkText("Primates-r-us"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Equipment"));
+        assertTitle("Equipment");
+
+        clickAndWait(By.linkText("Portable Primate Habitat"));
+        assertTitle("Portable Primate Habitat");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Equipment"));
+        assertTitle("Equipment");
+
+        clickAndWait(By.linkText("Primate Feeder"));
+        assertTitle("Primate Feeder");
+
+        verifyElementPresent(By.linkText("Primate Research Laboratory"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Article"));
+        assertTitle("Article");
+
+        clickAndWait(By.linkText("Primate Happenings"));
+        assertTitle("Primate Happenings");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Award or Honor"));
+        assertTitle("Award or Honor");
+
+        clickAndWait(By.linkText("Best Primate College"));
+        assertTitle("Best Primate College");
+
+        verifyElementPresent(By.linkText("Best Primate College (Primate College of America)"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Award or Honor"));
+        assertTitle("Award or Honor");
+
+        clickAndWait(By.linkText("Primate Student of the Year"));
+        assertTitle("Primate Student of the Year");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Blog Posting"));
+        assertTitle("Blog Posting");
+
+        clickAndWait(By.linkText("Primate Happenings"));
+        assertTitle("Primate Happenings");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Book"));
+        assertTitle("Book");
+
+        verifyElementPresent(By.linkText("PHC Proceedings"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Concept"));
+        assertTitle("Concept");
+
+        verifyElementPresent(By.linkText("Animal Health"));
+        verifyElementPresent(By.linkText("Ape Health"));
+        verifyElementPresent(By.linkText("Best Primate College"));
+        verifyElementPresent(By.linkText("Elderly Care"));
+        verifyElementPresent(By.linkText("Primate Diet"));
+        verifyElementPresent(By.linkText("Primate Health"));
+        verifyElementPresent(By.linkText("Primate Student of the Year"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Database"));
+        assertTitle("Database");
+
+        clickAndWait(By.linkText("Primate Info"));
+        assertTitle("Primate Info");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Grant"));
+        assertTitle("Grant");
+
+        clickAndWait(By.linkText("Primate Elderly Care"));
+        assertTitle("Primate Elderly Care");
+
+        verifyElementPresent(By.linkText("Elderly Care"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Grant"));
+        assertTitle("Grant");
+
+        clickAndWait(By.linkText("Primate Habitat Research Grant"));
+        assertTitle("Primate Habitat Research Grant");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Grant"));
+        assertTitle("Grant");
+
+        clickAndWait(By.linkText("Primate Survival Planning Grant"));
+        assertTitle("Primate Survival Planning Grant");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Human Study"));
+        assertTitle("Human Study");
+
+        clickAndWait(By.linkText("Human and Ape Brain Comparison"));
+        assertTitle("Human and Ape Brain Comparison");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Patent"));
+        assertTitle("Patent");
+
+        clickAndWait(By.linkText("USA222333444555"));
+        assertTitle("USA222333444555");
+
+        verifyElementPresent(By.linkText("Primate College of America"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Proceedings"));
+        assertTitle("Proceedings");
+
+        clickAndWait(By.linkText("PHC Proceedings"));
+        assertTitle("PHC Proceedings");
+
+        verifyElementPresent(By.linkText("Primate Health Conference"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Webpage"));
+        assertTitle("Webpage");
+
+        clickAndWait(By.linkText("http://primatehealthintro.cornell.edu"));
+        assertTitle("http://primatehealthintro.cornell.edu");
+
+        verifyElementPresent(By.linkText("Introduction to Primate Health"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Building"));
+        assertTitle("Building");
+
+        clickAndWait(By.linkText("Jane Memorial Building"));
+        assertTitle("Jane Memorial Building");
+
+        verifyElementPresent(By.linkText("Portable Primate Habitat"));
+
+        clickAndWait(By.linkText("Index"));
+        assertTitle("Index of Contents");
+
+        clickAndWait(By.linkText("Room"));
+        assertTitle("Room");
+
+        clickAndWait(By.linkText("Lab Admin Office"));
+        assertTitle("Lab Admin Office");
+
+        verifyElementPresent(By.linkText("Jane Memorial Building"));
+
+        clickAndWait(By.linkText("Home"));
+        assertTitle("VIVO");
+    }
+}
diff --git a/selenium/src/test/java/org/vivoweb/vivo/selenium/tests/VerifyAllThingsSearchable.java b/selenium/src/test/java/org/vivoweb/vivo/selenium/tests/VerifyAllThingsSearchable.java
new file mode 100644
index 00000000..dba30680
--- /dev/null
+++ b/selenium/src/test/java/org/vivoweb/vivo/selenium/tests/VerifyAllThingsSearchable.java
@@ -0,0 +1,143 @@
+package org.vivoweb.vivo.selenium.tests;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+
+public class VerifyAllThingsSearchable extends AbstractVIVOSeleniumTest {
+    @Test
+    public void verifyAllThingsSearchable() {
+        deleteAllVisibleCookies();
+
+        open("/");
+        assertTitle("VIVO");
+
+        type(By.id("querytext"), "primates");
+
+        clickAndWait(By.xpath("//input[@value='Search']"));
+
+        assertTitle("primates - VIVO Search Results");
+
+        verifyElementPresent(By.linkText("people"));
+        verifyElementPresent(By.linkText("activities"));
+        verifyElementPresent(By.linkText("courses"));
+        verifyElementPresent(By.linkText("events"));
+        verifyElementPresent(By.linkText("organizations"));
+        verifyElementPresent(By.linkText("equipment"));
+        verifyElementPresent(By.linkText("research"));
+        verifyElementPresent(By.linkText("locations"));
+        verifyElementPresent(By.linkText("Primates in the Wild"));
+        verifyElementPresent(By.linkText("Introduction to Primates"));
+        verifyElementPresent(By.linkText("Primates-r-us"));
+        verifyElementPresent(By.linkText("Primate Happenings"));
+        verifyElementPresent(By.linkText("Primate Info"));
+        verifyElementPresent(By.linkText("Primate Health"));
+        verifyElementPresent(By.linkText("Primate Quad"));
+        verifyElementPresent(By.linkText("Primate Feeder"));
+        verifyElementPresent(By.linkText("Primate Diet"));
+        verifyElementPresent(By.linkText("Primate College of America"));
+        verifyElementPresent(By.linkText("Primate Health Talks"));
+        verifyElementPresent(By.linkText("Primate Research Laboratory"));
+        verifyElementPresent(By.linkText("Portable Primate Habitat"));
+        verifyElementPresent(By.linkText("Primate Elderly Care"));
+        verifyElementPresent(By.linkText("Introduction to Primate Health"));
+        verifyElementPresent(By.linkText("Primate Health and Fitness"));
+        verifyElementPresent(By.linkText("Primate University of America"));
+        verifyElementPresent(By.linkText("Primate Colleges of the World"));
+        verifyElementPresent(By.linkText("Primate Health Check"));
+        verifyElementPresent(By.linkText("Primate Health Conference"));
+        verifyElementPresent(By.linkText("Primate Heart Health"));
+        verifyElementPresent(By.linkText("New Primate Student"));
+        verifyElementPresent(By.linkText("Primate Habitat Research Grant"));
+        verifyElementPresent(By.linkText("Primate Memorial Building"));
+        verifyElementPresent(By.linkText("Primate Student of the Year"));
+
+        verifyTextPresent(
+                "Primates in the Wild Performance",
+                "Introduction to Primates Course",
+                "Primates-r-us Company",
+                "Primate Happenings Blog Posting",
+                "Primate Info Database",
+                "Primate Health Concept",
+                "Primate Quad Geographic Location",
+                "Primate Feeder Equipment",
+                "Primate Diet Concept",
+                "Primate College of America College",
+                "Primate Health Talks Seminar Series",
+                "Primate Research Laboratory Laboratory",
+                "Portable Primate Habitat Equipment",
+                "Primate Elderly Care Grant",
+                "Introduction to Primate Health Course",
+                "Primate Health and Fitness Invited Talk",
+                "Primate University of America University",
+                "Primate Colleges of the World Consortium",
+                "Primate Health Check Event",
+                "Primate Health Conference Conference",
+                "Primate Heart Health Service",
+                "New Primate Students Workshop",
+                "Primate Habitat Research Grant Grant",
+                "Primate Memorial Building Building",
+                "Primate Student of the Year Award or Honor"
+        );
+
+        clickAndWait(By.linkText("2"));
+        assertTitle("primates - VIVO Search Results");
+
+        verifyElementPresent(By.linkText("Best Primate College"));
+        verifyElementPresent(By.linkText("Primate History Library"));
+        verifyElementPresent(By.linkText("Primate Survival Planning Grant"));
+        verifyElementPresent(By.linkText("Primate College of New York"));
+        verifyElementPresent(By.linkText("Primate Research Lab Room 123"));
+        verifyElementPresent(By.linkText("Animal Health"));
+        verifyElementPresent(By.linkText("Ape Health"));
+        verifyElementPresent(By.linkText("Elderly Care"));
+        verifyElementPresent(By.linkText("Jane Memorial Building"));
+//        verifyElementPresent(By.linkText("exact:http://primatehealthintro.cornell.edu"));
+        verifyElementPresent(By.linkText("Human and Ape Brain Comparison"));
+        verifyElementPresent(By.linkText("Person, Polly"));
+        verifyElementPresent(By.linkText("Gorilla Moving Company"));
+        verifyElementPresent(By.linkText("PHC Proceedings"));
+        verifyElementPresent(By.linkText("State Fair Park"));
+        verifyElementPresent(By.linkText("USA222333444555"));
+        verifyElementPresent(By.linkText("Africa"));
+        verifyElementPresent(By.linkText("Kenya"));
+
+        verifyTextPresent(
+                "Best Primate College Award or Honor",
+                "Primate History Library Library",
+                "Primate Survival Planning Grant Grant",
+                "Primate College of New York College",
+                "Primate Research Lab Room 123 Facility",
+                "Animal Health Concept",
+                "Ape Health Concept",
+                "Elderly Care Concept",
+                "http://primatehealthintro.cornell.edu Webpage",
+                "Human and Ape Brain Comparison Human Study",
+                "Gorilla Moving Company Transport Service",
+                "PHC Proceedings Proceedings",
+                "USA222333444555 Patent",
+                "Africa Continent Transnational Region",
+                "Kenya Country"
+        );
+
+        clickAndWait(By.linkText("Home"));
+        assertTitle("VIVO");
+
+/*
+<tr>
+	<td>verifyText</td>
+	<td>//div[@id='wrapper-content']/div/ul/li[9]/span</td>
+	<td>Building</td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>//div[@id='wrapper-content']/div/ul/li[12]/span</td>
+	<td>Person</td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>//div[@id='wrapper-content']/div/ul/li[15]/span</td>
+	<td>Facility</td>
+</tr>
+*/
+    }
+}