Python 3 support for iteritems
Fixing tests for py26