Fixing tests that fail under Python 2.6.