Fix broken test as ids were not being properly set for Neo4j.
Merge remote-tracking branch 'origin/master'