changes to diffBoundsTest to make it pass an iterator
Resolved merge conflicts