DATAGRAPH-384 Upgrade to Neo4j 2.0 - fixing tests