ZigZagIterator fixed + testcases