Fix Python 2.6 and Python 3 tests.