Remove some TODOs
Cypher query test