added new test to test file
fixed bug with similarly name iterators
updated test file output
Merge branch 'hotfix'
fixed error in handling similarly named iterators
tweaked formating of comments