Fix iteritems.

Hi,

I don't know how to fix the only failing test. But from the comment:

        #TODO: Make this test runs correctly

I think it is meant to fail :-)

Regards,
Norberto

PS: oops! I think I made a mistake. I don't want to "pull request" 2 commits. Only 1, the fix for iteritems.