diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 6cca16f..37d61b6 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -1,55 +1,56 @@
 MESSAGE(STATUS "processing RTToolbox apps")
 
 
 #extract and build ArgumentParsingLib
 include(ExternalProject)
 message(STATUS "ArgumentParsingLib will be automatically downloaded and built.")
 set(ArgumentParsingLib_SOURCE_DIR "${CMAKE_BINARY_DIR}/external/ArgumentParsingLib-src")
 set(ArgumentParsingLib_BUILD_DIR "${CMAKE_BINARY_DIR}/external/ArgumentParsingLib-build")
 set(ArgumentParsingLib_CMAKE_DIR "${CMAKE_BINARY_DIR}/external/ArgumentParsingLib-cmake")
 
 
 IF(BUILD_SHARED_LIBS OR RTTB_USE_MITK_BOOST)
   SET(ARG_BUILD_SHARED_LIBS ON)
 ELSE(BUILD_SHARED_LIBS OR RTTB_USE_MITK_BOOST)
   SET(ARG_BUILD_SHARED_LIBS OFF)
 ENDIF(BUILD_SHARED_LIBS OR RTTB_USE_MITK_BOOST)
 
 ExternalProject_Add(
 	ArgumentParsingLib
 	URL ${RTToolbox_SOURCE_DIR}/utilities/ArgumentParsingLib/ArgumentParsingLib.tar.gz
+	URL_HASH SHA1=f8b18b107af82f9e62324c21b967ab925972b8de
 	SOURCE_DIR ${ArgumentParsingLib_SOURCE_DIR}
 	BINARY_DIR ${ArgumentParsingLib_BUILD_DIR}
 	PREFIX ${ArgumentParsingLib_CMAKE_DIR}
 	INSTALL_COMMAND ""
 	UPDATE_COMMAND ""
 	CMAKE_ARGS 
 		-DBUILD_TESTS:BOOL=OFF
 		-DBoost_INCLUDE_DIR:STRING=${Boost_INCLUDE_DIR}
 		-DBUILD_SHARED_LIBS:BOOL=${ARG_BUILD_SHARED_LIBS}
 )
 
 OPTION(BUILD_App_DoseAcc "Determine if the demo application DoseAcc will be generated." ON)
 IF(BUILD_App_DoseAcc)
 	ADD_SUBDIRECTORY(DoseAcc)
 ENDIF()
 
 OPTION(BUILD_App_DoseMap "Determine if the application DoseMap will be generated." ON)
 IF(BUILD_App_DoseMap)
 	ADD_SUBDIRECTORY(DoseMap)
 ENDIF()
 
 OPTION(BUILD_App_DoseTool "Determine if the application DoseTool will be generated." ON)
 IF(BUILD_App_DoseTool)
 	ADD_SUBDIRECTORY(DoseTool)
 ENDIF()
 
 OPTION(BUILD_App_VoxelizerTool "Determine if the application VoxelizerTool will be generated." ON)
 IF(BUILD_App_VoxelizerTool)
 	ADD_SUBDIRECTORY(VoxelizerTool)
 ENDIF()
 
 OPTION(BUILD_App_BioModelCalc "Determine if the demo application BioModelCalc will be generated." ON)
 IF(BUILD_App_BioModelCalc)
 	ADD_SUBDIRECTORY(BioModelCalc)
 ENDIF()
\ No newline at end of file
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 4e48b98..ee66e97 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -1,91 +1,106 @@
 MESSAGE(STATUS "processing RTToolbox testing code")
 
 # Testing branch
 PROJECT(RTTBTesting)
 
 #-----------------------------------------------------------------------------
 # extract and build Litmus
 #-----------------------------------------------------------------------------
 
 include(ExternalProject)
 message(STATUS "Litmus will be automatically downloaded and built.")
 set(LITMUS_SOURCE_DIR "${CMAKE_BINARY_DIR}/external/Litmus-src")
 set(LITMUS_BUILD_DIR "${CMAKE_BINARY_DIR}/external/Litmus-build")
 set(LITMUS_CMAKE_DIR "${CMAKE_BINARY_DIR}/external/Litmus-cmake")
 
 IF ((BUILD_Tester_Interpolation AND BUILD_InterpolationMatchPointTransformation) OR (BUILD_Tester_IO AND BUILD_IO_ITK) OR (BUILD_Tester_Apps AND BUILD_App_DoseTool))
 	set(ENABLE_ITK "-DLIT_ENABLE_ITK_SUPPORT:BOOL=ON")
 	set(ITK_DIRECTORY "-DITK_DIR:STRING=${ITK_DIR}")
 ENDIF()
 #extract and build Litmus
 ExternalProject_Add(
 	Litmus
 	URL ${RTToolbox_SOURCE_DIR}/utilities/Litmus/Litmus.tar.gz
+	URL_HASH SHA1=ca064c95e44b84542966523b4a3814554af30b49
 	SOURCE_DIR ${LITMUS_SOURCE_DIR}
 	BINARY_DIR ${LITMUS_BUILD_DIR}
 	PREFIX ${LITMUS_CMAKE_DIR}
 	INSTALL_COMMAND ""
 	UPDATE_COMMAND "" # Don't update SVN on every build
 	CMAKE_ARGS 
 		-DBUILD_TESTING:BOOL=OFF
 		${ENABLE_ITK}
 		${ITK_DIRECTORY}
 )
 
+set(RTTBDATA_DIR "${CMAKE_BINARY_DIR}/external/RTTBData")
+set(TEST_DATA_ROOT ${RTTBDATA_DIR})
+
+#download RTTB data
+message(STATUS "RTTBdata will be automatically downloaded.")
+ExternalProject_Add(
+	RTTBData
+    SOURCE_DIR ${RTTBDATA_DIR}
+    GIT_REPOSITORY "ssh://git@phabricator.mitk.org:2222/source/rttb-data.git"
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND ""
+	INSTALL_COMMAND ""
+  )
+
 #-----------------------------------------------------------------------------
 # Configure Testing branch
 #-----------------------------------------------------------------------------
 MAKE_DIRECTORY(${RTTBTesting_BINARY_DIR}/Temporary)
 
 OPTION(BUILD_Tester_All "All testing modules will be built" OFF)
 
 MESSAGE(STATUS "Process All Tests...")
 
 #-----------------------------------------------------------------------------
 # Include sub directories
 #-----------------------------------------------------------------------------
 OPTION(BUILD_Tester_Core "build project on/off" OFF)
 OPTION(BUILD_Tester_Examples "build project on/off" OFF)
 OPTION(BUILD_Tester_Algorithms "build project on/off" OFF)
 OPTION(BUILD_Tester_Models "build project on/off" OFF)
 OPTION(BUILD_Tester_IO "build project on/off" OFF)
 OPTION(BUILD_Tester_Masks "build project on/off" OFF)
 OPTION(BUILD_Tester_Interpolation "build project on/off" OFF)
 OPTION(BUILD_Tester_Apps "build project on/off" OFF)
 OPTION(BUILD_Tester_Validation "build project on/off" OFF)
 
 IF(BUILD_Tester_All OR BUILD_Tester_Core)
 	ADD_SUBDIRECTORY(core)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Examples)
 	ADD_SUBDIRECTORY(examples)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Algorithms)
 	ADD_SUBDIRECTORY(algorithms)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Models)
 	ADD_SUBDIRECTORY(models)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_IO)
 	ADD_SUBDIRECTORY(io)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Masks)
 	ADD_SUBDIRECTORY(masks)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Interpolation)
 	ADD_SUBDIRECTORY(interpolation)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Validation)
 	ADD_SUBDIRECTORY(validation)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Apps)
 	ADD_SUBDIRECTORY(apps)
 ENDIF()
diff --git a/testing/algorithms/CMakeLists.txt b/testing/algorithms/CMakeLists.txt
index ee7f4f9..5f448a0 100644
--- a/testing/algorithms/CMakeLists.txt
+++ b/testing/algorithms/CMakeLists.txt
@@ -1,22 +1,20 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(ALGORITHMS_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbAlgorithmsTests)
 SET(ALGORITHMS_HEADER_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbAlgorithmsHeaderTest)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 ADD_TEST(DoseStatisticsTest ${ALGORITHMS_TESTS} DoseStatisticsTest)
 ADD_TEST(ArithmeticTest ${ALGORITHMS_TESTS} ArithmeticTest)
 ADD_TEST(DoseStatisticsCalculatorTest ${ALGORITHMS_TESTS} DoseStatisticsCalculatorTest "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom_heartComplex.xml" "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm")
 ADD_TEST(BinaryFunctorAccessorTest ${ALGORITHMS_TESTS} BinaryFunctorAccessorTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm")
 
-RTTB_CREATE_TEST_MODULE(rttbAlgorithms DEPENDS RTTBAlgorithms RTTBMasks RTTBBoostMask RTTBDicomIO PACKAGE_DEPENDS Boost Litmus DCMTK)
+RTTB_CREATE_TEST_MODULE(rttbAlgorithms DEPENDS RTTBAlgorithms RTTBMasks RTTBBoostMask RTTBDicomIO PACKAGE_DEPENDS Boost Litmus RTTBData DCMTK)
 
diff --git a/testing/apps/BioModelCalc/CMakeLists.txt b/testing/apps/BioModelCalc/CMakeLists.txt
index b1430f0..f6c954b 100644
--- a/testing/apps/BioModelCalc/CMakeLists.txt
+++ b/testing/apps/BioModelCalc/CMakeLists.txt
@@ -1,32 +1,30 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(BIOMODELCALC_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbBioModelCalcTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 IF(MSVC)
      ADD_DEFINITIONS(/bigobj)
 ENDIF()
 
 IF (WIN32)
 	SET(BIOMODELCALCEXE "BioModelCalc.exe")
 ELSE (WIN32)
 	SET(BIOMODELCALCEXE "./BioModelCalc")
 ENDIF (WIN32)
 
 ADD_TEST(BioModelCalcInvalidParametersTest ${BIOMODELCALC_TEST} BioModelCalcInvalidParametersTest ${BIOMODELCALCEXE})
 ADD_TEST(BioModelCalcSimpleTest ${BIOMODELCALC_TEST} BioModelCalcSimpleTest ${BIOMODELCALCEXE} "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "dicom" "LQ" "0.1 0.01"
 "${TEST_DATA_ROOT}/BioModel/Images/simpleReference.nrrd" "${TEST_DATA_ROOT}/BioModel/Images/simpleReferenceWithNFractions.nrrd")
 ADD_TEST(BioModelCalcParameterMapsTest ${BIOMODELCALC_TEST} BioModelCalcParameterMapsTest ${BIOMODELCALCEXE} "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "dicom" "LQ" 
 	"${TEST_DATA_ROOT}/Dose/ITK/constant01.nrrd ${TEST_DATA_ROOT}/Dose/ITK/constant001.nrrd" "itk" "${TEST_DATA_ROOT}/BioModel/Images/parameterMapsReference.nrrd")
 
-RTTB_CREATE_APPLICATION_TESTS(BioModelCalc DEPENDS RTTBITKIO PACKAGE_DEPENDS Litmus ITK BoostBinaries)
+RTTB_CREATE_APPLICATION_TESTS(BioModelCalc DEPENDS RTTBITKIO PACKAGE_DEPENDS Litmus ITK BoostBinaries RTTBData)
diff --git a/testing/apps/DoseAcc/CMakeLists.txt b/testing/apps/DoseAcc/CMakeLists.txt
index 2b94257..804f298 100644
--- a/testing/apps/DoseAcc/CMakeLists.txt
+++ b/testing/apps/DoseAcc/CMakeLists.txt
@@ -1,30 +1,28 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(DOSEACC_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbDoseAccTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 IF(MSVC)
      ADD_DEFINITIONS(/bigobj)
 ENDIF()
 
 IF (WIN32)
 	SET(DOSEACCEXE "DoseAcc.exe")
 ELSE (WIN32)
 	SET(DOSEACCEXE "./DoseAcc")
 ENDIF (WIN32)
 
 ADD_TEST(DoseAccInvalidParametersTest ${DOSEACC_TEST} DoseAccInvalidParametersTest ${DOSEACCEXE})
 ADD_TEST(DoseAccSimpleTest ${DOSEACC_TEST} DoseAccSimpleTest ${DOSEACCEXE} "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/ConstantFifty.dcm" "${TEST_DATA_ROOT}/Images/ITK/doseAccReference.nrrd") 
 ADD_TEST(DoseAccNeutralWeightTest ${DOSEACC_TEST} DoseAccNeutralWeightTest ${DOSEACCEXE} "${TEST_DATA_ROOT}/Dose/DICOM/ConstantFifty.dcm" "${TEST_DATA_ROOT}/Dose/ITK/constantFifty.nrrd" "${TEST_DATA_ROOT}/Dose/ITK/constant2500.nrrd") 
 
-RTTB_CREATE_APPLICATION_TESTS(DoseAcc DEPENDS RTTBITKIO PACKAGE_DEPENDS Litmus ITK BoostBinaries)
+RTTB_CREATE_APPLICATION_TESTS(DoseAcc DEPENDS RTTBITKIO PACKAGE_DEPENDS Litmus ITK BoostBinaries RTTBData)
diff --git a/testing/apps/DoseTool/CMakeLists.txt b/testing/apps/DoseTool/CMakeLists.txt
index 8c1f308..469cf4b 100644
--- a/testing/apps/DoseTool/CMakeLists.txt
+++ b/testing/apps/DoseTool/CMakeLists.txt
@@ -1,42 +1,36 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 SET(DOSETOOL_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbDoseToolTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 IF(MSVC)
      ADD_DEFINITIONS(/bigobj)
 ENDIF()
 
 IF (WIN32)
 	SET(DOSETOOLEXE "DoseTool.exe")
 ELSE (WIN32)
 	SET(DOSETOOLEXE "./DoseTool")
 ENDIF (WIN32)
 
 ADD_TEST(DoseToolInvalidParametersTest ${DOSETOOL_TEST} DoseToolInvalidParametersTest ${DOSETOOLEXE})
 ADD_TEST(DoseToolDicomDoseDicomStructTest ${DOSETOOL_TEST} DoseToolDicomDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom.xml" "${TEST_DATA_ROOT}/DVH/XML/dicompylerDVH.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/dicomComplex.xml")
 ADD_TEST(DoseToolITKDoseDicomStructTest ${DOSETOOL_TEST} DoseToolITKDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/ITK/dicompylerTestDose.mhd" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml")
 ADD_TEST(DoseToolITKDoseITKStructTest ${DOSETOOL_TEST} DoseToolITKDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/ITK/dicompylerTestDose.mhd" "${TEST_DATA_ROOT}/StructureSet/ITK/voxelizedNodes.nrrd" "Nodes"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml")
 #"${TEST_DATA_ROOT}/DoseStatistics/XML/itkitkStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkitkStructComplex.xml")
 ADD_TEST(DoseToolDicomDoseDicomStructRegexTest ${DOSETOOL_TEST} DoseToolRegexTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "dicom" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "dicom" "Nodes|Heart"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom_heart.xml")
 ADD_TEST(DoseToolDVHTest ${DOSETOOL_TEST} DoseToolDVHTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DVH/XML/dicompylerDVH.xml")
 
-RTTB_CREATE_APPLICATION_TESTS(DoseTool DEPENDS RTTBOtherIO PACKAGE_DEPENDS Litmus BoostBinaries)
-
-IF (NOT WIN32)
-	target_compile_features(rttbDoseToolTests PRIVATE cxx_auto_type cxx_nullptr cxx_override)
-ENDIF()
+RTTB_CREATE_APPLICATION_TESTS(DoseTool DEPENDS RTTBOtherIO PACKAGE_DEPENDS Litmus BoostBinaries RTTBData)
diff --git a/testing/apps/VoxelizerTool/CMakeLists.txt b/testing/apps/VoxelizerTool/CMakeLists.txt
index 2527c5e..a5bc8bf 100644
--- a/testing/apps/VoxelizerTool/CMakeLists.txt
+++ b/testing/apps/VoxelizerTool/CMakeLists.txt
@@ -1,30 +1,29 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 SET(VoxelizerTool_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbVoxelizerToolTests)
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
 SET(TEST_DATA ${RTToolbox_BINARY_DIR}/testing/apps/VoxelizerTool)
 
 IF (WIN32)
 	SET(VOXELIZERTOOL_EXE "VoxelizerTool")
 ELSE (WIN32)
 	SET(VOXELIZERTOOL_EXE "./VoxelizerTool")
 ENDIF (WIN32)
 
 SET(STRUCT_FILE "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm")
 SET(REFERENCE_FILE "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm")
 
 #-----------------------------------------------------------------------------
 ADD_TEST(VoxelizerToolIncorrectCommandsTest ${VoxelizerTool_TESTS} VoxelizerToolIncorrectCommandsTest 
 "${VOXELIZERTOOL_EXE}" ${STRUCT_FILE} "${TEST_DATA_ROOT}/StructureSet/DICOM/Wrong_Data_Struct_file.dicom" 
 ${REFERENCE_FILE} "${TEST_DATA_ROOT}/Dose/DICOM/Wrong_Reference_file.dicom" "Rueckenmark" "blabla")
 ADD_TEST(VoxelizerToolVoxelizerAllStructsTest ${VoxelizerTool_TESTS} VoxelizerToolVoxelizerAllStructsTest 
 "${VOXELIZERTOOL_EXE}" ${TEST_DATA} ${STRUCT_FILE} ${REFERENCE_FILE} )
 ADD_TEST(VoxelizerToolDifferentCommandsTest ${VoxelizerTool_TESTS} VoxelizerToolDifferentCommandsTest 
 "${VOXELIZERTOOL_EXE}" ${TEST_DATA} ${STRUCT_FILE} ${REFERENCE_FILE})
 ADD_TEST(VoxelizerToolVoxelValueTest  ${VoxelizerTool_TESTS} VoxelizerToolVoxelValue 
 "${VOXELIZERTOOL_EXE}" ${TEST_DATA} ${STRUCT_FILE} ${REFERENCE_FILE} "Leber")
 
-RTTB_CREATE_APPLICATION_TESTS(VoxelizerTool PACKAGE_DEPENDS Litmus ITK BoostBinaries)
+RTTB_CREATE_APPLICATION_TESTS(VoxelizerTool PACKAGE_DEPENDS Litmus ITK BoostBinaries RTTBData)
diff --git a/testing/core/CMakeLists.txt b/testing/core/CMakeLists.txt
index c65b1be..f94e7e1 100644
--- a/testing/core/CMakeLists.txt
+++ b/testing/core/CMakeLists.txt
@@ -1,29 +1,27 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(CORE_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbCoreTests)
 SET(CORE_HEADER_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbCoreHeaderTest)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 ADD_TEST(GeometricInfoTest ${CORE_TESTS} GeometricInfoTest)
 ADD_TEST(MaskVoxelTest ${CORE_TESTS} MaskVoxelTest)
 ADD_TEST(GenericDoseIteratorTest ${CORE_TESTS} GenericDoseIteratorTest)
 ADD_TEST(GenericMaskedDoseIteratorTest ${CORE_TESTS} GenericMaskedDoseIteratorTest)
 ADD_TEST(DVHCalculatorTest ${CORE_TESTS} DVHCalculatorTest)
 ADD_TEST(DVHTest ${CORE_TESTS} DVHTest)
 ADD_TEST(DVHSetTest ${CORE_TESTS} DVHSetTest)
 ADD_TEST(StructureTest ${CORE_TESTS} StructureTest)
 ADD_TEST(StrVectorStructureSetGeneratorTest ${CORE_TESTS} StrVectorStructureSetGeneratorTest)
 
 RTTB_CREATE_TEST_MODULE(rttbCore DEPENDS RTTBCore PACKAGE_DEPENDS Boost Litmus)
 
 
 
diff --git a/testing/examples/CMakeLists.txt b/testing/examples/CMakeLists.txt
index 69c19ed..6d29d48 100644
--- a/testing/examples/CMakeLists.txt
+++ b/testing/examples/CMakeLists.txt
@@ -1,33 +1,26 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(CORE_TEST_EXAMPLES ${EXECUTABLE_OUTPUT_PATH}/rttbExamplesTests)
-
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/Temporary)
 
 
 #-----------------------------------------------------------------------------
 ADD_TEST(RTBioModelExampleTest ${CORE_TEST_EXAMPLES} RTBioModelExampleTest
 "${TEST_DATA_ROOT}/DVH/Text/dvh_PTV_HIT.txt" "${TEST_DATA_ROOT}/DVH/Text/dvh_test_HT1.txt"
 "${TEST_DATA_ROOT}/DVH/Text/dvh_test_HT2.txt" "${TEST_DATA_ROOT}/DVH/Text/dvh_test_HT3.txt"
 "${TEST_DATA_ROOT}/DVH/Text/dvh_test_TV.txt" "${TEST_DATA_ROOT}/DVH/Text/dvh_virtuos_diff_trunk6.txt"
 "${TEST_DATA_ROOT}/DVH/Text/dvh_virtuos_diff_trunk8.txt")
 ADD_TEST(RTDoseIndexTest ${CORE_TEST_EXAMPLES} RTDoseIndexTest
 "${TEST_DATA_ROOT}/DVH/Text/dvh_test_TV.txt" "${TEST_DATA_ROOT}/DVH/Text/dvh_test_HT1.txt"
 "${TEST_DATA_ROOT}/DVH/Text/dvh_test_HT2.txt" "${TEST_DATA_ROOT}/DVH/Text/dvh_test_HT3.txt")
 ADD_TEST(RTDoseStatisticsDicomTest ${CORE_TEST_EXAMPLES} RTDoseStatisticsDicomTest
 "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo_withDoseGridScaling.dcm")
 ADD_TEST(RTDVHTest ${CORE_TEST_EXAMPLES} RTDVHTest "${TEST_DATA_ROOT}/DVH/Text/dvh_test.txt")
 ADD_TEST(RTBioModelScatterPlotExampleTest ${CORE_TEST_EXAMPLES} RTBioModelScatterPlotExampleTest
 "${TEST_DATA_ROOT}/DVH/Text/dvh_PTV_HIT.txt" "${TEST_DATA_ROOT}/DVH/Text/dvh_test_HT1.txt" "${TEST_DATA_ROOT}/DVH/Text/dvh_test_TV.txt")
 
-RTTB_CREATE_TEST_MODULE(rttbExamples DEPENDS RTTBCore RTTBAlgorithms RTTBMasks RTTBBoostMask RTTBIndices RTTBDicomIO RTTBITKIO RTTBOtherIO RTTBModels PACKAGE_DEPENDS Litmus)
-
-IF (NOT WIN32)
-	target_compile_features(rttbExamplesTests PRIVATE cxx_auto_type cxx_nullptr cxx_override)
-ENDIF()
+RTTB_CREATE_TEST_MODULE(rttbExamples DEPENDS RTTBCore RTTBAlgorithms RTTBMasks RTTBBoostMask RTTBIndices RTTBDicomIO RTTBITKIO RTTBOtherIO RTTBModels PACKAGE_DEPENDS Litmus RTTBData)
diff --git a/testing/interpolation/CMakeLists.txt b/testing/interpolation/CMakeLists.txt
index e431341..4605dd1 100644
--- a/testing/interpolation/CMakeLists.txt
+++ b/testing/interpolation/CMakeLists.txt
@@ -1,26 +1,24 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(INTERPOLATION_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbInterpolationTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 ADD_TEST(SimpleMappableDoseAccessorTest ${INTERPOLATION_TESTS} SimpleMappableDoseAccessorTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncreaseX.dcm")
 ADD_TEST(RosuMappableDoseAccessorTest ${INTERPOLATION_TESTS} RosuMappableDoseAccessorTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncreaseX.dcm")
 ADD_TEST(InterpolationTest ${INTERPOLATION_TESTS} InterpolationTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncreaseX.dcm")
 
 
 ADD_SUBDIRECTORY(InterpolationITKTransformation)
 
 IF(BUILD_InterpolationMatchPointTransformation)
 	ADD_SUBDIRECTORY(InterpolationMatchPointTransformation)
 ENDIF(BUILD_InterpolationMatchPointTransformation)
 
-RTTB_CREATE_TEST_MODULE(rttbInterpolation DEPENDS RTTBInterpolation RTTBDicomIO PACKAGE_DEPENDS Litmus)
+RTTB_CREATE_TEST_MODULE(rttbInterpolation DEPENDS RTTBInterpolation RTTBDicomIO PACKAGE_DEPENDS Litmus RTTBData)
diff --git a/testing/interpolation/InterpolationITKTransformation/CMakeLists.txt b/testing/interpolation/InterpolationITKTransformation/CMakeLists.txt
index 930ee99..b63b924 100644
--- a/testing/interpolation/InterpolationITKTransformation/CMakeLists.txt
+++ b/testing/interpolation/InterpolationITKTransformation/CMakeLists.txt
@@ -1,17 +1,14 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
-
 SET(INTERPOLATION_ITK_TRANSFORMATION_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbInterpolationITKTransformationTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 ADD_TEST(SimpleMappableDoseAccessorWithITKTest ${INTERPOLATION_ITK_TRANSFORMATION_TESTS} SimpleMappableDoseAccessorWithITKTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncreaseX.dcm")
 
-RTTB_CREATE_TEST_MODULE(rttbInterpolationITKTransformation DEPENDS RTTBInterpolation RTTBInterpolationITKTransformation RTTBDicomIO PACKAGE_DEPENDS Litmus ITK)
+RTTB_CREATE_TEST_MODULE(rttbInterpolationITKTransformation DEPENDS RTTBInterpolation RTTBInterpolationITKTransformation RTTBDicomIO PACKAGE_DEPENDS Litmus RTTBData ITK)
diff --git a/testing/interpolation/InterpolationMatchPointTransformation/CMakeLists.txt b/testing/interpolation/InterpolationMatchPointTransformation/CMakeLists.txt
index dd934a8..3a439de 100644
--- a/testing/interpolation/InterpolationMatchPointTransformation/CMakeLists.txt
+++ b/testing/interpolation/InterpolationMatchPointTransformation/CMakeLists.txt
@@ -1,18 +1,14 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
-
 SET(INTERPOLATION_MP_TRANSFORMATION_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbInterpolationMPTransformationTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
-
 #-----------------------------------------------------------------------------
 ADD_TEST(SimpleMappableDoseAccessorWithMatchPointTest ${INTERPOLATION_MP_TRANSFORMATION_TESTS} SimpleMappableDoseAccessorWithMatchPointTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncreaseX.dcm")
 
-RTTB_CREATE_TEST_MODULE(rttbInterpolationMPTransformation DEPENDS RTTBInterpolation RTTBInterpolationMatchPointTransformation RTTBDicomIO PACKAGE_DEPENDS Litmus MatchPoint)
+RTTB_CREATE_TEST_MODULE(rttbInterpolationMPTransformation DEPENDS RTTBInterpolation RTTBInterpolationMatchPointTransformation RTTBDicomIO PACKAGE_DEPENDS Litmus MatchPoint RTTBData)
 
diff --git a/testing/io/dicom/CMakeLists.txt b/testing/io/dicom/CMakeLists.txt
index f242710..91912d5 100644
--- a/testing/io/dicom/CMakeLists.txt
+++ b/testing/io/dicom/CMakeLists.txt
@@ -1,40 +1,38 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(DICOMIO_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbDicomIOTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 ADD_TEST(DicomDoseAccessorConverterTest ${DICOMIO_TEST} DicomDoseAccessorConverterTest
 "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncrease3D.dcm"
 "${TEST_DATA_ROOT}/Dose/DICOM/dose_w.dcm" ) 
 
 ADD_TEST(DicomDoseAccessorGeneratorTest ${DICOMIO_TEST} DicomDoseAccessorGeneratorTest
 "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm"
 "${TEST_DATA_ROOT}/Dose/DICOM/ConstantFifty.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncrease3D.dcm" ) 
 
 ADD_TEST(DicomFileReaderHelperTest ${DICOMIO_TEST} DicomFileReaderHelperTest
 "${TEST_DATA_ROOT}/Dose/DICOM/Helax/"
 "${TEST_DATA_ROOT}/Dose/DICOM/Helax/____mm_1_1.2.276.0.28.19.977891832855880720695789165493875543457754809556.dcm" 
 "${TEST_DATA_ROOT}/Dose/DICOM/Helax/____mm__1.2.276.0.28.19.142087956198378746376227895256244905653791675016.dcm"
 ) 
 
 
 ADD_TEST(DicomIOTest ${DICOMIO_TEST} DicomIOTest 
 "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm"
 "${TEST_DATA_ROOT}/Dose/DICOM/ConstantFifty.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncrease3D.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm"
 "${TEST_DATA_ROOT}/Dose/DICOM/InhomogeneousGrid.dcm" )
 
 ADD_TEST(DicomStructureSetGeneratorTest ${DICOMIO_TEST} DicomStructureSetGeneratorTest 
 "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm" )
 
 
-RTTB_CREATE_TEST_MODULE(rttbDicomIO DEPENDS RTTBDicomIO PACKAGE_DEPENDS Boost Litmus DCMTK)
+RTTB_CREATE_TEST_MODULE(rttbDicomIO DEPENDS RTTBDicomIO PACKAGE_DEPENDS Boost Litmus RTTBData DCMTK)
 
diff --git a/testing/io/helax/CMakeLists.txt b/testing/io/helax/CMakeLists.txt
index db732e5..f2349bf 100644
--- a/testing/io/helax/CMakeLists.txt
+++ b/testing/io/helax/CMakeLists.txt
@@ -1,25 +1,23 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(HelaxIO_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbHelaxIOTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 ADD_TEST(DicomHelaxDoseAccessorGeneratorTest ${HelaxIO_TEST} DicomHelaxDoseAccessorGeneratorTest
 "${TEST_DATA_ROOT}/Dose/DICOM/Helax/" "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm"
 "${TEST_DATA_ROOT}/Dose/DICOM/ConstantFifty.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncrease3D.dcm"
  )
 
 ADD_TEST(DicomHelaxIOTest ${HelaxIO_TEST} DicomHelaxIOTest 
 "${TEST_DATA_ROOT}/Dose/DICOM/Helax/"
  )
 
-RTTB_CREATE_TEST_MODULE(rttbHelaxIO DEPENDS RTTBHelaxIO RTTBDicomIO PACKAGE_DEPENDS BoostBinaries Litmus DCMTK)
+RTTB_CREATE_TEST_MODULE(rttbHelaxIO DEPENDS RTTBHelaxIO RTTBDicomIO PACKAGE_DEPENDS BoostBinaries Litmus RTTBData DCMTK)
 
diff --git a/testing/io/itk/CMakeLists.txt b/testing/io/itk/CMakeLists.txt
index 7bd6d6f..420bb91 100644
--- a/testing/io/itk/CMakeLists.txt
+++ b/testing/io/itk/CMakeLists.txt
@@ -1,35 +1,27 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
-
 SET(ITKIO_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbITKIOTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
-ADD_TEST(ITKDoseAccessorGeneratorTest ${ITKIO_TEST} ITKDoseAccessorGeneratorTest
-"${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd")
+ADD_TEST(ITKDoseAccessorGeneratorTest ${ITKIO_TEST} ITKDoseAccessorGeneratorTest "${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd")
 
-ADD_TEST(ITKIOTest ${ITKIO_TEST} ITKIOTest
-"${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd")
+ADD_TEST(ITKIOTest ${ITKIO_TEST} ITKIOTest "${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd")
 
-ADD_TEST(ITKDoseAccessorConverterTest ${ITKIO_TEST} ITKDoseAccessorConverterTest
- "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd" )
+ADD_TEST(ITKDoseAccessorConverterTest ${ITKIO_TEST} ITKDoseAccessorConverterTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Images/ITK/MatchPointLogoSmall.nrrd" )
 
- ADD_TEST(ITKBioModelAccessorConverterTest ${ITKIO_TEST} ITKBioModelAccessorConverterTest
- "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm")
+ ADD_TEST(ITKBioModelAccessorConverterTest ${ITKIO_TEST} ITKBioModelAccessorConverterTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm")
 
-ADD_TEST(ITKMaskAccessorGeneratorTest ${ITKIO_TEST} ITKMaskAccessorGeneratorTest
-"${TEST_DATA_ROOT}/StructureSet/ITK/Nodes.nrrd")
+ADD_TEST(ITKMaskAccessorGeneratorTest ${ITKIO_TEST} ITKMaskAccessorGeneratorTest "${TEST_DATA_ROOT}/StructureSet/ITK/Nodes.nrrd")
 
-ADD_TEST(ITKMaskAccessorConverterTest ${ITKIO_TEST} ITKMaskAccessorConverterTest "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm"
- "${TEST_DATA_ROOT}/StructureSet/ITK/Nodes.nrrd")
+ADD_TEST(ITKMaskAccessorConverterTest ${ITKIO_TEST} ITKMaskAccessorConverterTest "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm" 
+	"${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/StructureSet/ITK/Nodes.nrrd")
 
 
-RTTB_CREATE_TEST_MODULE(rttbITKIO DEPENDS RTTBITKIO RTTBDicomIO RTTBMasks RTTBBoostMask RTTBModels PACKAGE_DEPENDS Boost Litmus ITK DCMTK)
+RTTB_CREATE_TEST_MODULE(rttbITKIO DEPENDS RTTBITKIO RTTBDicomIO RTTBMasks RTTBBoostMask RTTBModels PACKAGE_DEPENDS Boost Litmus ITK DCMTK RTTBData)
 
diff --git a/testing/io/models/CMakeLists.txt b/testing/io/models/CMakeLists.txt
index 92d1531..75a0205 100644
--- a/testing/io/models/CMakeLists.txt
+++ b/testing/io/models/CMakeLists.txt
@@ -1,19 +1,16 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
-
 SET(MODELSIO_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbModelsIOTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 
 ADD_TEST(ModelsIOTest ${MODELSIO_TEST} ModelsIOTest "${TEST_DATA_ROOT}/BioModel/XML/referenceBioModeltcpleqIOTest.xml" "${TEST_DATA_ROOT}/BioModel/XML/referenceBioModelntcplkIOTest.xml" ) 
 
-RTTB_CREATE_TEST_MODULE(rttbModelsIO DEPENDS RTTBModelsIO RTTBModels PACKAGE_DEPENDS Boost Litmus)
\ No newline at end of file
+RTTB_CREATE_TEST_MODULE(rttbModelsIO DEPENDS RTTBModelsIO RTTBModels PACKAGE_DEPENDS Boost Litmus RTTBData)
\ No newline at end of file
diff --git a/testing/io/other/CMakeLists.txt b/testing/io/other/CMakeLists.txt
index f2b55f3..ec1f5ad 100644
--- a/testing/io/other/CMakeLists.txt
+++ b/testing/io/other/CMakeLists.txt
@@ -1,21 +1,19 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 SET(OTHERIO_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbOtherIOTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 ADD_TEST(DoseStatisticsIOTest ${OTHERIO_TEST} DoseStatisticsIOTest) 
 
 ADD_TEST(DVHXMLIOTest ${OTHERIO_TEST} DVHXMLIOTest "${TEST_DATA_ROOT}/DVH/Text/dvh_1.txt") 
 
 ADD_TEST(DVHTXTIOTest ${OTHERIO_TEST} DVHTXTIOTest "${TEST_DATA_ROOT}/DVH/Text/dvh_1.txt") 
 
-RTTB_CREATE_TEST_MODULE(rttbOtherIO DEPENDS RTTBOtherIO PACKAGE_DEPENDS Boost Litmus)
\ No newline at end of file
+RTTB_CREATE_TEST_MODULE(rttbOtherIO DEPENDS RTTBOtherIO PACKAGE_DEPENDS Boost Litmus RTTBData)
\ No newline at end of file
diff --git a/testing/masks/CMakeLists.txt b/testing/masks/CMakeLists.txt
index e725828..6891453 100644
--- a/testing/masks/CMakeLists.txt
+++ b/testing/masks/CMakeLists.txt
@@ -1,30 +1,28 @@
 
 MESSAGE (STATUS "Process All Mask Tests...")
 
 #-----------------------------------------------------------------------------
 # Include sub directories
 #-----------------------------------------------------------------------------
 
 ADD_SUBDIRECTORY(boost)
    
 IF(BUILD_Masks_Legacy)
 	ADD_SUBDIRECTORY(legacy)
 ENDIF()
   
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 SET(Masks_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbMasksTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 #-----------------------------------------------------------------------------
 ADD_TEST(VOIindexIdentifierTest ${Masks_TESTS} VOIindexIdentifierTest 
 "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm" )
 
 
-RTTB_CREATE_TEST_MODULE(rttbMasks DEPENDS RTTBDicomIO RTTBMasks PACKAGE_DEPENDS Boost Litmus DCMTK)
\ No newline at end of file
+RTTB_CREATE_TEST_MODULE(rttbMasks DEPENDS RTTBDicomIO RTTBMasks PACKAGE_DEPENDS Boost Litmus RTTBData DCMTK)
\ No newline at end of file
diff --git a/testing/masks/boost/CMakeLists.txt b/testing/masks/boost/CMakeLists.txt
index 5223063..d4ecd07 100644
--- a/testing/masks/boost/CMakeLists.txt
+++ b/testing/masks/boost/CMakeLists.txt
@@ -1,23 +1,21 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 
 SET(Boost_Mask_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbBoostMaskTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 ADD_TEST(BoostMaskTest ${Boost_Mask_TESTS} BoostMaskTest 
 )
 
 RTTB_CREATE_TEST_MODULE(rttbBoostMask DEPENDS RTTBDicomIO RTTBMasks RTTBBoostMask PACKAGE_DEPENDS BoostBinaries Litmus DCMTK)
 
 IF (CMAKE_COMPILER_IS_GNUCC)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
 ENDIF()
diff --git a/testing/models/CMakeLists.txt b/testing/models/CMakeLists.txt
index 24860b0..53752d8 100644
--- a/testing/models/CMakeLists.txt
+++ b/testing/models/CMakeLists.txt
@@ -1,22 +1,19 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
-
 SET(MODELS_TESTS ${EXECUTABLE_OUTPUT_PATH}/rttbModelTests)
 SET(MODELS_HEADER_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbModelsHeaderTest)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 ADD_TEST(BioModelTest ${MODELS_TESTS} BioModelTest)
 ADD_TEST(BioModelScatterPlotTest ${MODELS_TESTS} BioModelScatterPlotTest)
 ADD_TEST(DvhBasedModelsTest ${MODELS_TESTS} DvhBasedModelsTest)
 ADD_TEST(LQModelAccessorTest ${MODELS_TESTS} LQModelAccessorTest "${TEST_DATA_ROOT}/Dose/DICOM/ConstantTwo.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncreaseX.dcm")
 
-RTTB_CREATE_TEST_MODULE(rttbModel DEPENDS RTTBModels RTTBDicomIO PACKAGE_DEPENDS Boost Litmus DCMTK)
+RTTB_CREATE_TEST_MODULE(rttbModel DEPENDS RTTBModels RTTBDicomIO PACKAGE_DEPENDS Boost Litmus DCMTK RTTBData)
 
diff --git a/testing/validation/CMakeLists.txt b/testing/validation/CMakeLists.txt
index cadd9e4..52b3b1e 100644
--- a/testing/validation/CMakeLists.txt
+++ b/testing/validation/CMakeLists.txt
@@ -1,30 +1,27 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
-
 SET(CORE_TEST_VALIDATION ${EXECUTABLE_OUTPUT_PATH}/rttbValidationTests)
 
-SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
-
 SET(TEMP ${RTTBTesting_BINARY_DIR}/Temporary)
 
 
 #-----------------------------------------------------------------------------
 
 ADD_TEST(VoxelizationDVHComparisonTest ${CORE_TEST_VALIDATION} VoxelizationDVHComparisonTest
 "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm" "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncrease3D.dcm" 
 "${TEST_DATA_ROOT}/DVH/XML/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/OTBMask/" 
 "${TEST_DATA_ROOT}/DVH/XML/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/BoostMask_LEGACY/" 
 "${RTTBTesting_BINARY_DIR}/validation/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/BoostMask/")
 ADD_TEST(VoxelizationValidationTest ${CORE_TEST_VALIDATION} VoxelizationValidationTest
 "${TEST_DATA_ROOT}/StructureSet/DICOM/RS1.3.6.1.4.1.2452.6.841242143.1311652612.1170940299.4217870819.dcm"
 "${TEST_DATA_ROOT}/Dose/DICOM/LinearIncrease3D.dcm" "${TEST_DATA_ROOT}/Mask/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/BoostMask/" 
 "${TEST_DATA_ROOT}/Mask/1.3.6.1.4.1.2452.6.2037938358.1234393433.864109958.30410275/OTBMask/")
 
-RTTB_CREATE_TEST_MODULE(rttbValidation DEPENDS RTTBCore RTTBBoostMask RTTBDicomIO RTTBITKIO RTTBOtherIO PACKAGE_DEPENDS Litmus ITK)
+RTTB_CREATE_TEST_MODULE(rttbValidation DEPENDS RTTBCore RTTBBoostMask RTTBDicomIO RTTBITKIO RTTBOtherIO PACKAGE_DEPENDS Litmus ITK RTTBData)
 
 IF (CMAKE_COMPILER_IS_GNUCC)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
 ENDIF()