Neo4j test bug fixes

Fix bugs preventing tests passing with Neo4j