Test fix for py2