Fix to get tests to work better with python2.6