Update unit tests
Update docstring of unimplemented API
Use six for python3/2 compatibility
Add testcase of query()