Make tests pass on Python 3.X