More tests for search
Merge pull request #405 from sparkica/more_search_tests

More tests for search