Test fixes for Python 2.6