2.1 cypher documentation test cleanup