Updated tests for new search options.