PY3/TST: better test and py3 compat