Tweak tests to run under Python 2.6.9