Added new iterator and tests