Index: src/Tests/Makefile
===================================================================
--- src/Tests/Makefile	(revision 6ba0659196615bb32989214ed6976c448620b387)
+++ src/Tests/Makefile	(revision e04ef3a33b7695190c509b61da6fe0cfcf46b265)
@@ -1,3 +1,3 @@
-CFA ?= ../cfa-cpp
+CFA ?= ../driver/cfa-cpp
 CFAOPT ?= -a
 OUTPUT ?= Output
@@ -32,5 +32,5 @@
 
 ${OUTPUTDIR} :
-	mkdir $@
+	mkdir -p $@
 
 # remove the expected results directories to generate new ones from the current output