fix & tests for set iterator
Merge branch 'dev'