diff --git a/Modules/ImageStatistics/Testing/CMakeLists.txt b/Modules/ImageStatistics/Testing/CMakeLists.txt
index 20bc5e41dc..129d41a2c3 100644
--- a/Modules/ImageStatistics/Testing/CMakeLists.txt
+++ b/Modules/ImageStatistics/Testing/CMakeLists.txt
@@ -1,35 +1,34 @@
 MITK_CREATE_MODULE_TESTS()
 
 mitkAddCustomModuleTest(mitkRoiMeasurementsTests mitkRoiMeasurementsTest ${MITK_DATA_DIR}/ImageStatisticsTestData/)
 
 file(GLOB allHotSpotTests RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/Data/Hotspot" "${CMAKE_CURRENT_SOURCE_DIR}/Data/Hotspot/*.xml")
 foreach(testcase ${allHotSpotTests})
   string(REGEX REPLACE "[^a-zA-Z0-9_]" "_" testcaseName ${testcase})
-    message("Generate hotspot test 'mitkImageStatisticsHotspotTest_${testcaseName}'.")
   mitkAddCustomModuleTest(mitkImageStatisticsHotspotTest_${testcaseName} mitkImageStatisticsHotspotTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/Hotspot/${testcase})
 endforeach()
 
 #
 # The following lines may be activated to generate new test cases for mitkImageStatisticsHotspotTest.
 # Test cases are generated by mitkMultiGaussianTest. All .xml files in Data/TestGeneration/Input will
 # be processed and transformed into new .xml files containing statistics in Data/TestGeneration/Output.
 #
 if (false)
   set(testInputDir ${CMAKE_CURRENT_SOURCE_DIR}/Data/TestGeneration/Input)
   set(testOutputDir ${CMAKE_CURRENT_SOURCE_DIR}/Data/TestGeneration/Output)
   file(GLOB testcasesToGenerate RELATIVE "${testInputDir}" "${testInputDir}/*.xml")
 
   if (NOT EXISTS ${testOutputDir})
     file(MAKE_DIRECTORY ${testOutputDir})
   endif()
 
   foreach(testinput ${testcasesToGenerate})
     string(REGEX REPLACE "[^a-zA-Z0-9_]\\+" "_" testcaseName ${testinput})
     string(REGEX REPLACE "\\.xml" "" testoutput ${testinput})
     message("Generate hotspot test case '${testinput}'. Output in '${testoutput}.xml' and '${testoutput}.nrrd'")
     mitkAddCustomModuleTest(mitkMultiGaussianTest_${testcaseName}
                             mitkMultiGaussianTest
                             ${testOutputDir}/${testoutput}
                             ${testInputDir}/${testinput})
   endforeach()
 endif()
diff --git a/Modules/ImageStatistics/Testing/Data/Hotspot/GlobalPeakOutsideSegmentation_25_30.xml b/Modules/ImageStatistics/Testing/Data/Hotspot/GlobalPeakOutsideSegmentation_25_30.xml
index 194f8cfe75..0d3e2d2590 100644
--- a/Modules/ImageStatistics/Testing/Data/Hotspot/GlobalPeakOutsideSegmentation_25_30.xml
+++ b/Modules/ImageStatistics/Testing/Data/Hotspot/GlobalPeakOutsideSegmentation_25_30.xml
@@ -1,10 +1,10 @@
 <testcase>
   <testimage image-rows="20" image-columns="20" image-slices="17" numberOfGaussians="2" spacingX="2.5" spacingY="2.5" spacingZ="3" entireHotSpotInImage="1">
     <gaussian centerIndexX="6" centerIndexY="5" centerIndexZ="8" deviationX="8" deviationY="4" deviationZ="6" altitude="7"/>
-    <gaussian centerIndexX="18" centerIndexY="16" centerIndexZ="15" deviationX="9" deviationY="5" deviationZ="6" altitude="17"/>
+    <gaussian centerIndexX="18" centerIndexY="16" centerIndexZ="15" deviationX="9" deviationY="5" deviationZ="6" altitude="8"/>
   </testimage>
   <segmentation numberOfLabels="1" hotspotRadiusInMM="6.2035">
-    <roi label="1" maximumSizeX="10" minimumSizeX="0" maximumSizeY="10" minimumSizeY="0" maximumSizeZ="10" minimumSizeZ="0"/>
+    <roi label="1" maximumIndexX="10" minimumIndexX="0" maximumIndexY="10" minimumIndexY="0" maximumIndexZ="10" minimumIndexZ="0"/>
   </segmentation>
-  <statistic hotspotIndexX="7" hotspotIndexY="6" hotspotIndexZ="9" mean="6.98243" maximumIndexX="6" maximumIndexY="5" maximumIndexZ="8" maximum="7.28569" minimumIndexX="7" minimumIndexY="8" minimumIndexZ="8" minimum="6.36572"/>
+  <statistic hotspotIndexX="6" hotspotIndexY="5" hotspotIndexZ="8" mean="6.75591" maximumIndexX="6" maximumIndexY="5" maximumIndexZ="8" maximum="7.11787" minimumIndexX="6" minimumIndexY="3" minimumIndexZ="7" minimum="6.11548"/>
 </testcase>
diff --git a/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_10_20.xml b/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_10_20.xml
index a5cda737dc..cce013e12e 100644
--- a/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_10_20.xml
+++ b/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_10_20.xml
@@ -1,9 +1,9 @@
 <testcase>
   <testimage image-rows="50" image-columns="50" image-slices="25" numberOfGaussians="1" spacingX="1" spacingY="1" spacingZ="2" entireHotSpotInImage="1">
     <gaussian centerIndexX="22" centerIndexY="21" centerIndexZ="21" deviationX="5" deviationY="12" deviationZ="9" altitude="15"/>
   </testimage>
   <segmentation numberOfLabels="1" hotspotRadiusInMM="6.2035">
     <roi label="1" maximumSizeX="20" minimumSizeX="0" maximumSizeY="20" minimumSizeY="0" maximumSizeZ="20" minimumSizeZ="0"/>
   </segmentation>
-  <statistic hotspotIndexX="19" hotspotIndexY="19" hotspotIndexZ="19" mean="10.5388" maximumIndexX="22" maximumIndexY="21" maximumIndexZ="21" maximum="14.9607" minimumIndexX="13" minimumIndexY="18" minimumIndexZ="19" minimum="2.81517"/>
+  <statistic hotspotIndexX="20" hotspotIndexY="20" hotspotIndexZ="20" mean="11.6671" maximumIndexX="22" maximumIndexY="21" maximumIndexZ="21" maximum="14.9607" minimumIndexX="14" minimumIndexY="19" minimumIndexZ="20" minimum="4.09463"/>
 </testcase>
diff --git a/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_25_30.xml b/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_25_30.xml
index da43b4437a..74cc73aab8 100644
--- a/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_25_30.xml
+++ b/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_25_30.xml
@@ -1,11 +1,11 @@
 <testcase>
   <testimage image-rows="20" image-columns="20" image-slices="17" numberOfGaussians="3" spacingX="2.5" spacingY="2.5" spacingZ="3" entireHotSpotInImage="1">
     <gaussian centerIndexX="10" centerIndexY="10" centerIndexZ="10" deviationX="8" deviationY="4" deviationZ="6" altitude="18"/>
     <gaussian centerIndexX="3" centerIndexY="4" centerIndexZ="2" deviationX="9" deviationY="5" deviationZ="6" altitude="3"/>
     <gaussian centerIndexX="16" centerIndexY="17" centerIndexZ="13" deviationX="3" deviationY="7" deviationZ="6" altitude="1"/>
   </testimage>
   <segmentation numberOfLabels="1" hotspotRadiusInMM="6.2035">
     <roi label="1" maximumSizeX="10" minimumSizeX="0" maximumSizeY="10" minimumSizeY="0" maximumSizeZ="10" minimumSizeZ="0"/>
   </segmentation>
-  <statistic hotspotIndexX="9" hotspotIndexY="9" hotspotIndexZ="9" mean="16.8957" maximumIndexX="10" maximumIndexY="10" maximumIndexZ="10" maximum="18.4372" minimumIndexX="9" minimumIndexY="7" minimumIndexZ="8" minimum="13.9505"/>
+  <statistic hotspotIndexX="10" hotspotIndexY="10" hotspotIndexZ="10" mean="17.4882" maximumIndexX="10" maximumIndexY="10" maximumIndexZ="10" maximum="18.4372" minimumIndexX="10" minimumIndexY="12" minimumIndexZ="11" minimum="15.9072"/>
 </testcase>
diff --git a/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_40_30.xml b/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_40_30.xml
index 2325e770c5..50ab0588b9 100644
--- a/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_40_30.xml
+++ b/Modules/ImageStatistics/Testing/Data/Hotspot/PeakInMaxOutsideSegmentation_40_30.xml
@@ -1,9 +1,9 @@
 <testcase>
   <testimage image-rows="13" image-columns="13" image-slices="17" numberOfGaussians="1" spacingX="4" spacingY="4" spacingZ="3" entireHotSpotInImage="1">
     <gaussian centerIndexX="6" centerIndexY="6" centerIndexZ="5" deviationX="4" deviationY="6" deviationZ="9" altitude="12"/>
   </testimage>
   <segmentation numberOfLabels="1" hotspotRadiusInMM="6.2035">
     <roi label="1" maximumSizeX="6" minimumSizeX="0" maximumSizeY="6" minimumSizeY="0" maximumSizeZ="6" minimumSizeZ="0"/>
   </segmentation>
-  <statistic hotspotIndexX="5" hotspotIndexY="5" hotspotIndexZ="5" mean="11.1746" maximumIndexX="6" maximumIndexY="6" maximumIndexZ="5" maximum="11.9487" minimumIndexX="4" minimumIndexY="4" minimumIndexZ="5" minimum="9.98136"/>
+  <statistic hotspotIndexX="6" hotspotIndexY="6" hotspotIndexZ="5" mean="11.6775" maximumIndexX="6" maximumIndexY="6" maximumIndexZ="5" maximum="11.9487" minimumIndexX="5" minimumIndexY="5" minimumIndexZ="5" minimum="11.4237"/>
 </testcase>
diff --git a/Modules/ImageStatistics/Testing/Data/Hotspot/PeakNearBorder_40_30.xml b/Modules/ImageStatistics/Testing/Data/Hotspot/PeakNearBorder_40_30.xml
index d1308b95be..ba2cf59f35 100644
--- a/Modules/ImageStatistics/Testing/Data/Hotspot/PeakNearBorder_40_30.xml
+++ b/Modules/ImageStatistics/Testing/Data/Hotspot/PeakNearBorder_40_30.xml
@@ -1,10 +1,10 @@
 <testcase>
   <testimage image-rows="13" image-columns="13" image-slices="17" numberOfGaussians="2" spacingX="4" spacingY="4" spacingZ="3" entireHotSpotInImage="1">
     <gaussian centerIndexX="1" centerIndexY="2" centerIndexZ="1" deviationX="4" deviationY="6" deviationZ="9" altitude="17"/>
     <gaussian centerIndexX="10" centerIndexY="2" centerIndexZ="16" deviationX="4" deviationY="7" deviationZ="9" altitude="5"/>
   </testimage>
   <segmentation numberOfLabels="1" hotspotRadiusInMM="6.2035">
     <roi label="1" maximumSizeX="13" minimumSizeX="0" maximumSizeY="13" minimumSizeY="0" maximumSizeZ="17" minimumSizeZ="0"/>
   </segmentation>
-  <statistic hotspotIndexX="1" hotspotIndexY="2" hotspotIndexZ="2" mean="16.6116" maximumIndexX="1" maximumIndexY="2" maximumIndexZ="1" maximum="17.0276" minimumIndexX="0" minimumIndexY="2" minimumIndexZ="3" minimum="16.0884"/>
+  <statistic hotspotIndexX="2" hotspotIndexY="2" hotspotIndexZ="2" mean="16.1619" maximumIndexX="1" maximumIndexY="2" maximumIndexZ="1" maximum="17.0276" minimumIndexX="3" minimumIndexY="2" minimumIndexZ="3" minimum="14.9666"/>
 </testcase>
diff --git a/Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_10_20.xml b/Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_10_20.xml
index 71b5341f38..c8c308a82f 100644
--- a/Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_10_20.xml
+++ b/Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_10_20.xml
@@ -1,13 +1,13 @@
 <testcase>
   <testimage image-rows="50" image-columns="50" image-slices="25" numberOfGaussians="3" spacingX="1" spacingY="1" spacingZ="2" entireHotSpotInImage="1">
     <gaussian centerIndexX="22" centerIndexY="21" centerIndexZ="21" deviationX="5" deviationY="12" deviationZ="9" altitude="15"/>
     <gaussian centerIndexX="14" centerIndexY="4" centerIndexZ="15" deviationX="3" deviationY="17" deviationZ="3" altitude="10"/>
     <gaussian centerIndexX="2" centerIndexY="15" centerIndexZ="23" deviationX="8" deviationY="3" deviationZ="9" altitude="7"/>
   </testimage>
   <segmentation numberOfLabels="2" hotspotRadiusInMM="6.2035">
     <roi label="1" maximumSizeX="20" minimumSizeX="0" maximumSizeY="20" minimumSizeY="0" maximumSizeZ="10" minimumSizeZ="0"/>
     <roi label="2" maximumSizeX="50" minimumSizeX="22" maximumSizeY="50" minimumSizeY="22" maximumSizeZ="25" minimumSizeZ="12"/>
   </segmentation>
-  <statistic hotspotIndexX="19" hotspotIndexY="19" hotspotIndexZ="9" mean="5.08661" maximumIndexX="20" maximumIndexY="20" maximumIndexZ="12" maximum="8.95835" minimumIndexX="14" minimumIndexY="22" minimumIndexZ="8" minimum="1.88724"/>
+  <statistic hotspotIndexX="20" hotspotIndexY="20" hotspotIndexZ="10" mean="6.23992" maximumIndexX="21" maximumIndexY="20" maximumIndexZ="13" maximum="10.251" minimumIndexX="16" minimumIndexY="22" minimumIndexZ="8" minimum="2.89693"/>
   <statistic hotspotIndexX="22" hotspotIndexY="22" hotspotIndexZ="21" mean="12.6261" maximumIndexX="22" maximumIndexY="21" maximumIndexZ="21" maximum="15.0264" minimumIndexX="28" minimumIndexY="23" minimumIndexZ="21" minimum="7.20183"/>
 </testcase>
diff --git a/Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_40_30.xml b/Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_40_30.xml
index b21e372918..9a3c34693a 100644
--- a/Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_40_30.xml
+++ b/Modules/ImageStatistics/Testing/Data/Hotspot/TwoSegmentations_40_30.xml
@@ -1,12 +1,12 @@
 <testcase>
   <testimage image-rows="13" image-columns="13" image-slices="17" numberOfGaussians="2" spacingX="4" spacingY="4" spacingZ="3" entireHotSpotInImage="1">
     <gaussian centerIndexX="6" centerIndexY="6" centerIndexZ="5" deviationX="4" deviationY="6" deviationZ="9" altitude="12"/>
     <gaussian centerIndexX="12" centerIndexY="8" centerIndexZ="11" deviationX="3" deviationY="5" deviationZ="7" altitude="18"/>
   </testimage>
   <segmentation numberOfLabels="2" hotspotRadiusInMM="6.2035">
     <roi label="1" maximumSizeX="6" minimumSizeX="0" maximumSizeY="6" minimumSizeY="0" maximumSizeZ="6" minimumSizeZ="0"/>
     <roi label="2" maximumSizeX="13" minimumSizeX="8" maximumSizeY="13" minimumSizeY="8" maximumSizeZ="15" minimumSizeZ="8"/>
   </segmentation>
-  <statistic hotspotIndexX="5" hotspotIndexY="5" hotspotIndexZ="5" mean="11.935" maximumIndexX="6" maximumIndexY="6" maximumIndexZ="5" maximum="13.5247" minimumIndexX="4" minimumIndexY="4" minimumIndexZ="5" minimum="10.2468"/>
-  <statistic hotspotIndexX="11" hotspotIndexY="8" hotspotIndexZ="10" mean="20.6053" maximumIndexX="11" maximumIndexY="8" maximumIndexZ="10" maximum="21.2001" minimumIndexX="10" minimumIndexY="9" minimumIndexZ="10" minimum="19.412"/>
+  <statistic hotspotIndexX="6" hotspotIndexY="6" hotspotIndexZ="6" mean="13.4651" maximumIndexX="7" maximumIndexY="6" maximumIndexZ="7" maximum="14.8425" minimumIndexX="5" minimumIndexY="5" minimumIndexZ="6" minimum="12.1336"/>
+  <statistic hotspotIndexX="10" hotspotIndexY="8" hotspotIndexZ="10" mean="19.6405" maximumIndexX="11" maximumIndexY="8" maximumIndexZ="10" maximum="21.2001" minimumIndexX="9" minimumIndexY="9" minimumIndexZ="10" minimum="17.4011"/>
 </testcase>