Fix Python 3 tests.
Enhance tests.