Replace iteritems with items() for py3k support (not performance issue as it's a small dict in test code)