diff --git a/pom.xml b/pom.xml
index a1997e7..b7f8f0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,27 +16,53 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    
+    <neo4j.version>3.5.23</neo4j.version>
+    <neo4j-apoc.version>3.5.0.15</neo4j-apoc.version>
+    <driver.version>1.7.5</driver.version>
   </properties>
 
   <dependencies>
   	<dependency>
 		<groupId>org.neo4j</groupId>
 		<artifactId>neo4j</artifactId>
-		<version>4.2.2</version>
+		<version>${neo4j.version}</version>
 	</dependency>
 	
 	<dependency>
-        <groupId>org.neo4j.driver</groupId>
-        <artifactId>neo4j-java-driver</artifactId>
-        <version>4.2.2</version>
+        <groupId>org.neo4j.procedure</groupId>
+        <artifactId>apoc</artifactId>
+        <version>${neo4j-apoc.version}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+	     <groupId>org.neo4j.driver</groupId>
+	     <artifactId>neo4j-java-driver</artifactId>
+	     <version>${driver.version}</version>
+	 </dependency>
+	<dependency>
+        <groupId>org.neo4j.test</groupId>
+        <artifactId>neo4j-harness</artifactId>
+        <version>${neo4j.version}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.neo4j</groupId>
+        <artifactId>neo4j-kernel</artifactId>
+        <version>${neo4j.version}</version>
     </dependency>
+<!-- 	<dependency> -->
+<!--         <groupId>org.neo4j.driver</groupId> -->
+<!--         <artifactId>neo4j-java-driver</artifactId> -->
+<!--         <version>4.2.2</version> -->
+<!--     </dependency> -->
 	
 	<!-- https://mvnrepository.com/artifact/org.neo4j/neo4j-ast -->
-	<dependency>
-	    <groupId>org.neo4j</groupId>
-	    <artifactId>neo4j-ast</artifactId>
-	    <version>4.2.2</version>
-	</dependency>
+<!-- 	<dependency> -->
+<!-- 	    <groupId>org.neo4j</groupId> -->
+<!-- 	    <artifactId>neo4j-ast</artifactId> -->
+<!-- 	    <version>4.2.2</version> -->
+<!-- 	</dependency> -->
   	
     <dependency>
       <groupId>junit</groupId>
diff --git a/src/test/java/com/KRacR/s2c/SparqlToCypherTest.java b/src/test/java/com/KRacR/s2c/SparqlToCypherTest.java
index 70dbf8b..0ca6b27 100644
--- a/src/test/java/com/KRacR/s2c/SparqlToCypherTest.java
+++ b/src/test/java/com/KRacR/s2c/SparqlToCypherTest.java
@@ -1,8 +1,10 @@
 package test.java.com.KRacR.s2c;
 
+//import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.neo4j.graphdb.Label.label;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -14,11 +16,25 @@
 import java.util.List;
 
 import org.junit.Test;
+import org.neo4j.driver.v1.Config;
+import org.neo4j.driver.v1.Driver;
+import org.neo4j.driver.v1.GraphDatabase;
+import org.neo4j.driver.v1.Session;
+import org.neo4j.driver.v1.StatementResult;
+import org.neo4j.driver.v1.Value;
+import org.neo4j.driver.v1.Values;
+import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.Transaction;
+import org.neo4j.harness.ServerControls;
+import org.neo4j.harness.TestServerBuilders;
 
 /**
  * Unit test for Sparql to Cypher
  */
 public class SparqlToCypherTest{
+	private ServerControls embeddedDatabaseServer;
+	private static final Config driverConfig = Config.build().withoutEncryption().toConfig();
+	
 	private void run_TTL_Automated_Test(String folder) {
 		Path rdf_path = Paths.get(folder, "rdf.ttl");
 		Path path_to_pg_bench = Paths.get("lib/RDFtoPGConverter.jar");
@@ -55,8 +71,21 @@ public boolean accept(File file) {
 		};
 
 		File[] files = f.listFiles(directoryFilter);
+		setupNeo4jServer();
 		for (File folder : files) {
+			delete_all_from_database();
 			run_TTL_Automated_Test(folder.getCanonicalPath());
 		}
     }
+
+	private void delete_all_from_database() {
+		try (Driver driver = GraphDatabase.driver(embeddedDatabaseServer.boltURI(), driverConfig);
+				Session session = driver.session()) {
+			session.run("match (n) detach delete n;");
+		}
+	}
+
+	private void setupNeo4jServer() {
+		this.embeddedDatabaseServer = TestServerBuilders.newInProcessBuilder().withProcedure(apoc.load.LoadJson.class).newServer();
+	}
 }