Updated the doc and test to reflect the true capability of the new query engine.
Updated some tests to use the new query method.