Added test stubs for new Query code

Change-Id: Ib8c3c700ad7db8510dd91b8101693efc09368ffe
Merge "Added test stubs for new Query code"