Update EDE tests to exercise the bitmap and next ede index logic (cherry picked from commit c7b0fe5bec)
c7b0fe5bec