fix test suite
Fix Python 2.6 support