diff --git a/DDG4/examples/initAClick.C b/DDG4/examples/initAClick.C
index 78afdea0e2966bed6b182561c3b747304bd60c28..d88fdf01a27ab007f521cb15507622a3a2bfca80 100644
--- a/DDG4/examples/initAClick.C
+++ b/DDG4/examples/initAClick.C
@@ -35,9 +35,13 @@ string make_str(const char* data)  {
 int processCommand(const char* command, bool end_process)   {
   int status;
   // Disabling auto-parse is a hack required by a bug in ROOT
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,0,0)
   gInterpreter->SetClassAutoparsing(false);
   status = gInterpreter->ProcessLine(command);
   gInterpreter->SetClassAutoparsing(true);
+#else
+  status = gInterpreter->ProcessLine(command);
+#endif
   ::printf("+++ Status(%s) = %d\n",command,status);
   if ( end_process )  {
     gInterpreter->ProcessLine("gSystem->Exit(0)");
diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt
index 0fe04b7bd35f8a2e8cbf4c699a8dce0a7611ef91..542179435e34a5b63549b46e504d5666466c7d9c 100644
--- a/examples/CLICSiD/CMakeLists.txt
+++ b/examples/CLICSiD/CMakeLists.txt
@@ -37,7 +37,7 @@ foreach ( typ lcdd gdml vis )
   dd4hep_add_test_reg ( "test_CLICSiD_converter_${typ}" 
     COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
     EXEC_ARGS  geoConverter -compact2${typ} 
-                            -input file:${CMAKE_INSTALL_PREFIX}/examples/CLICSiD/compact/compact.xml
+                            -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/compact.xml
                             -output file:CLICSiD.${typ}
     REGEX_PASS " Handled [1-9][0-9][0-9]+ volumes" )
 endforeach()
@@ -46,7 +46,7 @@ endforeach()
 dd4hep_add_test_reg( test_CLICSiD_check_geometry
   COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
   EXEC_ARGS  python ${DD4hep_DIR}/python/checkGeometry.py
-                    --compact=file:${CMAKE_INSTALL_PREFIX}/examples/CLICSiD/compact/compact.xml
+                    --compact=file:${CMAKE_CURRENT_SOURCE_DIR}/compact/compact.xml
   # This takes too long                  --full=true --ntracks=10 --option=o --vx=0 --vy=0 --vz=0
   REGEX_PASS " Execution finished..." )
 #
@@ -54,7 +54,7 @@ dd4hep_add_test_reg( test_CLICSiD_check_geometry
 dd4hep_add_test_reg( test_CLICSiD_check_overlaps
   COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
   EXEC_ARGS  python ${DD4hep_DIR}/python/checkOverlaps.py 
-                    --compact=file:${CMAKE_INSTALL_PREFIX}/examples/CLICSiD/compact/compact.xml
+                    --compact=file:${CMAKE_CURRENT_SOURCE_DIR}/compact/compact.xml
                     --tolerance=0.1
   REGEX_PASS " Execution finished..." )
 #
@@ -66,7 +66,7 @@ if (DD4HEP_USE_GEANT4)
   foreach(script testDDPython CLICMagField CLICPhysics CLICRandom CLICSiDScan)
     dd4hep_add_test_reg( test_CLICSiD_DDG4_${script}
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
-      EXEC_ARGS  python ${CMAKE_INSTALL_PREFIX}/examples/CLICSiD/scripts/${script}.py
+      EXEC_ARGS  python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/${script}.py
       REQUIRES   DDG4 Geant4
       REGEX_PASS "TEST_PASSED"
       REGEX_FAIL "Exception;EXCEPTION;ERROR" )
@@ -76,8 +76,9 @@ if (DD4HEP_USE_GEANT4)
   dd4hep_add_test_reg( test_CLICSiD_DDG4_g4material_scan
     COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
     EXEC_ARGS  python ${DD4hep_DIR}/python/g4MaterialScan.py
-                      --compact=file:${CMAKE_INSTALL_PREFIX}/examples/CLICSiD/compact/compact.xml 
+                      --compact=file:${CMAKE_CURRENT_SOURCE_DIR}/compact/compact.xml 
                       "--position=0,0,0" "--direction=0,1,0"
+    REQUIRES   DDG4 Geant4
     REGEX_PASS " Terminate Geant4 and delete associated actions." )
   #
   # Geant4 simulations with initialization using AClick and XMl
@@ -86,7 +87,7 @@ if (DD4HEP_USE_GEANT4)
     # Build AClick from the source file
     dd4hep_add_test_reg( test_CLICSiD_DDG4_${script}_as_AClick
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh"
-      EXEC_ARGS  root.exe -b -x -n -q -l "${DD4hep_DIR}/examples/DDG4/examples/run.C(\"${CMAKE_INSTALL_PREFIX}/examples/CLICSiD/scripts/${script}\")"
+      EXEC_ARGS  root.exe -b -x -n -q -l "${DD4hep_DIR}/examples/DDG4/examples/run.C(\"${DD4hep_DIR}/examples/CLICSiD/scripts/${script}\")"
       REQUIRES   DDG4 Geant4
       REGEX_PASS "UserEvent_1      INFO  Geant4TestEventAction> calling end.event_id=9"
       REGEX_FAIL "Exception;EXCEPTION;ERROR;Error" )
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 09c1cff18746c457dd06eb37b8a26596ba8de686..3527c2263e1cb9e8c255d59199fc1af534f39de7 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -37,7 +37,7 @@ foreach (test Assemblies BoxTrafos IronCylinder LheD_tracker MagnetFields Materi
     dd4hep_add_test_reg( ClientTests_${test}_converter_${type}
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
       EXEC_ARGS  geoConverter -compact2${type}
-                              -input file:${CMAKE_INSTALL_PREFIX}/examples/ClientTests/compact/${test}.xml
+                              -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/${test}.xml
                               -output file:${test}.${type}
       REGEX_PASS " Handled [1-9][0-9]* volumes" )
   endforeach(type)
@@ -53,7 +53,7 @@ foreach (test Assemblies BoxTrafos LheD_tracker MagnetFields MiniTel SiliconBloc
   # Test material scans in [origine to 10 meters in y]
   dd4hep_add_test_reg( ClientTests_${test}_material_scan
     COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
-    EXEC_ARGS  materialScan file:${CMAKE_INSTALL_PREFIX}/examples/ClientTests/compact/${test}.xml 0 0 0 0 10000 0
+    EXEC_ARGS  materialScan file:${CMAKE_CURRENT_SOURCE_DIR}/compact/${test}.xml 0 0 0 0 10000 0
     REGEX_PASS " Average Material " )
   #
   # Geant4 material scan. From position=0,0,0 to end-of-world 
@@ -61,7 +61,7 @@ foreach (test Assemblies BoxTrafos LheD_tracker MagnetFields MiniTel SiliconBloc
     dd4hep_add_test_reg( ClientTests_${test}_g4material_scan
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
       EXEC_ARGS  python ${DD4hep_DIR}/python/g4MaterialScan.py
-                        --compact=file:${CMAKE_INSTALL_PREFIX}/examples/ClientTests/compact/${test}.xml
+                        --compact=file:${CMAKE_CURRENT_SOURCE_DIR}/compact/${test}.xml
                         "--position=0,0,0" "--direction=0,1,0"
       REGEX_PASS " Terminate Geant4 and delete associated actions." )
   endif(DD4HEP_USE_GEANT4)
@@ -75,7 +75,7 @@ foreach (test BoxTrafos IronCylinder MiniTel SiliconBlock NestedSimple )
   dd4hep_add_test_reg( ClientTests_${test}_check_geometry
     COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
     EXEC_ARGS  python ${DD4hep_DIR}/python/checkGeometry.py
-                      --compact=file:${CMAKE_INSTALL_PREFIX}/examples/ClientTests/compact/${test}.xml
+                      --compact=file:${CMAKE_CURRENT_SOURCE_DIR}/compact/${test}.xml
                       --full=true --ntracks=10
     REGEX_PASS " Execution finished..." )
   #
@@ -83,7 +83,7 @@ foreach (test BoxTrafos IronCylinder MiniTel SiliconBlock NestedSimple )
   dd4hep_add_test_reg( ClientTests_${test}_check_overlaps
     COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
     EXEC_ARGS  python ${DD4hep_DIR}/python/checkOverlaps.py 
-                      --compact=file:${CMAKE_INSTALL_PREFIX}/examples/ClientTests/compact/${test}.xml
+                      --compact=file:${CMAKE_CURRENT_SOURCE_DIR}/compact/${test}.xml
                       --tolerance=0.1
     REGEX_PASS " Execution finished..." )
 endforeach()
@@ -96,7 +96,7 @@ if (DD4HEP_USE_GEANT4)
   foreach(script Assemblies LheD_tracker MiniTel NestedDetectors )
     dd4hep_add_test_reg( ClientTests_sim_${script}
       COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
-      EXEC_ARGS  python ${CMAKE_INSTALL_PREFIX}/examples/ClientTests/scripts/${script}.py batch
+      EXEC_ARGS  python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/${script}.py batch
       REQUIRES   DDG4 Geant4
       REGEX_PASS NONE
       REGEX_FAIL "Exception;EXCEPTION;ERROR;Error" )