Refactors and same database for testings

Couldn't figure out two instances of neo4j, so we'll go with this for
now