Test tweak.
Python 3 support preparation.
Enabling some Python 3 support.