Test queries moved to a separate dir.
Searcher updated.