Add search and tests.