Support for iterators
Add missing dependency
Fix test