For ENG-5256, remove more wrapping test cases, fix the elastic index iteration now that it doesn't need wrapping. Move test case back to where it was in the suite