Add check to see if we can test with Query class

Change-Id: Ib14e970c420a464866c242a84eec72e4832d4b98
Merge "Add check to see if we can test with Query class"