Fixed error with iterator.  Added unit test for iterator