Switch to neo4j for graph test
Merge in changes