ENG-5616 Correct and beef up index selection tests