Update test_cli to account for py2/py3 differences