Refactor Cypher query grammar to sequence of clauses
Split test covering multiple Cypher versions