Merge "@covers for ApiQuery stuff"