More tests for search

Added more tests covering issue #383