Changed iterators to cycle infinitely and corrected an assert statement.
Removed infinite cycle in iterator.

Promote the use of itertools.cycle(iter) instead.
Changed import names to reflect name change. Some other minor corrections.