CR changes
Factor out noindex tests