More tox cases
Fix Python 2.5 compatibility