some unittest corrections for Py3