Fix some tests for python 2.6