BS-8920, add tests on search term build before refactor.