Make all tests pass under Python 3.