Add more tests
Add support for python 2.6