A few fixes to the tests on Python 2.6 and 3.x