Fix tests for Python 2.6.
Attempt to get Travis-CI to make more progress on running tests under Python 3.