Fix tests for use of search and add base class for tests