Fix python2.6 compatibility
Add some tests