Added tests for new search/oneshotsearch.