diff --git a/Core/Code/Testing/CMakeLists.txt b/Core/Code/Testing/CMakeLists.txt
index 1e7921e310..5b1b207624 100644
--- a/Core/Code/Testing/CMakeLists.txt
+++ b/Core/Code/Testing/CMakeLists.txt
@@ -1,24 +1,24 @@
 MITK_CREATE_MODULE_TESTS(LABELS MITK-Core)
 # MITK_INSTALL_TARGETS(EXECUTABLES MitkTestDriver)
 
 mitkAddCustomModuleTest(mitkPicFileReaderTest_emptyFile mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic)
 
 mitkAddCustomModuleTest(mitkPicFileReaderTest_emptyGzipFile mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic.gz)
 
-mitkAddCustomModuleTest(mitkDICOMLocaleTest mitkDICOMLocaleTest ${MITK_DATA_DIR}/spacing-ok.dcm)
+mitkAddCustomModuleTest(mitkDICOMLocaleTest_spacingOk mitkDICOMLocaleTest ${MITK_DATA_DIR}/spacing-ok.dcm)
 
-mitkAddCustomModuleTest(mitkEventMapperTest mitkEventMapperTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml)
+mitkAddCustomModuleTest(mitkEventMapperTest_Test1And2 mitkEventMapperTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml)
 
 mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest ${MITK_DATA_DIR}/Pic3D.pic.gz ${MITK_DATA_DIR}/BallBinary30x30x30.pic.gz)
 
 mitkAddCustomModuleTest(mitkDataStorageTest_US4DCyl mitkDataStorageTest ${MITK_DATA_DIR}/US4DCyl.pic.gz)
 
 mitkAddCustomModuleTest(mitkStateMachineFactoryTest_TestStateMachine1_2 mitkStateMachineFactoryTest ${MITK_DATA_DIR}/TestStateMachine1.xml ${MITK_DATA_DIR}/TestStateMachine2.xml)
 
 ADD_TEST(mitkPointSetLocaleTest  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPointSetLocaleTest ${MITK_DATA_DIR}/pointSet.mps)
 SET_PROPERTY(TEST mitkPointSetLocaleTest PROPERTY LABELS MITK-Core)
 ADD_TEST(mitkPicFileReaderTest_emptyGzipFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic.gz)
 SET_PROPERTY(TEST mitkPicFileReaderTest_emptyGzipFile PROPERTY LABELS MITK-Core)
 
 ADD_TEST(mitkImageTest_brainImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageTest ${MITK_DATA_DIR}/brain.mhd)
-SET_PROPERTY(TEST mitkImageTest_brainImage PROPERTY LABELS MITK-Core)
\ No newline at end of file
+SET_PROPERTY(TEST mitkImageTest_brainImage PROPERTY LABELS MITK-Core)
diff --git a/Core/Code/Testing/mitkDICOMLocaleTest.cpp b/Core/Code/Testing/mitkDICOMLocaleTest.cpp
index 4ec22eb3e5..2d0cd7f55a 100644
--- a/Core/Code/Testing/mitkDICOMLocaleTest.cpp
+++ b/Core/Code/Testing/mitkDICOMLocaleTest.cpp
@@ -1,124 +1,127 @@
 /*=========================================================================
  
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision: 1.12 $
  
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
  
 =========================================================================*/
 
 /*
  This test is meant to reproduce the following error:
  
  - The machine or current user has a German locale.
  - This esp. means that stream IO expects the decimal separator as a comma: ","
  - DICOM files use a point "." as the decimal separator to be locale independent
  - The parser used by MITK (ITK's GDC) seems to use the current locale instead of the "C" or "POSIX" locale
  - This leads to spacings (and probably other numbers) being trimmed/rounded,
    e.g. the correct spacing of 0.314 is read as 1.0 etc.
 
 */
 
 #include "mitkDataNodeFactory.h"
 #include "mitkStandardFileLocations.h"
 
 #include "mitkTestingMacros.h"
 
 #include <list>
 #include <locale>
 #include <locale.h>
   
 bool mitkDICOMLocaleTestChangeLocale(const std::string& locale)
 {
   try
   {
     MITK_TEST_OUTPUT(<< " ** Changing locale from " << setlocale(LC_ALL, NULL) << " to '" << locale << "'");
     setlocale(LC_ALL, locale.c_str());
     std::locale l( locale.c_str() );
     std::cin.imbue(l);
     return true;
   }
   catch(...)
   {
     MITK_TEST_OUTPUT(<< "Could not activate locale " << locale);
     return false;
   }
 
 }
 
 void mitkDICOMLocaleTestWithReferenceImage(std::string filename)
 {
   mitk::Image::Pointer image;
   mitk::DataNodeFactory::Pointer factory = mitk::DataNodeFactory::New();
   factory->SetFileName( filename );
   factory->Update();
   MITK_TEST_CONDITION_REQUIRED(factory->GetNumberOfOutputs() > 0, "file loaded");
 
   mitk::DataNode::Pointer node = factory->GetOutput( 0 );
   image = dynamic_cast<mitk::Image*>(node->GetData());
   if(image.IsNull())
   {
     MITK_TEST_FAILED_MSG(<< "File "<< filename << " is not an image - test will not be applied." );
   
     return;
-  }  
+  }
+
+  MITK_INFO << "bug-7210-tmp output 0" << image->GetGeometry()->GetSpacing()[0];
+  MITK_INFO << "bug-7210-tmp output 1" << image->GetGeometry()->GetSpacing()[1];
   MITK_TEST_CONDITION_REQUIRED(mitk::Equal(image->GetGeometry()->GetSpacing()[0], 0.3141592), "correct x spacing");
   MITK_TEST_CONDITION_REQUIRED(mitk::Equal(image->GetGeometry()->GetSpacing()[1], 0.3141592), "correct y spacing");
 }
 
 int mitkDICOMLocaleTest(int argc, char* argv[])
 {
   MITK_TEST_BEGIN("DICOMLocaleTest");
 
   MITK_TEST_CONDITION_REQUIRED(argc >= 2, "Test if a file to load has been specified");
 
   std::string filename = argv[1];
 
   // load a reference DICOM file with the "C" locale being set
   mitkDICOMLocaleTestChangeLocale("C");
   mitkDICOMLocaleTestWithReferenceImage(filename);
   // load a reference DICOM file with German locales being set
   typedef std::list<std::string> StringList;
   StringList alllocales;
   alllocales.push_back("de_DE");
   alllocales.push_back("de_DE.utf8");
   alllocales.push_back("de_DE.UTF8");
   alllocales.push_back("de_DE@euro");
   alllocales.push_back("German_Germany");
 
   // QuickFix for MAC OS X
   // See for more the Bug #3894 comments
 #if defined (__APPLE__) || defined(MACOSX)
   alllocales.push_back("C");
 #endif
 
   unsigned int numberOfTestedGermanLocales(0);
 
   for (StringList::iterator iter = alllocales.begin();
        iter != alllocales.end();
        ++iter)
   {
     if ( mitkDICOMLocaleTestChangeLocale(*iter) )
     {
       ++numberOfTestedGermanLocales;
       mitkDICOMLocaleTestWithReferenceImage(filename);
     }
   }
 
   if(numberOfTestedGermanLocales == 0)
   {
     MITK_TEST_OUTPUT(<< "Warning: No German locale was found on the system.");
   }
   //MITK_TEST_CONDITION_REQUIRED( numberOfTestedGermanLocales > 0, "Verify that at least one German locale has been tested.");
  
   MITK_TEST_END();
 }