Make current tests pass also in Python 3.