Added code coverage for basic query service using new shim
Added conjunction support