Update for Py2.5 compatibility
Update version in tests to 0.97