Fix tests for Python 2.5