Another try at fixing tests for python 2.6  #21