One more attempt to fix tests on Python 3.