Update iterator to pass all ranges tests