Code review fixes for cross wiki search tests