Fix issue #7 by adding extra tests.
Merge pull request #24 from mandel-macaque/add-search-tests

Fix issue #7 by adding extra tests.