Fix more tests for Python 2.6