Kill JUnit vol 3

Moving remaining Cypher tests away from JUnit