some fixes
fix tests for new search