diff --git a/Examples/ChangeDetection/test/CMakeLists.txt b/Examples/ChangeDetection/test/CMakeLists.txt
index 47ee4449316a4bcb17a34d4ce9588a6b1de717d2..281886f9e675fbdcba7051d2e42197ffd7c2db3a 100644
--- a/Examples/ChangeDetection/test/CMakeLists.txt
+++ b/Examples/ChangeDetection/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- CorrelChDetTest----------
 
 otb_add_test(NAME cdTeCorrelChDetTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/CorrChDet.tif
     ${TEMP}/CorrChDet.tif
   $<TARGET_FILE:CorrelChDet>
@@ -15,7 +15,7 @@ otb_add_test(NAME cdTeCorrelChDetTest COMMAND ${OTB_TEST_DRIVER}
 # ------- DiffChDetTest----------
 
 otb_add_test(NAME cdTeDiffChDetTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/DiffChDet.tif
     ${TEMP}/DiffChDet.tif
   $<TARGET_FILE:DiffChDet>
@@ -28,7 +28,7 @@ otb_add_test(NAME cdTeDiffChDetTest COMMAND ${OTB_TEST_DRIVER}
 # ------- RatioChDetTest----------
 
 otb_add_test(NAME cdTeRatioChDetTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/RatioChDet.tif
     ${TEMP}/RatioChDet.tif
   $<TARGET_FILE:RatioChDet>
@@ -54,7 +54,7 @@ otb_add_test(NAME cdTeKullbackLeiblerDistanceChDetTest COMMAND ${OTB_TEST_DRIVER
 # ------- KullbackLeiblerProfileChDetTest----------
 
 otb_add_test(NAME cdTeKullbackLeiblerProfileChDetTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/KullbackLeiblerProfileChDetTest.png
     ${TEMP}/KullbackLeiblerProfileChDetTest.png
   $<TARGET_FILE:KullbackLeiblerProfileChDet>
diff --git a/Examples/Classification/test/CMakeLists.txt b/Examples/Classification/test/CMakeLists.txt
index e2ed36515d21556c360f063db9b9669e37025e6f..68571482a09af0279059831f2b1bab4822fbeb94 100644
--- a/Examples/Classification/test/CMakeLists.txt
+++ b/Examples/Classification/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- ScalarImageMarkovRandomField1Test----------
 
 otb_add_test(NAME clTeScalarImageMarkovRandomField1Test COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ScalarImageMarkovRandomField1Output.png
     ${TEMP}/ScalarImageMarkovRandomField1Output.png
   $<TARGET_FILE:ScalarImageMarkovRandomField1>
@@ -15,7 +15,7 @@ otb_add_test(NAME clTeScalarImageMarkovRandomField1Test COMMAND ${OTB_TEST_DRIVE
 # ------- ScalarImageKmeansClassifierTest----------
 
 otb_add_test(NAME clTeScalarImageKmeansClassifierTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/QB_Suburb_labelled.png
     ${TEMP}/QB_Suburb_labelled.png
   $<TARGET_FILE:ScalarImageKmeansClassifier>
diff --git a/Examples/DataRepresentation/Image/test/CMakeLists.txt b/Examples/DataRepresentation/Image/test/CMakeLists.txt
index 9f9e2fd2b3f9f10d62136a89d99afe4cf9c3a58a..c73103d42ce12a008e27da6a48bd5fd78c00a077 100644
--- a/Examples/DataRepresentation/Image/test/CMakeLists.txt
+++ b/Examples/DataRepresentation/Image/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- ImageAdaptor4Test----------
 
 otb_add_test(NAME diTeImageAdaptor4Test1 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ImageAdaptorThresholdingA.png
     ${TEMP}/ImageAdaptorThresholdingA.png
   $<TARGET_FILE:ImageAdaptor4>
@@ -14,7 +14,7 @@ otb_add_test(NAME diTeImageAdaptor4Test1 COMMAND ${OTB_TEST_DRIVER}
 # ------- ImageAdaptor4Test----------
 
 otb_add_test(NAME diTeImageAdaptor4Test2 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ImageAdaptorThresholdingB.png
     ${TEMP}/ImageAdaptorThresholdingB.png
   $<TARGET_FILE:ImageAdaptor4>
@@ -26,7 +26,7 @@ otb_add_test(NAME diTeImageAdaptor4Test2 COMMAND ${OTB_TEST_DRIVER}
 # ------- Image5Test----------
 
 otb_add_test(NAME diTeImage5Test COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/Image5.png
     ${TEMP}/Image5.png
   $<TARGET_FILE:Image5>
@@ -36,7 +36,7 @@ otb_add_test(NAME diTeImage5Test COMMAND ${OTB_TEST_DRIVER}
 # ------- Image6Test----------
 
 otb_add_test(NAME diTeImage6Test COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/Image6.tif
     ${TEMP}/Image6.tif
   $<TARGET_FILE:Image6>
diff --git a/Examples/DisparityMap/test/CMakeLists.txt b/Examples/DisparityMap/test/CMakeLists.txt
index 73dd5fae722fb1ac2c20979727b4877e1003b83e..f783e198464af2100d5993bbf0755a55cf3cecc5 100644
--- a/Examples/DisparityMap/test/CMakeLists.txt
+++ b/Examples/DisparityMap/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- SimpleDisparityMapEstimationExampleTest ----------
 
 otb_add_test(NAME dmTeSimpleDisparityMapEstimationExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/deformationFieldOutput.png
     ${TEMP}/deformationFieldOutput.png
     ${BASELINE}/resampledMovingOutput.png
@@ -16,7 +16,7 @@ otb_add_test(NAME dmTeSimpleDisparityMapEstimationExampleTest COMMAND ${OTB_TEST
 )
 
 otb_add_test(NAME dmTeStereoReconstructionExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/elevationOutput.tif
     ${TEMP}/elevationOutput.tif
   $<TARGET_FILE:StereoReconstructionExample>
diff --git a/Examples/FeatureExtraction/test/CMakeLists.txt b/Examples/FeatureExtraction/test/CMakeLists.txt
index f8c9e873a46ea3d9bd52026c3c46690e6175a81a..3ba833bd813c17f6cb3d8b74411ba0905ed67565 100644
--- a/Examples/FeatureExtraction/test/CMakeLists.txt
+++ b/Examples/FeatureExtraction/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- CorrelationLineDetectorExampleTest----------
 
 otb_add_test(NAME feTeCorrelationLineDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/amstLineCorrelations.png
     ${TEMP}/amstLineCorrelations.png
     ${BASELINE}/amstLineCorrelationDirections.png
@@ -17,7 +17,7 @@ otb_add_test(NAME feTeCorrelationLineDetectorExampleTest COMMAND ${OTB_TEST_DRIV
 # ------- LocalHoughExampleTest----------
 
 otb_add_test(NAME feTeLocalHoughExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/detected_local_hough.png
     ${TEMP}/detected_local_hough.png
   $<TARGET_FILE:LocalHoughExample>
@@ -29,7 +29,7 @@ otb_add_test(NAME feTeLocalHoughExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- HarrisExampleTest----------
 
 otb_add_test(NAME feTeHarrisExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ROISpot5Harris.png
     ${TEMP}/ROISpot5Harris.png
   $<TARGET_FILE:HarrisExample>
@@ -41,7 +41,7 @@ otb_add_test(NAME feTeHarrisExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- TouziEdgeDetectorExampleTest----------
 
 otb_add_test(NAME feTeTouziEdgeDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/amstTouziEdges.png
     ${TEMP}/amstTouziEdges.png
     ${BASELINE}/amstTouziDirections.png
@@ -56,7 +56,7 @@ otb_add_test(NAME feTeTouziEdgeDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- ExtractSegmentsByStepsExampleTest----------
 
 otb_add_test(NAME feTeExtractSegmentsByStepsExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/amstSegmentExtractionBySteps.png
     ${TEMP}/amstSegmentExtractionBySteps.png
   $<TARGET_FILE:ExtractSegmentsByStepsExample>
@@ -68,7 +68,7 @@ otb_add_test(NAME feTeExtractSegmentsByStepsExampleTest COMMAND ${OTB_TEST_DRIVE
 # ------- AssymmetricFusionOfLineDetectorExampleTest----------
 
 otb_add_test(NAME feTeAssymmetricFusionOfLineDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/amstLineFusion.png
     ${TEMP}/amstLineFusion.png
   $<TARGET_FILE:AssymmetricFusionOfLineDetectorExample>
@@ -80,7 +80,7 @@ otb_add_test(NAME feTeAssymmetricFusionOfLineDetectorExampleTest COMMAND ${OTB_T
 # ------- ExtractSegmentsExampleTest----------
 
 otb_add_test(NAME feTeExtractSegmentsExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/amstSegmentExtraction.png
     ${TEMP}/amstSegmentExtraction.png
   $<TARGET_FILE:ExtractSegmentsExample>
@@ -92,7 +92,7 @@ otb_add_test(NAME feTeExtractSegmentsExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- RatioLineDetectorExampleTest----------
 
 otb_add_test(NAME feTeRatioLineDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/amstLineRatios.png
     ${TEMP}/amstLineRatios.png
     ${BASELINE}/amstLineRatioDirections.png
@@ -107,7 +107,7 @@ otb_add_test(NAME feTeRatioLineDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- AlignmentsExampleTest----------
 
 otb_add_test(NAME feTeAlignmentsExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/QB_SuburbAlign.png
     ${TEMP}/QB_SuburbAlign.png
   $<TARGET_FILE:AlignmentsExample>
@@ -120,7 +120,7 @@ otb_add_test(NAME feTeAlignmentsExampleTest COMMAND ${OTB_TEST_DRIVER}
 
 
 otb_add_test(NAME feTeExtractRoadByStepsExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/qb_ExtractRoad_pretty.png
     ${TEMP}/qb_ExtractRoad_pretty.png
     ${BASELINE}/ExtractRoadByStepsExampleOutput.png
@@ -134,7 +134,7 @@ otb_add_test(NAME feTeExtractRoadByStepsExampleTest COMMAND ${OTB_TEST_DRIVER}
 
 
 otb_add_test(NAME feTeExtractRoadExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/ExtractRoadExampleOutput.png
     ${TEMP}/ExtractRoadExampleOutput.png
   $<TARGET_FILE:ExtractRoadExample>
@@ -146,7 +146,7 @@ otb_add_test(NAME feTeExtractRoadExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- SeamCarvingExamplesTest----------
 
 otb_add_test(NAME feTeSeamCarvingExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/SeamCarvingExampleOutput.png
     ${TEMP}/SeamCarvingExampleOutput.png
   SeamCarvingExampleTest
@@ -156,7 +156,7 @@ otb_add_test(NAME feTeSeamCarvingExampleTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME feTeSeamCarvingOtherExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/SeamCarvingOtherExampleOutput.png
     ${TEMP}/SeamCarvingOtherExampleOutput.png
   $<TARGET_FILE:SeamCarvingOtherExample>
@@ -166,7 +166,7 @@ otb_add_test(NAME feTeSeamCarvingOtherExampleTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 #otb_add_test(NAME feTeImageToSIFTKeyPointSetFilterTest COMMAND ${OTB_TEST_DRIVER}
-#        --compare-image ${TOL}
+#        --compare-image ${NOTOL}
 #        ${BASELINE}/ImageToSIFTKeyPointSetFilterOutput.png
 #        ${TEMP}/ImageToSIFTKeyPointSetFilterOutput.png
 #        $<TARGET_FILE:ImageToSIFTKeyPointSetFilter>
@@ -179,7 +179,7 @@ otb_add_test(NAME feTeSeamCarvingOtherExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- CloudDetectionExampleTest----------
 
 otb_add_test(NAME feTeCloudDetectionExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/CloudDetectionOutput.png
     ${TEMP}/PrettyCloudDetectionOutput.png
   $<TARGET_FILE:CloudDetectionExample>
@@ -194,7 +194,7 @@ if (Module_OTBVectorDataRendering)
 
   # ------- Line Segment Detector test----------
   otb_add_test(NAME feTeLineSegmentDetectorExampleTest  COMMAND ${OTB_TEST_DRIVER}
-    --compare-image ${TOL}
+    --compare-image ${NOTOL}
       ${BASELINE}/feTeLineSegmentDetectorExampleOutput.png
       ${TEMP}/feTeLineSegmentDetectorExampleOutput.png
     $<TARGET_FILE:LineSegmentDetectorExample>
@@ -205,7 +205,7 @@ if (Module_OTBVectorDataRendering)
   # ------- Right Angle Detection test----------
 
   otb_add_test(NAME feTeRightAngleDetectionExample  COMMAND ${OTB_TEST_DRIVER}
-    --compare-image ${TOL}
+    --compare-image ${NOTOL}
       ${BASELINE}/feTeRightAngleDetectionExampleOutput.png
       ${TEMP}/feTeRightAngleDetectionExampleOutput.png
     $<TARGET_FILE:RightAngleDetectionExample>
diff --git a/Examples/Filtering/test/CMakeLists.txt b/Examples/Filtering/test/CMakeLists.txt
index f00a6e38bf248fc108fc8ad36a6b2c1300ab216c..9eb630859c8fdac381cc2271f1f78a187341b6a1 100644
--- a/Examples/Filtering/test/CMakeLists.txt
+++ b/Examples/Filtering/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- MathematicalMorphologyBinaryFiltersTest----------
 
 otb_add_test(NAME fiTeMathematicalMorphologyBinaryFiltersTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/MathematicalMorphologyBinaryErosionOutput.png
     ${TEMP}/MathematicalMorphologyBinaryErosionOutput.png
     ${BASELINE}/MathematicalMorphologyBinaryDilationOutput.png
@@ -17,7 +17,7 @@ otb_add_test(NAME fiTeMathematicalMorphologyBinaryFiltersTest COMMAND ${OTB_TEST
 # ------- DanielssonDistanceMapImageFilterTest----------
 
 otb_add_test(NAME fiTeDanielssonDistanceMapImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/DanielssonDistanceMapImageFilterOutput1.png
     ${TEMP}/DanielssonDistanceMapImageFilterOutput1.png
     ${BASELINE}/DanielssonDistanceMapImageFilterOutput2.png
@@ -31,7 +31,7 @@ otb_add_test(NAME fiTeDanielssonDistanceMapImageFilterTest COMMAND ${OTB_TEST_DR
 # ------- MeanImageFilterTest----------
 
 otb_add_test(NAME fiTeMeanImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/MeanImageFilterOutput.png
     ${TEMP}/MeanImageFilterOutput.png
   $<TARGET_FILE:MeanImageFilter>
@@ -42,7 +42,7 @@ otb_add_test(NAME fiTeMeanImageFilterTest COMMAND ${OTB_TEST_DRIVER}
 # ------- ThresholdImageFilterTest----------
 
 otb_add_test(NAME fiTeThresholdImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 3
+  --compare-n-images ${NOTOL} 3
     ${BASELINE}/ThresholdImageFilterOutputBelow.png
     ${TEMP}/ThresholdImageFilterOutputBelow.png
     ${BASELINE}/ThresholdImageFilterOutputAbove.png
@@ -71,7 +71,7 @@ otb_add_test(NAME fiTeGradientMagnitudeRecursiveGaussianImageFilterTest COMMAND
 # ------- GradientAnisotropicDiffusionImageFilterTest----------
 
 otb_add_test(NAME fiTeGradientAnisotropicDiffusionImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/GradientAnisotropicDiffusionImageFilterOutput.png
     ${TEMP}/GradientAnisotropicDiffusionImageFilterOutput.png
   $<TARGET_FILE:GradientAnisotropicDiffusionImageFilter>
@@ -83,7 +83,7 @@ otb_add_test(NAME fiTeGradientAnisotropicDiffusionImageFilterTest COMMAND ${OTB_
 # ------- GradientMagnitudeImageFilterTest----------
 
 otb_add_test(NAME fiTeGradientMagnitudeImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/GradientMagnitudeImageFilterOutput.png
     ${TEMP}/GradientMagnitudeImageFilterOutput.png
   GradientMagnitudeImageFilterTest
@@ -94,7 +94,7 @@ otb_add_test(NAME fiTeGradientMagnitudeImageFilterTest COMMAND ${OTB_TEST_DRIVER
 # ------- MathematicalMorphologyGrayscaleFiltersTest----------
 
 otb_add_test(NAME fiTeMathematicalMorphologyGrayscaleFiltersTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/MathematicalMorphologyGrayscaleErosionOutput.png
     ${TEMP}/MathematicalMorphologyGrayscaleErosionOutput.png
     ${BASELINE}/MathematicalMorphologyGrayscaleDilationOutput.png
@@ -109,7 +109,7 @@ otb_add_test(NAME fiTeMathematicalMorphologyGrayscaleFiltersTest COMMAND ${OTB_T
 # ------- LaplacianRecursiveGaussianImageFilter1Test----------
 
 otb_add_test(NAME fiTeLaplacianRecursiveGaussianImageFilter1Test COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/LaplacianRecursiveGaussianImageFilteroutput5.hdr
     ${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.hdr
     ${BASELINE}/LaplacianRecursiveGaussianImageFilterOutput5.png
@@ -125,7 +125,7 @@ otb_add_test(NAME fiTeLaplacianRecursiveGaussianImageFilter1Test COMMAND ${OTB_T
 # ------- LaplacianRecursiveGaussianImageFilter2Test----------
 
 otb_add_test(NAME fiTeLaplacianRecursiveGaussianImageFilter2Test COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/LaplacianRecursiveGaussianImageFilter2output5.hdr
     ${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.hdr
     ${BASELINE}/LaplacianRecursiveGaussianImageFilter2Output5.png
@@ -140,7 +140,7 @@ otb_add_test(NAME fiTeLaplacianRecursiveGaussianImageFilter2Test COMMAND ${OTB_T
 # ------- CannyEdgeDetectionImageFilterTest----------
 
 otb_add_test(NAME fiTeCannyEdgeDetectionImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/CannyEdgeDetectorImageFilterOutput.png
     ${TEMP}/CannyEdgeDetectorImageFilterOutput.png
   $<TARGET_FILE:CannyEdgeDetectionImageFilter>
@@ -152,7 +152,7 @@ otb_add_test(NAME fiTeCannyEdgeDetectionImageFilterTest COMMAND ${OTB_TEST_DRIVE
 # ------- DiscreteGaussianImageFilterTest----------
 
 otb_add_test(NAME fiTeDiscreteGaussianImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/DiscreteGaussianImageFilterOutput.png
     ${TEMP}/DiscreteGaussianImageFilterOutput.png
   $<TARGET_FILE:DiscreteGaussianImageFilter>
@@ -164,7 +164,7 @@ otb_add_test(NAME fiTeDiscreteGaussianImageFilterTest COMMAND ${OTB_TEST_DRIVER}
 # ------- MedianImageFilterTest----------
 
 otb_add_test(NAME fiTeMedianImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/MedianImageFilterOutput.png
     ${TEMP}/MedianImageFilterOutput.png
   $<TARGET_FILE:MedianImageFilter>
@@ -175,7 +175,7 @@ otb_add_test(NAME fiTeMedianImageFilterTest COMMAND ${OTB_TEST_DRIVER}
 # ------- BinaryThresholdImageFilterTest----------
 
 otb_add_test(NAME fiTeBinaryThresholdImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/BinaryThresholdImageFilterOutput.png
     ${TEMP}/BinaryThresholdImageFilterOutput.png
   $<TARGET_FILE:BinaryThresholdImageFilter>
@@ -187,7 +187,7 @@ otb_add_test(NAME fiTeBinaryThresholdImageFilterTest COMMAND ${OTB_TEST_DRIVER}
 # ------- DerivativeImageFilterTest----------
 
 otb_add_test(NAME fiTeDerivativeImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/DerivativeImageFilterFloatOutput.hdr
     ${TEMP}/DerivativeImageFilterFloatOutput.hdr
     ${BASELINE}/DerivativeImageFilterOutput.png
diff --git a/Examples/Hyperspectral/test/CMakeLists.txt b/Examples/Hyperspectral/test/CMakeLists.txt
index 267cc97c4dbdafb086b2716ca3cdbdff0262c963..b404f1f621b71d0e6c71f43d31bd12a147015fd9 100644
--- a/Examples/Hyperspectral/test/CMakeLists.txt
+++ b/Examples/Hyperspectral/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 otb_add_test(NAME siTvHyperspectralExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 3
+  --compare-n-images ${NOTOL} 3
     ${BASELINE}/siTvHyperspectralUnmixingExampleTestBand1.png
     ${TEMP}/siTvHyperspectralUnmixingExampleTestBand1.png
     ${BASELINE}/siTvHyperspectralUnmixingExampleTestBand2.png
diff --git a/Examples/Iterators/test/CMakeLists.txt b/Examples/Iterators/test/CMakeLists.txt
index 04db1569906ad88a6782949b3556a4d5fd1f173e..14692b02c3c4e1eee4b5d8fcf4842d98915d2ce9 100644
--- a/Examples/Iterators/test/CMakeLists.txt
+++ b/Examples/Iterators/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- ImageRegionIteratorWithIndexTest----------
 
 otb_add_test(NAME itTeImageRegionIteratorWithIndexTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ImageRegionIteratorWithIndexOutput.png
     ${TEMP}/ImageRegionIteratorWithIndexOutput.png
   $<TARGET_FILE:ImageRegionIteratorWithIndex>
@@ -13,7 +13,7 @@ otb_add_test(NAME itTeImageRegionIteratorWithIndexTest COMMAND ${OTB_TEST_DRIVER
 # ------- NeighborhoodIterators1Test----------
 
 otb_add_test(NAME itTeNeighborhoodIterators1Test COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodIterators1a.png
     ${TEMP}/NeighborhoodIterators1a.png
   $<TARGET_FILE:NeighborhoodIterators1>
@@ -24,7 +24,7 @@ otb_add_test(NAME itTeNeighborhoodIterators1Test COMMAND ${OTB_TEST_DRIVER}
 # ------- NeighborhoodIterators4Test----------
 
 otb_add_test(NAME itTeNeighborhoodIterators4aTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodIterators4a.png
     ${TEMP}/NeighborhoodIterators4a.png
   $<TARGET_FILE:NeighborhoodIterators4>
@@ -36,7 +36,7 @@ otb_add_test(NAME itTeNeighborhoodIterators4aTest COMMAND ${OTB_TEST_DRIVER}
 # ------- NeighborhoodIterators4Test----------
 
 otb_add_test(NAME itTeNeighborhoodIterators4bTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodIterators4b.png
     ${TEMP}/NeighborhoodIterators4b.png
   $<TARGET_FILE:NeighborhoodIterators4>
@@ -48,7 +48,7 @@ otb_add_test(NAME itTeNeighborhoodIterators4bTest COMMAND ${OTB_TEST_DRIVER}
 # ------- NeighborhoodIterators4Test----------
 
 otb_add_test(NAME itTeNeighborhoodIterators4cTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodIterators4c.png
     ${TEMP}/NeighborhoodIterators4c.png
   $<TARGET_FILE:NeighborhoodIterators4>
@@ -60,7 +60,7 @@ otb_add_test(NAME itTeNeighborhoodIterators4cTest COMMAND ${OTB_TEST_DRIVER}
 # ------- NeighborhoodIterators4Test----------
 
 otb_add_test(NAME itTeNeighborhoodIterators4dTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodIterators4d.png
     ${TEMP}/NeighborhoodIterators4d.png
   $<TARGET_FILE:NeighborhoodIterators4>
@@ -72,7 +72,7 @@ otb_add_test(NAME itTeNeighborhoodIterators4dTest COMMAND ${OTB_TEST_DRIVER}
 # ------- NeighborhoodIterators6Test----------
 
 otb_add_test(NAME itTeNeighborhoodIterators6aTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodIterators6a.png
     ${TEMP}/NeighborhoodIterators6a.png
   $<TARGET_FILE:NeighborhoodIterators6>
@@ -83,7 +83,7 @@ otb_add_test(NAME itTeNeighborhoodIterators6aTest COMMAND ${OTB_TEST_DRIVER}
 # ------- NeighborhoodIterators6Test----------
 
 otb_add_test(NAME itTeNeighborhoodIterators6bTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodIterators6b.png
     ${TEMP}/NeighborhoodIterators6b.png
   $<TARGET_FILE:NeighborhoodIterators6>
@@ -94,7 +94,7 @@ otb_add_test(NAME itTeNeighborhoodIterators6bTest COMMAND ${OTB_TEST_DRIVER}
 # ------- NeighborhoodIterators6Test----------
 
 otb_add_test(NAME itTeNeighborhoodIterators6cTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodIterators6c.png
     ${TEMP}/NeighborhoodIterators6c.png
   $<TARGET_FILE:NeighborhoodIterators6>
@@ -105,7 +105,7 @@ otb_add_test(NAME itTeNeighborhoodIterators6cTest COMMAND ${OTB_TEST_DRIVER}
 # ------- ImageRegionIteratorTest----------
 
 otb_add_test(NAME itTeImageRegionIteratorTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ImageRegionIteratorOutput.png
     ${TEMP}/ImageRegionIteratorOutput.png
   $<TARGET_FILE:ImageRegionIterator>
@@ -117,7 +117,7 @@ otb_add_test(NAME itTeImageRegionIteratorTest COMMAND ${OTB_TEST_DRIVER}
 # ------- ShapedNeighborhoodIterators2Test----------
 
 otb_add_test(NAME itTeShapedNeighborhoodIterators2Test COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ShapedNeighborhoodIterators1b.png
     ${TEMP}/ShapedNeighborhoodIterators1b.png
   $<TARGET_FILE:ShapedNeighborhoodIterators2>
diff --git a/Examples/Learning/test/CMakeLists.txt b/Examples/Learning/test/CMakeLists.txt
index 39d71b85b7d34c38a1beacece2b2d1a005971682..6a8ce90389b75b1990479678727d1317c6724eec 100644
--- a/Examples/Learning/test/CMakeLists.txt
+++ b/Examples/Learning/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- SVMImageClassificationExampleTest----------
 
 otb_add_test(NAME leTeSVMImageClassificationExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ROI_QB_MUL_1_SVN_CLASS.png
     ${TEMP}/ROI_QB_MUL_1_SVN_CLASS.png
   $<TARGET_FILE:SVMImageClassificationExample>
@@ -14,7 +14,7 @@ otb_add_test(NAME leTeSVMImageClassificationExampleTest COMMAND ${OTB_TEST_DRIVE
 # ------- SVMImageEstimatorClassificationMultiExampleTest----------
 
 otb_add_test(NAME leTeSVMImageEstimatorClassificationMultiExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
     ${TEMP}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
   $<TARGET_FILE:SVMImageEstimatorClassificationMultiExample>
@@ -27,7 +27,7 @@ otb_add_test(NAME leTeSVMImageEstimatorClassificationMultiExampleTest COMMAND ${
 # ------- GenerateTrainingImageExampleTest----------
 
 otb_add_test(NAME leTeGenerateTrainingImageExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ROI_QB_MUL_4_training.png
     ${TEMP}/ROI_QB_MUL_4_training.png
   $<TARGET_FILE:GenerateTrainingImageExample>
@@ -53,7 +53,7 @@ otb_add_test(NAME leTeSVMImageModelEstimatorExampleTest COMMAND ${OTB_TEST_DRIVE
 # ------- SOMExampleTest----------
 
 otb_add_test(NAME leTeSOMExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/ROI_QB_MUL_SOM.png
     ${TEMP}/ROI_QB_MUL_SOM.png
     ${BASELINE}/ROI_QB_MUL_SOMACT.png
@@ -68,7 +68,7 @@ otb_add_test(NAME leTeSOMExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- SOMClassifierExampleTest----------
 
 otb_add_test(NAME leTeSOMClassifierExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/ROI_QB_MUL_extractSOMCLASS.tif
     ${TEMP}/ROI_QB_MUL_extractSOMCLASS.tif
   $<TARGET_FILE:SOMClassifierExample>
@@ -80,7 +80,7 @@ otb_add_test(NAME leTeSOMClassifierExampleTest COMMAND ${OTB_TEST_DRIVER}
 # ------- SEMModelEstimatorExampleTest----------
 
 otb_add_test(NAME leTeSEMModelEstimatorExampleTest COMMAND ${OTB_TEST_DRIVER}
-#        --compare-image ${TOL}
+#        --compare-image ${NOTOL}
 #        ${BASELINE}/ROI_QB_MUL_SEMMODEL_ESTIMATOR.png
 #        ${TEMP}/ROI_QB_MUL_SEMMODEL_ESTIMATOR.png
   $<TARGET_FILE:SEMModelEstimatorExample>
diff --git a/Examples/MultiScale/test/CMakeLists.txt b/Examples/MultiScale/test/CMakeLists.txt
index c48035db030d6ed2231fe34063e514e75556f28f..068fb0be30975857ab523869b854941c38097439 100644
--- a/Examples/MultiScale/test/CMakeLists.txt
+++ b/Examples/MultiScale/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- MorphologicalPyramidAnalysisFilterExampleTest ----------
 
 otb_add_test(NAME msTeMorphologicalPyramidAnalysisFilterExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 20
+  --compare-n-images ${NOTOL} 20
     ${BASELINE}/suburb2_an_1.jpeg ${TEMP}/suburb2_an_1.jpeg
     ${BASELINE}/suburb2_an_2.jpeg ${TEMP}/suburb2_an_2.jpeg
     ${BASELINE}/suburb2_an_3.jpeg ${TEMP}/suburb2_an_3.jpeg
@@ -41,7 +41,7 @@ otb_add_test(NAME msTeMorphologicalPyramidAnalysisFilterExampleTest COMMAND ${OT
 # ------- MorphologicalPyramidSynthesisFilterExampleTest ----------
 
 otb_add_test(NAME msTeMorphologicalPyramidSynthesisFilterExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/suburb2_synthesis.jpeg
     ${TEMP}/suburb2_synthesis.jpeg
   $<TARGET_FILE:MorphologicalPyramidSynthesisFilterExample>
@@ -53,7 +53,7 @@ otb_add_test(NAME msTeMorphologicalPyramidSynthesisFilterExampleTest COMMAND ${O
 # ------- MorphologicalPyramidSegmenterExampleTest ----------
 
 otb_add_test(NAME msTeMorphologicalPyramidSegmenterExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/outputPyrSegmented.tif
     ${TEMP}/outputPyrSegmented.tif
   $<TARGET_FILE:MorphologicalPyramidSegmenterExample>
diff --git a/Examples/OBIA/test/CMakeLists.txt b/Examples/OBIA/test/CMakeLists.txt
index 0d0048aaa5c829611fc2513b5585e54addd55125..7c881da45303d31814852cafabb5fc9d1f7f6a88 100644
--- a/Examples/OBIA/test/CMakeLists.txt
+++ b/Examples/OBIA/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 otb_add_test(NAME  trTeOBIAImageToLabelToImageTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/OBIAI2L2IOutput.tif
     ${TEMP}/OBIAI2L2IOutput.tif
   $<TARGET_FILE:ImageToLabelToImage>
@@ -21,7 +21,7 @@ otb_add_test(NAME trTeOBIAShapeAttributeComputationTest COMMAND ${OTB_TEST_DRIVE
 )
 
 otb_add_test(NAME trTeOBIARadiometricAttributesLabelMapFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/OBIARadiometricAttributes.png
     ${TEMP}/OBIARadiometricAttributes.png
   $<TARGET_FILE:RadiometricAttributesLabelMapFilterExample>
diff --git a/Examples/Patented/test/CMakeLists.txt b/Examples/Patented/test/CMakeLists.txt
index 9eb0ace2b9d101e91d9c07e4d960574ec83b8bfb..a3d019ad5b990820b7a56d94987a8b28acd87c96 100644
--- a/Examples/Patented/test/CMakeLists.txt
+++ b/Examples/Patented/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 # -----EstimateAffineTransformationExampleTest---------
 otb_add_test(NAME dmTeEstimateAffineTransformationExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/EstimateAffineTransformationOutput.png
     ${TEMP}/AffineTransformationOutput.png
   $<TARGET_FILE:EstimateAffineTransformationExample>
@@ -16,7 +16,7 @@ otb_add_test(NAME dmTeEstimateAffineTransformationExampleTest COMMAND ${OTB_TEST
 if(Module_OTBSiftFast)
 
   otb_add_test(NAME dmTeSIFTDisparityMapEstimationTest COMMAND ${OTB_TEST_DRIVER}
-    --compare-image ${TOL}
+    --compare-image ${NOTOL}
       ${BASELINE}/SIFTdeformationFieldOutput.png
       ${TEMP}/SIFTdeformationFieldOutput.png
     $<TARGET_FILE:SIFTDisparityMapEstimation>
@@ -26,7 +26,7 @@ if(Module_OTBSiftFast)
   )
 
   otb_add_test(NAME feTeSIFTFastExampleTest COMMAND ${OTB_TEST_DRIVER}
-    --compare-image ${TOL}
+    --compare-image ${NOTOL}
      ${BASELINE}/ROISpot5SiftFast.png
      ${TEMP}/ROISpot5SiftFast.png
     $<TARGET_FILE:SIFTFastExample>
diff --git a/Examples/Projections/test/CMakeLists.txt b/Examples/Projections/test/CMakeLists.txt
index 63462fac93206055137eff30ea0bb1783df3c8dd..0749a3171afd14f2de3554f85cb6da3441209b21 100644
--- a/Examples/Projections/test/CMakeLists.txt
+++ b/Examples/Projections/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 otb_add_test(NAME prTeOrthoRectificationExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/panOrthoToul.tif
     ${TEMP}/panOrthoToul.tif
   $<TARGET_FILE:OrthoRectificationExample>
@@ -17,7 +17,7 @@ otb_add_test(NAME prTeOrthoRectificationExampleTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME prTeOrthoRectificationExampleXSTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/xsOrthoToul.tif
     ${TEMP}/xsOrthoToul.tif
   $<TARGET_FILE:OrthoRectificationExample>
@@ -34,7 +34,7 @@ otb_add_test(NAME prTeOrthoRectificationExampleXSTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME prTeMapProjectionExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-ascii ${TOL}
+  --compare-ascii ${NOTOL}
     ${BASELINE}/mapProjectionExample.txt
     ${TEMP}/mapProjectionExample.txt
   $<TARGET_FILE:MapProjectionExample>
@@ -42,7 +42,7 @@ otb_add_test(NAME prTeMapProjectionExampleTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME prTeVectorDataProjectionExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-ogr ${TOL}
+  --compare-ogr ${NOTOL}
     ${BASELINE}/vectorDataProjectionExample.shp
     ${TEMP}/vectorDataProjectionExample.shp
   $<TARGET_FILE:VectorDataProjectionExample>
@@ -52,7 +52,7 @@ otb_add_test(NAME prTeVectorDataProjectionExampleTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME prTeGeometriesProjectionTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-ogr ${TOL}
+  --compare-ogr ${NOTOL}
     ${BASELINE}/geometriesProjectionExample.shp
     ${TEMP}/geometriesProjectionExample.shp
   $<TARGET_FILE:GeometriesProjectionExample>
@@ -93,7 +93,7 @@ otb_add_test(NAME prTePlaceNameToLonLatExampleTest COMMAND ${OTB_TEST_DRIVER}
     Toulouse
 )
 otb_add_test(NAME prTeCoordinateToNameExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-ascii ${TOL}
+  --compare-ascii ${NOTOL}
     ${BASELINE}/CoordinateToNameExample.txt
     ${TEMP}/CoordinateToNameExample.txt
   $<TARGET_FILE:CoordinateToNameExample>
diff --git a/Examples/Radiometry/test/CMakeLists.txt b/Examples/Radiometry/test/CMakeLists.txt
index 3d45710ae41cfd85f789d4bb8a0ec149d39d494d..fe11c61e3db38e0d8407d1c52b3290a164dc4095 100644
--- a/Examples/Radiometry/test/CMakeLists.txt
+++ b/Examples/Radiometry/test/CMakeLists.txt
@@ -18,7 +18,7 @@ otb_add_test(NAME raTeARVIMultiChannelRAndBAndNIRVegetationIndexImageFilterTest
 # -------            AVIMultiChannelRAndGAndNIRVegetationIndexImageFilterTest   ------------------------------
 
 otb_add_test(NAME raTeAVIMultiChannelRAndGAndNIRVegetationIndexImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  #--compare-image ${TOL}
+  #--compare-image ${NOTOL}
   #  ${BASELINE}/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilterTest.tif
   #  ${TEMP}/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilterTest.tif
   $<TARGET_FILE:AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter>
@@ -37,7 +37,7 @@ otb_add_test(NAME raTeAVIMultiChannelRAndGAndNIRVegetationIndexImageFilterTest C
 # -------            NDVIRAndNIRVegetationIndexImageFilter   ------------------------------
 
 otb_add_test(NAME raTeNDVIRAndNIRVegetationIndexImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/NDVIRAndNIRVegetationIndex.tif
     ${TEMP}/NDVIRAndNIRVegetationIndex.tif
   $<TARGET_FILE:NDVIRAndNIRVegetationIndexImageFilter>
diff --git a/Examples/Registration/test/CMakeLists.txt b/Examples/Registration/test/CMakeLists.txt
index 0147df23dbb5759427e9385a30513167c34b3a7f..21b1614ed269fd65b49abfaa4e03ac99d178dfe4 100644
--- a/Examples/Registration/test/CMakeLists.txt
+++ b/Examples/Registration/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 otb_add_test(NAME reTeImageRegistration1ExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/ImageRegistration1Output.png
     ${TEMP}/ImageRegistration1Output.png
   $<TARGET_FILE:ImageRegistration1>
@@ -11,7 +11,7 @@ otb_add_test(NAME reTeImageRegistration1ExampleTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME reTeImageRegistration2ExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/ImageRegistration2Output.png
     ${TEMP}/ImageRegistration2Output.png
   $<TARGET_FILE:ImageRegistration2>
@@ -23,7 +23,7 @@ otb_add_test(NAME reTeImageRegistration2ExampleTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME reTeImageRegistration5Cas1ExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/ImageRegistration5Output1.png
     ${TEMP}/ImageRegistration5Output1.png
   $<TARGET_FILE:ImageRegistration5>
@@ -34,7 +34,7 @@ otb_add_test(NAME reTeImageRegistration5Cas1ExampleTest COMMAND ${OTB_TEST_DRIVE
     ${TEMP}/ImageRegistration5DifferenceAfter1.png
 )
 otb_add_test(NAME reTeImageRegistration5Cas2ExampleTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/ImageRegistration5Output2.png
     ${TEMP}/ImageRegistration5Output2.png
   $<TARGET_FILE:ImageRegistration5>
diff --git a/Examples/Segmentation/test/CMakeLists.txt b/Examples/Segmentation/test/CMakeLists.txt
index f1ab40a1fc014b87d43e8c59ca6c3004bb39d647..718ddec8ed42218eaee37ca8ae63dc8cb0cf7077 100644
--- a/Examples/Segmentation/test/CMakeLists.txt
+++ b/Examples/Segmentation/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # ------- IsolatedConnectedImageFilterTest----------
 
 otb_add_test(NAME seTeIsolatedConnectedImageFilterTest1 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ConnectedThresholdOutput1.png
     ${TEMP}/ConnectedThresholdOutput1.png
   $<TARGET_FILE:IsolatedConnectedImageFilter>
@@ -14,7 +14,7 @@ otb_add_test(NAME seTeIsolatedConnectedImageFilterTest1 COMMAND ${OTB_TEST_DRIVE
 # ------- IsolatedConnectedImageFilterTest----------
 
 otb_add_test(NAME seTeIsolatedConnectedImageFilterTest2 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/IsolatedConnectedImageFilterOutput1.png
     ${TEMP}/IsolatedConnectedImageFilterOutput1.png
   $<TARGET_FILE:IsolatedConnectedImageFilter>
@@ -26,7 +26,7 @@ otb_add_test(NAME seTeIsolatedConnectedImageFilterTest2 COMMAND ${OTB_TEST_DRIVE
 # ------- FastMarchingImageFilterTest----------
 
 otb_add_test(NAME seTeFastMarchingImageFilterTest1 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/FastMarchingImageFilterOutput5.png
     ${TEMP}/FastMarchingImageFilterOutput5.png
   $<TARGET_FILE:FastMarchingImageFilter>
@@ -38,7 +38,7 @@ otb_add_test(NAME seTeFastMarchingImageFilterTest1 COMMAND ${OTB_TEST_DRIVER}
 # ------- FastMarchingImageFilterTest----------
 
 otb_add_test(NAME seTeFastMarchingImageFilterTest2 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/FastMarchingImageFilterOutput6.png
     ${TEMP}/FastMarchingImageFilterOutput6.png
   $<TARGET_FILE:FastMarchingImageFilter>
@@ -50,7 +50,7 @@ otb_add_test(NAME seTeFastMarchingImageFilterTest2 COMMAND ${OTB_TEST_DRIVER}
 # ------- FastMarchingImageFilterTest----------
 
 otb_add_test(NAME seTeFastMarchingImageFilterTest3 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/FastMarchingImageFilterOutput7.png
     ${TEMP}/FastMarchingImageFilterOutput7.png
   $<TARGET_FILE:FastMarchingImageFilter>
@@ -62,7 +62,7 @@ otb_add_test(NAME seTeFastMarchingImageFilterTest3 COMMAND ${OTB_TEST_DRIVER}
 # ------- OtsuThresholdImageFilterTest----------
 
 otb_add_test(NAME seTeOtsuThresholdImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/OtsuThresholdImageFilterOutput.png
     ${TEMP}/OtsuThresholdImageFilterOutput.png
   $<TARGET_FILE:OtsuThresholdImageFilter>
@@ -74,7 +74,7 @@ otb_add_test(NAME seTeOtsuThresholdImageFilterTest COMMAND ${OTB_TEST_DRIVER}
 # ------- ConfidenceConnectedTest----------
 
 otb_add_test(NAME seTeConfidenceConnectedTest1 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ConfidenceConnectedOutput1.png
     ${TEMP}/ConfidenceConnectedOutput1.png
   $<TARGET_FILE:ConfidenceConnected>
@@ -86,7 +86,7 @@ otb_add_test(NAME seTeConfidenceConnectedTest1 COMMAND ${OTB_TEST_DRIVER}
 # ------- ConfidenceConnectedTest----------
 
 otb_add_test(NAME seTeConfidenceConnectedTest2 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ConfidenceConnectedOutput2.png
     ${TEMP}/ConfidenceConnectedOutput2.png
   $<TARGET_FILE:ConfidenceConnected>
@@ -98,7 +98,7 @@ otb_add_test(NAME seTeConfidenceConnectedTest2 COMMAND ${OTB_TEST_DRIVER}
 # ------- ConfidenceConnectedTest----------
 
 otb_add_test(NAME seTeConfidenceConnectedTest3 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ConfidenceConnectedOutput3.png
     ${TEMP}/ConfidenceConnectedOutput3.png
   $<TARGET_FILE:ConfidenceConnected>
@@ -112,7 +112,7 @@ otb_add_test(NAME seTeConfidenceConnectedTest3 COMMAND ${OTB_TEST_DRIVER}
 # ------- VectorConfidenceConnectedTest----------
 
 otb_add_test(NAME seTeVectorConfidenceConnectedTest1 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/VectorConfidenceConnectedOutput1.png
     ${TEMP}/VectorConfidenceConnectedOutput1.png
   $<TARGET_FILE:VectorConfidenceConnected>
@@ -124,7 +124,7 @@ otb_add_test(NAME seTeVectorConfidenceConnectedTest1 COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME seTeVectorConfidenceConnectedTest2 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/VectorConfidenceConnectedOutput2.png
     ${TEMP}/VectorConfidenceConnectedOutput2.png
   $<TARGET_FILE:VectorConfidenceConnected>
@@ -136,7 +136,7 @@ otb_add_test(NAME seTeVectorConfidenceConnectedTest2 COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME seTeVectorConfidenceConnectedTest3 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/VectorConfidenceConnectedOutput3.png
     ${TEMP}/VectorConfidenceConnectedOutput3.png
   $<TARGET_FILE:VectorConfidenceConnected>
@@ -152,7 +152,7 @@ otb_add_test(NAME seTeVectorConfidenceConnectedTest3 COMMAND ${OTB_TEST_DRIVER}
 # ------- NeighborhoodConnectedImageFilterTest----------
 
 otb_add_test(NAME seTeNeighborhoodConnectedImageFilterTest1 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodConnectedThresholdOutput1.png
     ${TEMP}/NeighborhoodConnectedThresholdOutput1.png
   $<TARGET_FILE:NeighborhoodConnectedImageFilter>
@@ -164,7 +164,7 @@ otb_add_test(NAME seTeNeighborhoodConnectedImageFilterTest1 COMMAND ${OTB_TEST_D
 # ------- NeighborhoodConnectedImageFilterTest----------
 
 otb_add_test(NAME seTeNeighborhoodConnectedImageFilterTest2 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodConnectedThresholdOutput2.png
     ${TEMP}/NeighborhoodConnectedThresholdOutput2.png
   $<TARGET_FILE:NeighborhoodConnectedImageFilter>
@@ -176,7 +176,7 @@ otb_add_test(NAME seTeNeighborhoodConnectedImageFilterTest2 COMMAND ${OTB_TEST_D
 # ------- NeighborhoodConnectedImageFilterTest----------
 
 otb_add_test(NAME seTeNeighborhoodConnectedImageFilterTest3 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/NeighborhoodConnectedThresholdOutput3.png
     ${TEMP}/NeighborhoodConnectedThresholdOutput3.png
   $<TARGET_FILE:NeighborhoodConnectedImageFilter>
@@ -192,7 +192,7 @@ otb_add_test(NAME seTeNeighborhoodConnectedImageFilterTest3 COMMAND ${OTB_TEST_D
 #Moreover, NO baseline file for this first implementation is available in the
 #OTB-Data directory.
 #otb_add_test(NAME seTeWatershedSegmentationTest1 COMMAND ${OTB_TEST_DRIVER}
-#        --compare-n-images ${TOL} 1
+#        --compare-n-images ${NOTOL} 1
 #        ${BASELINE}/WatershedSegmentation1Output1.png
 #        ${TEMP}/WatershedSegmentation1Output1.png
 #        $<TARGET_FILE:WatershedSegmentation>
@@ -204,7 +204,7 @@ otb_add_test(NAME seTeNeighborhoodConnectedImageFilterTest3 COMMAND ${OTB_TEST_D
 # ------- WatershedSegmentationTest----------
 
 otb_add_test(NAME seTeWatershedSegmentationTest2 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/WatershedSegmentation1Output2.png
     ${TEMP}/WatershedSegmentation1Output2.png
   $<TARGET_FILE:WatershedSegmentation>
@@ -216,7 +216,7 @@ otb_add_test(NAME seTeWatershedSegmentationTest2 COMMAND ${OTB_TEST_DRIVER}
 # ------- ConnectedThresholdImageFilterTest----------
 
 otb_add_test(NAME seTeConnectedThresholdImageFilterTest1 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ConnectedThresholdOutput1.png
     ${TEMP}/ConnectedThresholdOutput1.png
   $<TARGET_FILE:ConnectedThresholdImageFilter>
@@ -228,7 +228,7 @@ otb_add_test(NAME seTeConnectedThresholdImageFilterTest1 COMMAND ${OTB_TEST_DRIV
 # ------- ConnectedThresholdImageFilterTest----------
 
 otb_add_test(NAME seTeConnectedThresholdImageFilterTest2 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ConnectedThresholdOutput2.png
     ${TEMP}/ConnectedThresholdOutput2.png
   $<TARGET_FILE:ConnectedThresholdImageFilter>
@@ -240,7 +240,7 @@ otb_add_test(NAME seTeConnectedThresholdImageFilterTest2 COMMAND ${OTB_TEST_DRIV
 # ------- ConnectedThresholdImageFilterTest----------
 
 otb_add_test(NAME seTeConnectedThresholdImageFilterTest3 COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/ConnectedThresholdOutput3.png
     ${TEMP}/ConnectedThresholdOutput3.png
   $<TARGET_FILE:ConnectedThresholdImageFilter>
@@ -252,7 +252,7 @@ otb_add_test(NAME seTeConnectedThresholdImageFilterTest3 COMMAND ${OTB_TEST_DRIV
 # ------- OtsuMultipleThresholdImageFilterTest----------
 
 otb_add_test(NAME seTeOtsuMultipleThresholdImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 3
+  --compare-n-images ${NOTOL} 3
     ${BASELINE}/OtsuMultipleThresholdsOutput000.png
     ${TEMP}/OtsuMultipleThresholdsOutput000.png
     ${BASELINE}/OtsuMultipleThresholdsOutput001.png
@@ -269,7 +269,7 @@ otb_add_test(NAME seTeOtsuMultipleThresholdImageFilterTest COMMAND ${OTB_TEST_DR
 # ------- LabelizeNeighborhoodConnectedImageFilterTest----------
 
 otb_add_test(NAME seTeLabelizeNeighborhoodConnectedImageFilterTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 1
+  --compare-n-images ${NOTOL} 1
     ${BASELINE}/LabelizeNeighborhoodConnectedImageFilterOutput.png
     ${TEMP}/LabelizeNeighborhoodConnectedImageFilterOutput.png
   $<TARGET_FILE:LabelizeNeighborhoodConnectedImageFilter>
diff --git a/Examples/Tutorials/test/CMakeLists.txt b/Examples/Tutorials/test/CMakeLists.txt
index 75f576cc4c03cc005b88fa638a5604d3bb4235e1..5bb8c58f02fb41e337853a01d8058a8bfc821cc2 100644
--- a/Examples/Tutorials/test/CMakeLists.txt
+++ b/Examples/Tutorials/test/CMakeLists.txt
@@ -4,7 +4,7 @@ otb_add_test(NAME  trTeTutorialsHelloWorld COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME  trTeTutorialsPipelineTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/TutorialsPipelineOutput.png
     ${TEMP}/TutorialsPipelineOutput.png
   $<TARGET_FILE:Pipeline>
@@ -13,7 +13,7 @@ otb_add_test(NAME  trTeTutorialsPipelineTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME  trTeTutorialsFilteringPipelineTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/TutorialsFilteringPipelineOutput.png
     ${TEMP}/TutorialsFilteringPipelineOutput.png
   $<TARGET_FILE:FilteringPipeline>
@@ -22,7 +22,7 @@ otb_add_test(NAME  trTeTutorialsFilteringPipelineTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME  trTeTutorialsScalingPipelineTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/TutorialsScalingPipelineOutput.png
     ${TEMP}/TutorialsScalingPipelineOutput.png
   $<TARGET_FILE:ScalingPipeline>
@@ -31,7 +31,7 @@ otb_add_test(NAME  trTeTutorialsScalingPipelineTest COMMAND ${OTB_TEST_DRIVER}
 )
 
 otb_add_test(NAME  trTeTutorialsMultispectralTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-n-images ${TOL} 2
+  --compare-n-images ${NOTOL} 2
     ${BASELINE}/MultispectralOutput1.tif
     ${TEMP}/MultispectralOutput1.tif
     ${BASELINE}/MultispectralOutput2.tif
@@ -44,7 +44,7 @@ otb_add_test(NAME  trTeTutorialsMultispectralTest COMMAND ${OTB_TEST_DRIVER}
 
 
 otb_add_test(NAME  trTeTutorialsSmarterFilteringPipelineTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/TutorialsSmarterFilteringPipelineOutput.png
     ${TEMP}/TutorialsSmarterFilteringPipelineOutput.png
   $<TARGET_FILE:SmarterFilteringPipeline>
@@ -56,7 +56,7 @@ otb_add_test(NAME  trTeTutorialsSmarterFilteringPipelineTest COMMAND ${OTB_TEST_
 )
 
 otb_add_test(NAME  trTeTutorialsOrthoFusionTest COMMAND ${OTB_TEST_DRIVER}
-  --compare-image ${TOL}
+  --compare-image ${NOTOL}
     ${BASELINE}/TutorialsOrthoFusionOutput.tif
     ${TEMP}/TutorialsOrthoFusionOutput.tif
   $<TARGET_FILE:OrthoFusion>