Added tests for consolidated queries