Better support for using new Cypher test style with {EE|GDB}Helper