Moves range iterator behavior up to the higher level.  Removes relevant tests