Down to four testsuite errors on PY3