Move manual adding of items to search results.

Tweak old tests for manual adding to first do a search before continuing
as they did previously (more or less).