[tests] Use Python 3 zip/Python 2 zip consistently in tests
Merge pull request #2929 from ajtulloch/izip-tests

[tests] Use Python 3 zip/Python 2 zip consistently in tests