[PATCH 1/1] backport iutil_test.py updates from master