Updated examples and test for search.
Merge branch 'adding-search'