(Issue 814) Added tests from general search scoping