Fixed Py3 test errors