diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/AlfrescoSolrTestCaseJ4.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/AlfrescoSolrTestCaseJ4.java
index a1b7183a9..83343cbb5 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/AlfrescoSolrTestCaseJ4.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/AlfrescoSolrTestCaseJ4.java
@@ -90,6 +90,7 @@ public class AlfrescoSolrTestCaseJ4 extends SolrTestCaseJ4 implements SolrTestFi
     private static int orderTextCount = 0;
     protected static String testNodeRef;
     protected static String testBaseFolderNodeRef;
+    protected static String testfolder00NodeRef;
     private static Date orderDate = new Date();
     protected static final String TEST_NAMESPACE = "http://www.alfresco.org/test/solrtest";
 
@@ -591,6 +592,7 @@ public class AlfrescoSolrTestCaseJ4 extends SolrTestCaseJ4 implements SolrTestFi
         folder00Properties.put(ContentModel.PROP_NAME, new StringPropertyValue("Folder 0"));
         HashMap<QName, String> folder00Content = new HashMap<QName, String>();
         NodeRef folder00NodeRef = new NodeRef(new StoreRef("workspace", "SpacesStore"), createGUID());
+        testfolder00NodeRef = folder00NodeRef.toString();
         QName folder00QName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "Folder 0");
         ChildAssociationRef folder00CAR = new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, baseFolderNodeRef,
                 folder00QName, folder00NodeRef, true, 0);
diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/afts/TestsAlfrescoFTSQParserPlugin.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/afts/TestsAlfrescoFTSQParserPlugin.java
index f8e2614a5..c35ecc413 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/afts/TestsAlfrescoFTSQParserPlugin.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/afts/TestsAlfrescoFTSQParserPlugin.java
@@ -1313,6 +1313,162 @@ public class TestsAlfrescoFTSQParserPlugin extends AbstractAlfrescoSolrTests imp
          */
 
         //Auth code goes here
+        assertAQueryHasNumberOfDocs("PATH:\"//.\"", 16);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|DENIED:andy", 0);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|DENYSET:\":andy:bob:cid\"", 0);
+
+        /**
+         * Only code that deals with the plural "authorities" seems to be working at the moment
+         *
+         *       testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:andy");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:bob");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:cid");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:dave");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:eoin");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:fred");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:andy");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:gail");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:hal");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:ian");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:andy");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:jake");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:kara");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:loon");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:mike");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:noodle");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+         "{!afts}|OWNER:ood");
+         *
+         *
+         // All nodes point to ACL with ID #1. The ACL explicitly lists "pig" as a READER,
+         // however, pig does not own any nodes.
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 16, null, null, null, null, null,
+         "{!afts}|AUTHORITY:pig");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 16, null, null, null, null, null,
+         "{!afts}|READER:pig");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 0, null, null, null, null, null,
+         "{!afts}|OWNER:pig");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 0, null, null, null, null, null,
+         "{!afts}|DENIED:pig");
+         // When using the fq parameter for AUTHORITY related filter queries, anyDenyDenies is
+         // NOT supported, captured by this test case: something is DENIED, however GROUP_EVERYONE allows it.
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 16, null, null, null, null, null,
+         "{!afts}|AUTHORITY:something |AUTHORITY:GROUP_EVERYONE");
+         // "something" has no explicity READER or OWNER entries.
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 0, null, null, null, null, null,
+         "{!afts}|READER:something");
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 0, null, null, null, null, null,
+         "{!afts}|OWNER:something");
+         // "something" is DENIED to all nodes (they all use ACL #1)
+         testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 16, null, null, null, null, null,
+         "{!afts}|DENIED:something");
+         *
+         */
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"something\", \"GROUP_EVERYONE\" ], \"tenants\": [ \"\" ] }", 0);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"something\" ], \"tenants\": [ \"\" ] }", 0);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"GROUP_EVERYONE\" ], \"tenants\": [ \"\" ] }", 16);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"andy\" ], \"tenants\": [ \"\" ] }", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"andy\", \"GROUP_EVERYONE\" ], \"tenants\": [ \"\" ] }", 16);
+
+        // Even though andy, bob, cid and GROUP_EVERYONE would return docs, "something" still denied.
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"andy\", \"bob\", \"cid\", \"something\", \"GROUP_EVERYONE\" ], \"tenants\": [ \"\" ] }", 0);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"andy\", \"bob\", \"cid\" ], \"tenants\": [ \"\" ] }", 3);
+
+        // Check that generation of filter using AUTHORITY and DENIED works (no DENYSET/AUTHSET separator available)
+        //assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"strange:,-!+=;~/\", \"andy\", \"bob\" ], \"tenants\": [ \"\" ] }", 2);
+        //assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"strange:,-!+=;~/\", \"andy\", \"something\", \"GROUP_EVERYONE\" ], \"tenants\": [ \"\" ] }", 0);
+        //assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"authorities\": [ \"strange:,-!+=;~/\", \"bob\", \"GROUP_EVERYONE\" ], \"tenants\": [ \"\" ] }", 16);
+
+        // Test any allow allows.
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"anyDenyDenies\":false, \"authorities\": [ \"something\", \"GROUP_EVERYONE\" ], \"tenants\": [ \"\" ] }", 16);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"anyDenyDenies\":false, \"authorities\": [ \"andy\", \"bob\", \"cid\", \"something\" ], \"tenants\": [ \"\" ] }", 3);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"anyDenyDenies\":false, \"authorities\": [ \"something\" ], \"tenants\": [ \"\" ] }", 0);
+
+        // Check that anyDenyDenies:true actually works (code above relies on default of true)
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"anyDenyDenies\":true, \"authorities\": [ \"something\", \"GROUP_EVERYONE\" ], \"tenants\": [ \"\" ] }", 0);
+
+        // Check with AUTHORITY/DENIED rather than AUTHSET/DENYSET
+        //assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{ \"anyDenyDenies\":false, \"authorities\": [ \"strange:,-!+=;~/\", \"andy\", \"bob\", \"cid\", \"something\" ], \"tenants\": [ \"\" ] }", 3);
+/*
+    testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:andy");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:bob");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:cid");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:dave");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:eoin");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:fred");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:gail");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:hal");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:ian");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:jake");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:kara");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:loon");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:mike");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:noodle");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 1, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:ood");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 16, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:GROUP_EVERYONE");
+        testQueryByHandler(report, core, "/afts", "PATH:\"//.\"", 3, null, null, null, null, null,
+                    "{!afts}|AUTHORITY:andy |AUTHORITY:bob |AUTHORITY:cid");
+ */
+        assertAQueryHasNumberOfDocs("PATH:\"//.\"", 16);
+        /**
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":andy\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":bob\"",  1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":cid\"",  1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":dave\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":eoin\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":fred\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":gail\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":hal\"",  1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":ian\"",  1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":jake\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":kara\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":loon\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":mike\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":noodle\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":ood\"", 1);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":GROUP_EVERYONE\"", 16);
+
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":andy\" |AUTHSET:\":bob\" |AUTHSET:\":cid\"", 3);
+        assertAQueryHasNumOfDocsWithJson("PATH:\"//.\"", "{!afts}|AUTHSET:\":andy:bob:cid\"", 3);
+         **/
+
+    }
+
+    private void assertAQueryHasNumOfDocsWithJson(String query, String json, int num)
+    {
+        assertQ(areq(params("rows", "20", "qt", "/afts", "fq", "{!afts}AUTHORITY_FILTER_FROM_JSON", "q", query), json), "*[count(//doc)="+num+"]");
     }
 
     private void assertAQueryHasNumberOfDocs(String query, int num)
diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/cmis/TestAlfrescoCMISQParserPlugin.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/cmis/TestAlfrescoCMISQParserPlugin.java
index 5e64d955e..480411b2b 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/cmis/TestAlfrescoCMISQParserPlugin.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/cmis/TestAlfrescoCMISQParserPlugin.java
@@ -460,6 +460,470 @@ public class TestAlfrescoCMISQParserPlugin extends AbstractAlfrescoSolrTests imp
                         "SELECT cmis:objectTypeId FROM cmis:folder WHERE cmis:objectTypeId IS     NULL"), null),
                 "*[count(//doc)=0]");
 
+        /************** checkCmisObjecId ***********************/
+
+        /*
+         testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId =  '"
+                    + folderId + "'", 1, null, null, null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId <> '"
+                    + folderId + "'", 10, null, null, null, null, null, (String) null);
+
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId IN     ('"
+                    + folderId + "')", 1, null, null, null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId  NOT IN('"
+                    + folderId + "')", 10, null, null, null, null, null, (String) null);
+
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE IN_FOLDER('" + folderId
+                    + "')", 2, null, null, null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE IN_TREE  ('" + folderId
+                    + "')", 6, null, null, null, null, null, (String) null);
+
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId IS NOT NULL", 11, null, null, null,
+                    null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId IS     NULL", 0, null, null, null, null,
+                    null, (String) null);
+
+        // ignore folder versions
+
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId =  '"
+                    + folderId + ";1.0'", 1, null, null, null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId <> '"
+                    + folderId + ";1.0'", 10, null, null, null, null, null, (String) null);
+
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId IN     ('"
+                    + folderId + ";1.0')", 1, null, null, null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE cmis:objectId  NOT IN('"
+                    + folderId + ";1.0')", 10, null, null, null, null, null, (String) null);
+
+        // testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE IN_FOLDER('" +
+        // folderId + ";1.0')", 2, null, null, null, null, null, (String) null);
+        // testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:folder WHERE IN_TREE  ('" +
+        // folderId + ";1.0')", 6, null, null, null, null, null, (String) null);
+
+        // Docs
+
+        String id = docId;
+
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId =  '"
+                    + id + "'", 1, null, null, null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId <> '"
+                    + id + "'", 10, null, null, null, null, null, (String) null);
+
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId IN     ('" + id + "')", 1, null, null,
+                    null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId  NOT IN('" + id + "')", 10, null,
+                    null, null, null, null, (String) null);
+
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId IS NOT NULL", 11, null, null, null,
+                    null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId IS     NULL", 0, null, null, null,
+                    null, null, (String) null);
+
+        id = docId + ";1.0";
+
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId =  '"
+                    + id + "'", 1, null, null, null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis", "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId <> '"
+                    + id + "'", 10, null, null, null, null, null, (String) null);
+
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId IN     ('" + id + "')", 1, null, null,
+                    null, null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId  NOT IN('" + id + "')", 10, null,
+                    null, null, null, null, (String) null);
+
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId IS NOT NULL", 11, null, null, null,
+                    null, null, (String) null);
+        testQueryByHandler(report, core, "/cmis",
+                    "SELECT cmis:objectId FROM cmis:document WHERE cmis:objectId IS     NULL", 0, null, null, null,
+                    null, null, (String) null);
+         */
+
+        /************** checkCmisTextPredicates ***********************/
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name = 'Folder 1'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name = 'Folder 9'"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name = 'Folder 9\\''"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND NOT cmis:name = 'Folder 1'"), null),
+                "*[count(//doc)=10]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND 'Folder 1' = ANY cmis:name"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND NOT cmis:name <> 'Folder 1'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name <> 'Folder 1'"), null),
+                "*[count(//doc)=10]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name <  'Folder 1'"), null),
+                "*[count(//doc)=2]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name <= 'Folder 1'"), null),
+                "*[count(//doc)=3]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name >  'Folder 1'"), null),
+                "*[count(//doc)=8]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name >= 'Folder 1'"), null),
+                "*[count(//doc)=9]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name IN ('Folder 1', '1')"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name NOT IN ('Folder 1', 'Folder 9\\'')"), null),
+                "*[count(//doc)=9]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND ANY cmis:name IN ('Folder 1', 'Folder 9\\'')"), null),
+                "*[count(//doc)=2]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND ANY cmis:name NOT IN ('2', '3')"), null),
+                "*[count(//doc)=11]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name LIKE 'Folder 1'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name LIKE 'Fol%'"), null),
+                "*[count(//doc)=10]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name LIKE 'F_l_e_ 1'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name NOT LIKE 'F_l_e_ 1'"), null),
+                "*[count(//doc)=10]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name LIKE 'F_l_e_ %'"), null),
+                "*[count(//doc)=10]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name NOT LIKE 'F_l_e_ %'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name LIKE 'F_l_e_ _'"), null),
+                "*[count(//doc)=9]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name NOT LIKE 'F_l_e_ _'"), null),
+                "*[count(//doc)=2]");
+
+
+
+        /********* checkCmisSimpleConjunction **********************/
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name = 'Folder 1'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL AND cmis:name = 'Folder'"), null),
+                "*[count(//doc)=0]");
+
+
+
+        /*************** checkCmisSimpleDisjunction *****************/
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                "SELECT * FROM cmis:folder WHERE cmis:name = 'Folder 1'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name = 'Folder 2'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name = 'Folder 1' OR cmis:name = 'Folder 2'"), null),
+                "*[count(//doc)=2]");
+
+        /*************** checkCmisExists *********************/
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NOT NULL"), null),
+                "*[count(//doc)=11]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE cmis:name IS NULL"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:document WHERE cmis:name IS NOT NULL"), null),
+                "*[count(//doc)=11]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:document WHERE cmis:name IS NULL"), null),
+                "*[count(//doc)=0]");
+
+        /********** checkInTree ***************************/
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE IN_TREE('" + testfolder00NodeRef + "')"), null),
+                "*[count(//doc)=6]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder F WHERE IN_TREE(F, '" + testfolder00NodeRef + "')"), null),
+                "*[count(//doc)=6]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT D.*, O.* FROM cmis:document AS D JOIN cm:ownable AS O ON D.cmis:objectId = O.cmis:objectId WHERE IN_TREE(D, '"
+                                + testBaseFolderNodeRef + "')"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE IN_TREE('woof://woof/woof')"), null),
+                "*[count(//doc)=0]");
+
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:folder WHERE IN_TREE('woof://woof/woof;woof')"), null),
+                "*[count(//doc)=0]");
+
+        /************* checkLikeEscaping *******************/
+
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'Alfresco Tutorial'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'Alfresco Tutoria_'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'Alfresco T_______'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'Alfresco T______\\_'"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'Alfresco T%'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'Alfresco'"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'Alfresco%'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'Alfresco T\\%'"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'GG*GG'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE '__*__'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE '%*%'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'HH?HH'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE '__?__'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE '%?%'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'AA%'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'AA\\%'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'A%'"), null),
+                "*[count(//doc)=2]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'a%'"), null),
+                "*[count(//doc)=2]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'A\\%'"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'BB_'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'BB\\_'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'B__'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'B_\\_'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'B\\_\\_'"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'CC\\\\'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT cmis:name FROM cmis:document WHERE cmis:name     LIKE 'DD\\''"), null),
+                "*[count(//doc)=1]");
+
+
+
+        /******* checkDateFormatting  ******/
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cm:lockable L WHERE L.cm:expiryDate =  TIMESTAMP '2012-12-12T12:12:12.012Z'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cm:lockable L WHERE L.cm:expiryDate =  TIMESTAMP '2012-012-12T12:12:12.012Z'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cm:lockable L WHERE L.cm:expiryDate =  TIMESTAMP '2012-2-12T12:12:12.012Z'"), null),
+                "*[count(//doc)=0]");
+
+        /********** checkAspectJoin  **********/
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN cmis:document AS D ON D.cmis:objectId = o.cmis:objectId  ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, '\\'jumped\\'') and D.cmis:contentStreamLength <> 2"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cm:ownable"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cm:ownable where cm:owner = 'andy'"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cm:ownable where cm:owner = 'bob'"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT D.*, O.* FROM cmis:document AS D JOIN cm:ownable AS O ON D.cmis:objectId = O.cmis:objectId"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT D.*, O.*, T.* FROM cmis:document AS D JOIN cm:ownable AS O ON D.cmis:objectId = O.cmis:objectId JOIN cm:titled AS T ON T.cmis:objectId = D.cmis:objectId"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT D.*, O.* FROM cm:ownable O JOIN cmis:document D ON D.cmis:objectId = O.cmis:objectId"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT D.*, F.* FROM cmis:folder F JOIN cmis:document D ON D.cmis:objectId = F.cmis:objectId"), null),
+                "*[count(//doc)=0]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT O.*, T.* FROM cm:ownable O JOIN cm:titled T ON O.cmis:objectId = T.cmis:objectId"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "select o.*, t.* from cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "sElEcT o.*, T.* fRoM cm:ownable o JoIn cm:titled T oN o.cmis:objectId = T.cmis:objectId"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId )"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId  JOIN cmis:document AS D ON D.cmis:objectId = o.cmis:objectId  )"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN cmis:document AS D ON D.cmis:objectId = o.cmis:objectId ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, '\\'jumped\\'') and D.cmis:contentStreamLength <> 2"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "select o.*, t.* from ( cm:ownable o join cm:titled t on o.cmis:objectId = t.cmis:objectId JOIN cmis:document AS D ON D.cmis:objectId = o.cmis:objectId ) where o.cm:owner = 'andy' and t.cm:title = 'Alfresco tutorial' and CONTAINS(D, 'jumped') and D.cmis:contentStreamLength <> 2"), null),
+                "*[count(//doc)=1]");
+
+        /******* checkFTSConnectives ********/
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:document where contains('\\'two\\' OR \\'zebra\\'')"), null),
+                "*[count(//doc)=10]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:document where contains('\\'two\\' or \\'zebra\\'')"), null),
+                "*[count(//doc)=10]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:document where contains('\\'two\\' \\'zebra\\'')"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:document where contains('\\'two\\' and \\'zebra\\'')"), null),
+                "*[count(//doc)=1]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                        "SELECT * FROM cmis:document where contains('\\'two\\' or \\'zebra\\'')"), null),
+                "*[count(//doc)=10]");
+
+        assertQ(areq(params("rows", "20", "qt", "/cmis", "q",
+                "SELECT * FROM cmis:document where contains('\\'two\\'  \\'zebra\\'')"), null),
+                "*[count(//doc)=1]");
+
+
+
     }