fix tests for travis, py2.5