Fixed up tests for Python 2.6