Another attempt at getting the test run with Python 3.