One more test fix.
Add multi search support