@covers for ApiQuery stuff

Change-Id: Id8a89abd545d8e2a95b1d246776049b9c888e53c
Merge "@covers for ApiQuery stuff"