Fixing unit tests on python 2.6