WIP
WIP
Make all test pass on Python 3.