Fixed iterator tests affected by issue #20