Fixes for code review for cross-wiki search automtated tests