More service wrapper functionality, unit test for search