More minor fixes for Python 2.6 tests.