More Py3 test fixes.