Attempting to fix tests on python 2.6