Fixing tests for python 2.6