Change how search test is implemented to encourage index usage when

we want to, and separate out index-sensitive code when we're disabling
their use