Add search and resolve controller tests.  Cleanup HTML based on those tests.