Increase test coverage of search term extraction (bug 1059686)

View the individual commits for cleaner diffs.