Add Query tests.
Merge pull request #106 from mcomella/test_query

Add Query tests