Add description to search results
Tidy up tests