Simplified the search tests in hopes of speeding things up.