Merge pull request #103 from mcomella/test_cursor

Add Cursor tests
Add Query tests.