diff --git a/CMake/OTBStandaloneModuleMacros.cmake b/CMake/OTBStandaloneModuleMacros.cmake
index eba486a97b94af1c24de3accb72606069722efb4..921e0e358ce24c6598d75a5dee78dbe71fcb876a 100644
--- a/CMake/OTBStandaloneModuleMacros.cmake
+++ b/CMake/OTBStandaloneModuleMacros.cmake
@@ -258,7 +258,6 @@ macro(otb_module_impl)
   set(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
   set(INPUTDATA      ${OTB_DATA_ROOT}/Input)
   set(TEMP           ${CMAKE_BINARY_DIR}/Testing/Temporary)
-  set(EXAMPLEDATA    ${OTB_DATA_ROOT}/Examples)
   set(OTBAPP_BASELINE       ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Images)
   set(OTBAPP_BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Files)
   
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b9556a54bdb16119bed7bc542477a022faa490a..10a0b012afc5a8dff90bb3591500d4fc7ca64a45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -302,7 +302,6 @@ set(BASELINE       ${OTB_DATA_ROOT}/Baseline/OTB/Images)
 set(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
 set(INPUTDATA      ${OTB_DATA_ROOT}/Input)
 set(TEMP           ${OTB_BINARY_DIR}/Testing/Temporary)
-set(EXAMPLEDATA    ${OTB_DATA_ROOT}/Examples)
 set(OTBAPP_BASELINE       ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Images)
 set(OTBAPP_BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Files)
 
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 7dc6d5c3006880c734628a294bf18d210ac01ff8..75e3648190c1a6dd758a9dafa558e000416689b9 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -89,7 +89,6 @@ if(PROJECT_NAME STREQUAL "OTBExamples")
   set(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files)
   set(INPUTDATA      ${OTB_DATA_ROOT}/Input)
   set(TEMP           ${CMAKE_BINARY_DIR}/Testing/Temporary)
-  set(EXAMPLEDATA    ${OTB_DATA_ROOT}/Examples)
   set(OTBAPP_BASELINE       ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Images)
   set(OTBAPP_BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Files)
 
diff --git a/Modules/Applications/AppImageUtils/test/CMakeLists.txt b/Modules/Applications/AppImageUtils/test/CMakeLists.txt
index 186d4ac477453fc31685a8b5624ea6114b0c3e8e..338dd1534de622776d81e2b7484ef2dca64f7592 100644
--- a/Modules/Applications/AppImageUtils/test/CMakeLists.txt
+++ b/Modules/Applications/AppImageUtils/test/CMakeLists.txt
@@ -165,15 +165,15 @@ otb_test_application(NAME  apTvUtRescaleTest
 #----------- TileFusion TESTS ----------------
 otb_test_application(NAME apTvUtTileFusion
                      APP TileFusion
-                     OPTIONS -il ${EXAMPLEDATA}/Scene_R1C1.png
-                                 ${EXAMPLEDATA}/Scene_R1C2.png
-                                 ${EXAMPLEDATA}/Scene_R2C1.png
-                                 ${EXAMPLEDATA}/Scene_R2C2.png
+                     OPTIONS -il ${INPUTDATA}/Scene_R1C1.png
+                                 ${INPUTDATA}/Scene_R1C2.png
+                                 ${INPUTDATA}/Scene_R2C1.png
+                                 ${INPUTDATA}/Scene_R2C2.png
                              -cols 2
                              -rows 2
                              -out ${TEMP}/apTvUtTileFusion.png uint8
                      VALID   --compare-image ${NOTOL}
-                             ${EXAMPLEDATA}/Scene.png
+                             ${INPUTDATA}/Scene.png
                            ${TEMP}/apTvUtTileFusion.png)
 
 
@@ -334,7 +334,7 @@ otb_test_application(NAME apTvUtColorMappingColorToLabelOptimalLUTQB
 
 otb_test_application(NAME apTvUtColorMappingLabelToColorCustomLUTQB
                      APP ColorMapping
-                     OPTIONS -in ${EXAMPLEDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
+                     OPTIONS -in ${INPUTDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
                              -method custom
                              -method.custom.lut ${INPUTDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI_PNG_ColorTable.txt
                              -out ${TEMP}/apTvUtColorMappingLabelToColorCustomLUTQB.tif uint8
@@ -355,7 +355,7 @@ otb_test_application(NAME apTvUtColorMappingColorToLabelOptimalLUT
 
 otb_test_application(NAME apTvUtColorMappingLabelToColorOptimalLUTQB
                      APP ColorMapping
-                     OPTIONS -in ${EXAMPLEDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
+                     OPTIONS -in ${INPUTDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
                              -method optimal
                              -out ${TEMP}/apTvUtColorMappingLabelToColorOptimalLUTQB.tif uint8
                      VALID   --compare-image ${NOTOL}
@@ -371,7 +371,7 @@ otb_test_application(NAME apTvUtColorMappingColorToLabelCustomLUTQB
                              -method.custom.lut ${INPUTDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI_PNG_ColorTable.txt
                              -out ${TEMP}/apTvUtColorMappingColorToLabelCustomLUTQB.tif uint8
                      VALID   --compare-image ${NOTOL}
-                	         ${EXAMPLEDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
+                	         ${INPUTDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
                 	         ${TEMP}/apTvUtColorMappingColorToLabelCustomLUTQB.tif)
 
 otb_test_application(NAME apTvUtColorMappingLabelToColorContinuousLUTJet
@@ -388,9 +388,9 @@ otb_test_application(NAME apTvUtColorMappingLabelToColorContinuousLUTJet
 
 otb_test_application(NAME apTvUtColorMappingLabelToColorSupportImage
                      APP ColorMapping
-                     OPTIONS -in ${EXAMPLEDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
+                     OPTIONS -in ${INPUTDATA}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
                              -method image
-                             -method.image.in ${EXAMPLEDATA}/ROI_QB_MUL_1.tif
+                             -method.image.in ${INPUTDATA}/ROI_QB_MUL_1.tif
                              -out ${TEMP}/apTvUtColorMappingLabelToColorSupportImage.tif uint8
                      VALID   --compare-image ${NOTOL}
                              ${BASELINE}/apTvUtColorMappingLabelToColorSupportImage.tif
diff --git a/Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt b/Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt
index fc477b8e75fee4171dfa6f8520cf69af69926dc2..b6b86d88ddd888ab41637108d40e6c4cd73e42c5 100644
--- a/Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt
+++ b/Modules/Applications/AppOpticalCalibration/test/CMakeLists.txt
@@ -78,7 +78,7 @@ otb_test_application(NAME apTvRaOpticalCalibration_Spot5
 otb_test_application(NAME apTvRaOpticalCalibration_UnknownSensor
                      APP  OpticalCalibration
                      OPTIONS 
-           -in ${EXAMPLEDATA}/Romania_Extract.tif
+           -in ${INPUTDATA}/Romania_Extract.tif
            -out ${TEMP}/apTvRaOpticalCalibration_Spot4_UnknownSensor_test.tif
            -level toc
            -acqui.gainbias ${INPUTDATA}/apTvRaOpticalCalibrationUnknownSensorGainsBiases2.txt
diff --git a/Modules/Applications/AppProjection/test/CMakeLists.txt b/Modules/Applications/AppProjection/test/CMakeLists.txt
index 91172aa199fbee16dc2d8a8769a9b4fc8c485ec0..84697c966d1cd118cea0e4def8a9d4493790977b 100644
--- a/Modules/Applications/AppProjection/test/CMakeLists.txt
+++ b/Modules/Applications/AppProjection/test/CMakeLists.txt
@@ -169,7 +169,7 @@ otb_test_application(NAME  apTvPrGenerateRPCSensorModel
 
 otb_test_application(NAME apTuDmGridBasedImageResamplingLeftTest
                      APP  GridBasedImageResampling
-                     OPTIONS -io.in ${EXAMPLEDATA}/sensor_stereo_left.tif
+                     OPTIONS -io.in ${INPUTDATA}/sensor_stereo_left.tif
                              -io.out ${TEMP}/apTvDmGridBasedImageResamplingLeftTest.tif
                              -grid.in ${INPUTDATA}/sensor_stereo_rectif_left.tif
                              -out.sizex 158
@@ -179,7 +179,7 @@ otb_test_application(NAME apTuDmGridBasedImageResamplingLeftTest
 
 otb_test_application(NAME apTuDmGridBasedImageResamplingRightTest
                      APP  GridBasedImageResampling
-                     OPTIONS -io.in ${EXAMPLEDATA}/sensor_stereo_right.tif
+                     OPTIONS -io.in ${INPUTDATA}/sensor_stereo_right.tif
                              -io.out ${TEMP}/apTvDmGridBasedImageResamplingRightTest.tif
                              -grid.in ${INPUTDATA}/sensor_stereo_rectif_right.tif
                              -out.sizex 158
@@ -314,7 +314,7 @@ otb_test_application(NAME apTvPrRigidTransformResample
 #----------- ImageEnvelope TESTS ----------------
 otb_test_application(NAME apTvPrImageEnvelopeTest
                      APP ImageEnvelope
-                     OPTIONS -in ${EXAMPLEDATA}/sensor_stereo_left.tif
+                     OPTIONS -in ${INPUTDATA}/sensor_stereo_left.tif
                              -out ${TEMP}/apTvPrImageEnvelopeTest.shp
                      VALID   --compare-ogr ${NOTOL}
                         ${BASELINE_FILES}/apTvPrImageEnvelopeTest.shp
diff --git a/Modules/Applications/AppSegmentation/test/CMakeLists.txt b/Modules/Applications/AppSegmentation/test/CMakeLists.txt
index c607f147d060d53316ed2550786f54506b824270..c658016633dbf40ec6ee79202dc960166d7d6af5 100644
--- a/Modules/Applications/AppSegmentation/test/CMakeLists.txt
+++ b/Modules/Applications/AppSegmentation/test/CMakeLists.txt
@@ -174,7 +174,7 @@ otb_test_application(NAME  apTvCcConnectedComponentSegmentatioNoMask
 #----------- MeanShiftSmoothing TESTS ----------------
 otb_test_application(NAME     apTvLSMS1MeanShiftSmoothingNoModeSearch
                      APP      MeanShiftSmoothing
-                     OPTIONS  -in ${EXAMPLEDATA}/QB_1_ortho.tif
+                     OPTIONS  -in ${INPUTDATA}/QB_1_ortho.tif
                               -fout ${TEMP}/apTvLSMS1_filtered_range.tif
                               -foutpos ${TEMP}/apTvLSMS1_filtered_spatial.tif
                               -ranger 30
@@ -267,7 +267,7 @@ set_property(TEST apTvSmallRegionsMerging PROPERTY DEPENDS apTvLSMS2Segmentation
 #----------- LSMSVectorization TESTS ----------------
 otb_test_application(NAME     apTvLSMS4Vectorization_SmallMerged
                      APP      LSMSVectorization
-                     OPTIONS  -in ${EXAMPLEDATA}/QB_1_ortho.tif
+                     OPTIONS  -in ${INPUTDATA}/QB_1_ortho.tif
                               -inseg  ${BASELINE}/apTvLSMS3_Segmentation_SmallMerged.tif
                               -out ${TEMP}/apTvLSMS4_Segmentation_SmallMerged.shp
                               -tilesizex 100
@@ -281,7 +281,7 @@ set_property(TEST apTvLSMS4Vectorization_SmallMerged PROPERTY DEPENDS apTvLSMS3S
 
 otb_test_application(NAME     apTvLSMS4Vectorization_NoSmall
                      APP      LSMSVectorization
-                     OPTIONS  -in ${EXAMPLEDATA}/QB_1_ortho.tif
+                     OPTIONS  -in ${INPUTDATA}/QB_1_ortho.tif
                               -inseg  ${TEMP}/apTvLSMS2_Segmentation_NoSmall.tif
                               -out ${TEMP}/apTvLSMS4_Segmentation_NoSmall.shp
                               -tilesizex 100
@@ -310,7 +310,7 @@ otb_test_application(NAME     apTvSeHooverCompareSegmentationTest
 #----------- LargeScaleMeanShift TESTS ----------------
 otb_test_application(NAME     apTvSeLargeScaleMeanShiftTest
                      APP      LargeScaleMeanShift
-                     OPTIONS  -in ${EXAMPLEDATA}/QB_1_ortho.tif
+                     OPTIONS  -in ${INPUTDATA}/QB_1_ortho.tif
                               -spatialr 3
                               -ranger 80
                               -minsize 16
diff --git a/Modules/Applications/AppStereo/test/CMakeLists.txt b/Modules/Applications/AppStereo/test/CMakeLists.txt
index fbdd2ae4905b374afa7cc3460d61d9f47d852c1f..6d090b5ecf8923d6b4be91326dd2ecbfbfc3fcf2 100644
--- a/Modules/Applications/AppStereo/test/CMakeLists.txt
+++ b/Modules/Applications/AppStereo/test/CMakeLists.txt
@@ -71,8 +71,8 @@ otb_module_test()
 otb_test_application(NAME apTvDmStereoRectificationGridGeneratorTest
                      APP  StereoRectificationGridGenerator
 
-                     OPTIONS -io.inleft ${EXAMPLEDATA}/sensor_stereo_left.tif
-                             -io.inright ${EXAMPLEDATA}/sensor_stereo_right.tif
+                     OPTIONS -io.inleft ${INPUTDATA}/sensor_stereo_left.tif
+                             -io.inright ${INPUTDATA}/sensor_stereo_right.tif
                              -io.outleft ${TEMP}/apTvDmStereoRectificationGridGeneratorLeftTest.tif
                              -io.outright ${TEMP}/apTvDmStereoRectificationGridGeneratorRightTest.tif
                              -inverse.outleft  ${TEMP}/apTvDmStereoRectificationGridGeneratorInverseLeftTest.tif
@@ -144,8 +144,8 @@ otb_test_application(NAME apTvDmFineRegistrationWithWarpingTest
 #otb_test_application(NAME apTvDmDisparityMapToElevationMap
                      #APP  DisparityMapToElevationMap
                      #OPTIONS -io.in ${INPUTDATA}/sensor_stereo_blockmatching_output.tif
-                             #-io.left ${EXAMPLEDATA}/sensor_stereo_left.tif
-                             #-io.right ${EXAMPLEDATA}/sensor_stereo_right.tif
+                             #-io.left ${INPUTDATA}/sensor_stereo_left.tif
+                             #-io.right ${INPUTDATA}/sensor_stereo_right.tif
                              #-io.lgrid ${INPUTDATA}/sensor_stereo_rectif_left.tif
                              #-io.rgrid ${INPUTDATA}/sensor_stereo_rectif_right.tif
                              #-io.out ${TEMP}/apTvDmDisparityMapToElevationMapTest.tif
diff --git a/Modules/Core/Metadata/test/CMakeLists.txt b/Modules/Core/Metadata/test/CMakeLists.txt
index 3288600998d25dbc434ffbff7f283410d736be86..8bd35348c4a4cd6477e72a703a26c2a63c280db1 100644
--- a/Modules/Core/Metadata/test/CMakeLists.txt
+++ b/Modules/Core/Metadata/test/CMakeLists.txt
@@ -284,7 +284,7 @@ otb_add_test(NAME ioTvImageMetadataInterfaceTest COMMAND otbMetadataTestDriver
   --compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioTvImageMetadataInterface.txt
   ${TEMP}/ioTvImageMetadataInterface.txt
   otbImageMetadataInterfaceTest2
-  ${EXAMPLEDATA}/qb_RoadExtract.tif
+  ${INPUTDATA}/qb_RoadExtract.tif
   ${TEMP}/ioTvImageMetadataInterface.txt
   )
 
diff --git a/Modules/Filtering/Statistics/test/CMakeLists.txt b/Modules/Filtering/Statistics/test/CMakeLists.txt
index 66c7bc0c662722577e05c08a18e80e80ec009cfb..d10752646d4cf1b3681162187f89e0c3326885ba 100644
--- a/Modules/Filtering/Statistics/test/CMakeLists.txt
+++ b/Modules/Filtering/Statistics/test/CMakeLists.txt
@@ -332,8 +332,8 @@ otb_add_test(NAME leTvListSampleGenerator4 COMMAND otbStatisticsTestDriver
   ${BASELINE_FILES}/leTvListSampleGeneratorValidation4.txt
   ${TEMP}/leTvListSampleGeneratorValidation4.txt
   otbListSampleGenerator
-  ${EXAMPLEDATA}/qb_RoadExtract.tif
-  ${EXAMPLEDATA}/qb_RoadExtract_classification.shp
+  ${INPUTDATA}/qb_RoadExtract.tif
+  ${INPUTDATA}/qb_RoadExtract_classification.shp
   ${TEMP}/leTvListSampleGenerator4.txt
   ${TEMP}/leTvListSampleGeneratorValidation4.txt
   -1
@@ -349,8 +349,8 @@ otb_add_test(NAME leTvListSampleGenerator5 COMMAND otbStatisticsTestDriver
   ${BASELINE_FILES}/leTvListSampleGeneratorValidation5.txt
   ${TEMP}/leTvListSampleGeneratorValidation5.txt
   otbListSampleGenerator
-  ${EXAMPLEDATA}/qb_RoadExtract.tif
-  ${EXAMPLEDATA}/qb_RoadExtract_classification.shp
+  ${INPUTDATA}/qb_RoadExtract.tif
+  ${INPUTDATA}/qb_RoadExtract_classification.shp
   ${TEMP}/leTvListSampleGenerator5.txt
   ${TEMP}/leTvListSampleGeneratorValidation5.txt
   8000
@@ -366,8 +366,8 @@ otb_add_test(NAME leTvListSampleGenerator6 COMMAND otbStatisticsTestDriver
   ${BASELINE_FILES}/leTvListSampleGeneratorValidation6.txt
   ${TEMP}/leTvListSampleGeneratorValidation6.txt
   otbListSampleGenerator
-  ${EXAMPLEDATA}/qb_RoadExtract.tif
-  ${EXAMPLEDATA}/qb_RoadExtract_classification.shp
+  ${INPUTDATA}/qb_RoadExtract.tif
+  ${INPUTDATA}/qb_RoadExtract_classification.shp
   ${TEMP}/leTvListSampleGenerator6.txt
   ${TEMP}/leTvListSampleGeneratorValidation6.txt
   15000
@@ -383,8 +383,8 @@ otb_add_test(NAME leTvListSampleGenerator1 COMMAND otbStatisticsTestDriver
   ${BASELINE_FILES}/leTvListSampleGeneratorValidation1.txt
   ${TEMP}/leTvListSampleGeneratorValidation1.txt
   otbListSampleGenerator
-  ${EXAMPLEDATA}/qb_RoadExtract.tif
-  ${EXAMPLEDATA}/qb_RoadExtract_classification.shp
+  ${INPUTDATA}/qb_RoadExtract.tif
+  ${INPUTDATA}/qb_RoadExtract_classification.shp
   ${TEMP}/leTvListSampleGenerator1.txt
   ${TEMP}/leTvListSampleGeneratorValidation1.txt
   -1
@@ -400,8 +400,8 @@ otb_add_test(NAME leTvListSampleGenerator2 COMMAND otbStatisticsTestDriver
   ${BASELINE_FILES}/leTvListSampleGeneratorValidation2.txt
   ${TEMP}/leTvListSampleGeneratorValidation2.txt
   otbListSampleGenerator
-  ${EXAMPLEDATA}/qb_RoadExtract.tif
-  ${EXAMPLEDATA}/qb_RoadExtract_classification.shp
+  ${INPUTDATA}/qb_RoadExtract.tif
+  ${INPUTDATA}/qb_RoadExtract_classification.shp
   ${TEMP}/leTvListSampleGenerator2.txt
   ${TEMP}/leTvListSampleGeneratorValidation2.txt
   -1
@@ -417,8 +417,8 @@ otb_add_test(NAME leTvListSampleGenerator3 COMMAND otbStatisticsTestDriver
   ${BASELINE_FILES}/leTvListSampleGeneratorValidation3.txt
   ${TEMP}/leTvListSampleGeneratorValidation3.txt
   otbListSampleGenerator
-  ${EXAMPLEDATA}/qb_RoadExtract.tif
-  ${EXAMPLEDATA}/qb_RoadExtract_classification.shp
+  ${INPUTDATA}/qb_RoadExtract.tif
+  ${INPUTDATA}/qb_RoadExtract_classification.shp
   ${TEMP}/leTvListSampleGenerator3.txt
   ${TEMP}/leTvListSampleGeneratorValidation3.txt
   100
diff --git a/Modules/IO/Carto/test/CMakeLists.txt b/Modules/IO/Carto/test/CMakeLists.txt
index ca67be3db3845ae87223df3d227d7ebb4e6a921c..3971701156c1195a5a260074033282d85e5612e8 100644
--- a/Modules/IO/Carto/test/CMakeLists.txt
+++ b/Modules/IO/Carto/test/CMakeLists.txt
@@ -41,7 +41,7 @@ otb_add_test(NAME ioTvImageToOSMVectorDataGenerator COMMAND otbCartoTestDriver
   ${BASELINE_FILES}/ioTvImageToOSMVectorDataGenerator_highway_motorway.shp
   ${TEMP}/ioTvImageToOSMVectorDataGenerator_highway_motorway.shp
   otbImageToOSMVectorDataGenerator
-  ${EXAMPLEDATA}/qb_RoadExtract.tif
+  ${INPUTDATA}/qb_RoadExtract.tif
   ${INPUTDATA}/qb_road.osm
   ${TEMP}/ioTvImageToOSMVectorDataGenerator_highway_motorway.shp
   highvay,motorway
diff --git a/Modules/IO/ImageIO/test/CMakeLists.txt b/Modules/IO/ImageIO/test/CMakeLists.txt
index 7bbae6bd892504d3012985efcd7b12173bcac208..2a8c8d1e7e05ae9cde9d01435f34d42248c48108 100644
--- a/Modules/IO/ImageIO/test/CMakeLists.txt
+++ b/Modules/IO/ImageIO/test/CMakeLists.txt
@@ -624,7 +624,7 @@ otb_add_test(NAME ioTvImageSeriesFileReader COMMAND otbImageIOTestDriver
   ${BASELINE}/ioTvImageSeries-1.png
   ${TEMP}/ioTvImageSeries-1.png
   otbImageSeriesFileReader
-  ${EXAMPLEDATA}/GomaAvantApres
+  ${INPUTDATA}/GomaAvantApres
   ${TEMP}/ioTvImageSeries.png
   )
 
diff --git a/Modules/Registration/DisparityMap/test/CMakeLists.txt b/Modules/Registration/DisparityMap/test/CMakeLists.txt
index 53776f90dbce2a58f28eb1b22827c7ffacd1e8b7..5d91ed29ad30e0739b781909a884a959aa25d7e4 100644
--- a/Modules/Registration/DisparityMap/test/CMakeLists.txt
+++ b/Modules/Registration/DisparityMap/test/CMakeLists.txt
@@ -58,8 +58,8 @@ otb_add_test(NAME dmTvDisparityMapEstimationMethod COMMAND otbDisparityMapTestDr
   #${TEMP}/dmTvDisparityMapToDEMFilterOutput.tif
   #otbDisparityMapToDEMFilter
   #${INPUTDATA}/sensor_stereo_blockmatching_output.tif
-  #${EXAMPLEDATA}/sensor_stereo_left.tif
-  #${EXAMPLEDATA}/sensor_stereo_right.tif
+  #${INPUTDATA}/sensor_stereo_left.tif
+  #${INPUTDATA}/sensor_stereo_right.tif
   #${INPUTDATA}/sensor_stereo_rectif_left.tif
   #${INPUTDATA}/sensor_stereo_rectif_right.tif
   #${TEMP}/dmTvDisparityMapToDEMFilterOutput.tif
@@ -89,7 +89,7 @@ otb_add_test(NAME dmTvDisparityTranslateFilter COMMAND otbDisparityMapTestDriver
   ${INPUTDATA}/sensor_stereo_blockmatching_output.tif
   ${INPUTDATA}/sensor_stereo_rectif_inv_left.tif
   ${INPUTDATA}/sensor_stereo_rectif_right.tif
-  ${EXAMPLEDATA}/sensor_stereo_left.tif
+  ${INPUTDATA}/sensor_stereo_left.tif
   ${TEMP}/dmTvDisparityTranslateFilterOutput.tif
   )
 
@@ -102,8 +102,8 @@ otb_add_test(NAME dmTvSubPixelDisparityImageFilterNCC COMMAND otbDisparityMapTes
   ${BASELINE}/dmTvSubPixelWiseBlockMatchingImageFilterNCCOutputMetric.tif
   ${TEMP}/dmTvSubPixelWiseBlockMatchingImageFilterNCCOutputMetric.tif
   otbSubPixelDisparityImageFilter
-  ${EXAMPLEDATA}/StereoFixed.png
-  ${EXAMPLEDATA}/StereoMoving.png
+  ${INPUTDATA}/StereoFixed.png
+  ${INPUTDATA}/StereoMoving.png
   ${INPUTDATA}/StereoPixelWiseBlockMatchingDisparity.tif
   ${INPUTDATA}/StereoPixelWiseBlockMatchingMetric.tif
   ${TEMP}/dmTvSubPixelWiseBlockMatchingImageFilterNCCOutputHDisparity.tif
@@ -122,8 +122,8 @@ otb_add_test(NAME dmTvSubPixelDisparityImageFilterNCC COMMAND otbDisparityMapTes
   #${TEMP}/dmTvDisparityMapTo3DFilterOutput.tif
   #otbDisparityMapTo3DFilter
   #${INPUTDATA}/sensor_stereo_blockmatching_output.tif
-  #${EXAMPLEDATA}/sensor_stereo_left.tif
-  #${EXAMPLEDATA}/sensor_stereo_right.tif
+  #${INPUTDATA}/sensor_stereo_left.tif
+  #${INPUTDATA}/sensor_stereo_right.tif
   #${INPUTDATA}/sensor_stereo_rectif_left.tif
   #${INPUTDATA}/sensor_stereo_rectif_right.tif
   #${TEMP}/dmTvDisparityMapTo3DFilterOutput.tif
@@ -155,8 +155,8 @@ otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanSquare COMMAND otbD
   ${BASELINE}/feTvFineRegistrationImageFilterTestWithMeanSquareField.tif
   ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanSquareField.tif
   otbFineRegistrationImageFilterTest
-  ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
-  ${EXAMPLEDATA}/StereoMoving.png # movingFileName
+  ${INPUTDATA}/StereoFixed.png # fixedFileName
+  ${INPUTDATA}/StereoMoving.png # movingFileName
   ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanSquareMetric.tif # output correlFileName
   ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanSquareField.tif  # output fieldFileName
   1 # radius
@@ -175,8 +175,8 @@ otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenc
   ${BASELINE}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceField.tif
   ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceField.tif
   otbFineRegistrationImageFilterTest
-  ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
-  ${EXAMPLEDATA}/StereoMoving.png # movingFileName
+  ${INPUTDATA}/StereoFixed.png # fixedFileName
+  ${INPUTDATA}/StereoMoving.png # movingFileName
   ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceMetric.tif # output correlFileName
   ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceField.tif  # output fieldFileName
   3 # radius
@@ -195,8 +195,8 @@ otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithNormalizedCorrelation C
   ${BASELINE}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationField.tif
   ${TEMP}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationField.tif
   otbFineRegistrationImageFilterTest
-  ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
-  ${EXAMPLEDATA}/StereoMoving.png # movingFileName
+  ${INPUTDATA}/StereoFixed.png # fixedFileName
+  ${INPUTDATA}/StereoMoving.png # movingFileName
   ${TEMP}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationMetric.tif # output correlFileName
   ${TEMP}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationField.tif  # output fieldFileName
   3 # radius
@@ -215,8 +215,8 @@ otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithCorrelation COMMAND otb
   ${BASELINE}/feTvFineRegistrationImageFilterTestWithCorrelationField.tif
   ${TEMP}/feTvFineRegistrationImageFilterTestWithCorrelationField.tif
   otbFineRegistrationImageFilterTest
-  ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
-  ${EXAMPLEDATA}/StereoMoving.png # movingFileName
+  ${INPUTDATA}/StereoFixed.png # fixedFileName
+  ${INPUTDATA}/StereoMoving.png # movingFileName
   ${TEMP}/feTvFineRegistrationImageFilterTestWithCorrelationMetric.tif # output correlFileName
   ${TEMP}/feTvFineRegistrationImageFilterTestWithCorrelationField.tif  # output fieldFileName
   3 # radius
@@ -245,8 +245,8 @@ otb_add_test(NAME dmTvPixelWiseBlockMatchingImageFilterNCC COMMAND otbDisparityM
   ${BASELINE}/dmTvPixelWiseBlockMatchingImageFilterNCCOutputMetric.tif
   ${TEMP}/dmTvPixelWiseBlockMatchingImageFilterNCCOutputMetric.tif
   otbPixelWiseBlockMatchingImageFilterNCC
-  ${EXAMPLEDATA}/StereoFixed.png
-  ${EXAMPLEDATA}/StereoMoving.png
+  ${INPUTDATA}/StereoFixed.png
+  ${INPUTDATA}/StereoMoving.png
   ${TEMP}/dmTvPixelWiseBlockMatchingImageFilterNCCOutputDisparity.tif
   ${TEMP}/dmTvPixelWiseBlockMatchingImageFilterNCCOutputMetric.tif
   2
@@ -259,8 +259,8 @@ otb_add_test(NAME dmTvPixelWiseBlockMatchingImageFilter COMMAND otbDisparityMapT
   ${BASELINE}/dmTvPixelWiseBlockMatchingImageFilterOutputMetric.tif
   ${TEMP}/dmTvPixelWiseBlockMatchingImageFilterOutputMetric.tif
   otbPixelWiseBlockMatchingImageFilter
-  ${EXAMPLEDATA}/StereoFixed.png
-  ${EXAMPLEDATA}/StereoMoving.png
+  ${INPUTDATA}/StereoFixed.png
+  ${INPUTDATA}/StereoMoving.png
   ${TEMP}/dmTvPixelWiseBlockMatchingImageFilterOutputDisparity.tif
   ${TEMP}/dmTvPixelWiseBlockMatchingImageFilterOutputMetric.tif
   2
diff --git a/Modules/Registration/Stereo/test/CMakeLists.txt b/Modules/Registration/Stereo/test/CMakeLists.txt
index b96f6efbedc7117161ccb24660e04b7fea77ca79..84d6ea0f84b5507ecb241ed86e8f39de5e20ecc8 100644
--- a/Modules/Registration/Stereo/test/CMakeLists.txt
+++ b/Modules/Registration/Stereo/test/CMakeLists.txt
@@ -285,8 +285,8 @@ otb_add_test(NAME dmTvAdhesionCorrectionFilter COMMAND otbStereoTestDriver
   #${BASELINE}/feTvStereoSensorModelToElevationFilterOutput.tif
   #${TEMP}/feTvStereoSensorModelToElevationFilterOutput.tif
   #otbStereoSensorModelToElevationMapFilter
-  #${EXAMPLEDATA}/sensor_stereo_left.tif
-  #${EXAMPLEDATA}/sensor_stereo_right.tif
+  #${INPUTDATA}/sensor_stereo_left.tif
+  #${INPUTDATA}/sensor_stereo_right.tif
   #${TEMP}/feTvStereoSensorModelToElevationFilterOutput.tif
   #${INPUTDATA}/DEM/srtm_directory/
   #${INPUTDATA}/DEM/egm96.grd
@@ -303,8 +303,8 @@ otb_add_test(NAME dmTvStereorectificationDisplacementFieldSource COMMAND otbSter
   ${BASELINE}/feTvStereorectificationDeformationFieldSourceOutput2.tif
   ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput2.tif
   otbStereorectificationDisplacementFieldSource
-  ${EXAMPLEDATA}/sensor_stereo_left.tif
-  ${EXAMPLEDATA}/sensor_stereo_right.tif
+  ${INPUTDATA}/sensor_stereo_left.tif
+  ${INPUTDATA}/sensor_stereo_right.tif
   ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput1.tif
   ${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput2.tif
   300
diff --git a/Modules/Segmentation/Watersheds/test/CMakeLists.txt b/Modules/Segmentation/Watersheds/test/CMakeLists.txt
index 1ea20920c38c5603905c3cd6d4e7f64402252e66..bf2ad3ebd47c3bbdf17d8b10ea626cebabec06e1 100644
--- a/Modules/Segmentation/Watersheds/test/CMakeLists.txt
+++ b/Modules/Segmentation/Watersheds/test/CMakeLists.txt
@@ -36,7 +36,7 @@ otb_add_test(NAME obTuWatershedSegmentationFilter COMMAND otbWatershedsTestDrive
   ${BASELINE}/obTuWatershedSegmentationFilterLabelImage.tif
   ${TEMP}/obTuWatershedSegmentationFilterLabelImage.tif
   otbWatershedSegmentationFilter
-  ${EXAMPLEDATA}/ROI_QB_PAN_1.tif
+  ${INPUTDATA}/ROI_QB_PAN_1.tif
   ${TEMP}/obTuWatershedSegmentationFilterLabelImage.tif
   0.01
   0.2