Fixes due to code review for intra-wiki search tests