ENG-5616-prep Beef up index selection tests to avoid future regressions.