Added default implementation for Query and GroupedQuery, both backed by tests