Change iteritems to items, as it was breaking tests