iterator index bugfix
add more multi-entry tests