Tweak, turning off non-index tests temporarily.