sitesearch test refactoring