Added Query support (closes #377)
Added powermock with mockito to dependencies
Added tests for Query support