diff --git a/Core/Code/Testing/mitkImageTimeSelectorTest.cpp b/Core/Code/Testing/mitkImageTimeSelectorTest.cpp
index e6e1464c66..265dc9a82d 100644
--- a/Core/Code/Testing/mitkImageTimeSelectorTest.cpp
+++ b/Core/Code/Testing/mitkImageTimeSelectorTest.cpp
@@ -1,119 +1,119 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #include "mitkImage.h"
 #include "mitkDataNodeFactory.h"
 #include "mitkImageTimeSelector.h"
 #include "mitkImageGenerator.h"
 
 #include "mitkTestingMacros.h"
 
 #include "mitkIOUtil.h"
 #include <itksys/SystemTools.hxx>
 
 #include <fstream>
 
 
 /** Global members common for all subtests */
 namespace
 {
   std::string m_Filename;
   mitk::Image::Pointer m_Image;
 } // end of anonymous namespace
 
 /** @brief Global test setup */
 static void Setup( )
 {
   try
   {
     m_Image = mitk::IOUtil::LoadImage( m_Filename );
   }
   catch( const itk::ExceptionObject &e)
   {
     MITK_TEST_FAILED_MSG(<< "(Setup) Caught exception from IOUtil while loading input : " << m_Filename <<"\n" << e.what())
   }
 }
 
 static void Valid_AllInputTimesteps_ReturnsTrue()
 {
   Setup();
 
   mitk::ImageTimeSelector::Pointer timeSelector = mitk::ImageTimeSelector::New();
   timeSelector->SetInput(m_Image);
 
   // test all timesteps
   const unsigned int maxTimeStep = m_Image->GetTimeSteps();
   for( unsigned int t=0; t<maxTimeStep; t++)
   {
     timeSelector->SetTimeNr(t);
     timeSelector->Update();
 
     mitk::Image::Pointer currentTimestepImage = timeSelector->GetOutput();
 
     std::stringstream ss;
     ss << " : Valid image in timestep " << t ;
 
     MITK_TEST_CONDITION_REQUIRED( currentTimestepImage.IsNotNull()
                                   , ss.str().c_str() );
   }
 
 
 }
 
 static void Valid_ImageExpandedByTimestep_ReturnsTrue()
 {
   Setup();
 
   mitk::ImageTimeSelector::Pointer timeSelector = mitk::ImageTimeSelector::New();
 
   const unsigned int maxTimeStep = m_Image->GetTimeSteps();
   mitk::TimeGeometry* tsg = m_Image->GetTimeGeometry();
   mitk::ProportionalTimeGeometry* ptg = dynamic_cast<mitk::ProportionalTimeGeometry*>(tsg);
   ptg->Expand(maxTimeStep+1);
   ptg->SetTimeStepGeometry( ptg->GetGeometryForTimeStep(0), maxTimeStep );
 
   mitk::Image::Pointer expandedImage = mitk::Image::New();
   expandedImage->Initialize( m_Image->GetPixelType(0), *tsg );
 
   timeSelector->SetInput(expandedImage);
 
   for( unsigned int t=0; t<maxTimeStep+1; t++)
   {
     timeSelector->SetTimeNr(t);
     timeSelector->Update();
 
     mitk::Image::Pointer currentTimestepImage = timeSelector->GetOutput();
 
     std::stringstream ss;
     ss << " : Valid image in timestep " << t ;
 
     MITK_TEST_CONDITION_REQUIRED( currentTimestepImage.IsNotNull()
                                   , ss.str().c_str() );
   }
 }
 
-int mitkImageTimeSelectorTest(int, char* [])
+int mitkImageTimeSelectorTest(int argc, char* argv[])
 {
   MITK_TEST_BEGIN(mitkImageTimeSelectorTest);
 
   m_Filename = std::string( argv[1] );
 
   Valid_AllInputTimesteps_ReturnsTrue();
   Valid_ImageExpandedByTimestep_ReturnsTrue();
 
   MITK_TEST_END();
 }
diff --git a/Core/Code/Testing/mitkMultiComponentImageDataComparisonFilterTest.cpp b/Core/Code/Testing/mitkMultiComponentImageDataComparisonFilterTest.cpp
index c64e14467e..77a3033270 100644
--- a/Core/Code/Testing/mitkMultiComponentImageDataComparisonFilterTest.cpp
+++ b/Core/Code/Testing/mitkMultiComponentImageDataComparisonFilterTest.cpp
@@ -1,81 +1,81 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 // mitk includes
 #include "mitkTestingMacros.h"
 #include "mitkMultiComponentImageDataComparisonFilter.h"
 #include "mitkItkImageFileReader.h"
 #include "mitkImageReadAccessor.h"
 
 #include "itkNumericTraits.h"
 
-int mitkMultiComponentImageDataComparisonFilterTest(int, char* [])
+int mitkMultiComponentImageDataComparisonFilterTest(int argc, char* argv[])
 {
   MITK_TEST_BEGIN("MultiComponentImageDataComparisonFilter");
 
   // instantiation
   mitk::MultiComponentImageDataComparisonFilter::Pointer testObject = mitk::MultiComponentImageDataComparisonFilter::New();
   MITK_TEST_CONDITION_REQUIRED(testObject.IsNotNull(), "Testing instantiation of test class!");
 
   MITK_TEST_CONDITION_REQUIRED(testObject->GetCompareFilterResult() == NULL, "Testing initialization of result struct" );
   MITK_TEST_CONDITION_REQUIRED(testObject->GetTolerance() == 0.0f, "Testing initialization of tolerance member");
   MITK_TEST_CONDITION_REQUIRED(testObject->GetResult() == false, "Testing initialization of CompareResult member");
 
   // initialize compare result struct and pass it to the filter
   mitk::CompareFilterResults compareResult;
   compareResult.m_MaximumDifference = 0.0f;
   compareResult.m_MinimumDifference = itk::NumericTraits<double>::max();
   compareResult.m_MeanDifference = 0.0f;
   compareResult.m_FilterCompleted = false;
   compareResult.m_TotalDifference = 0.0f;
   compareResult.m_PixelsWithDifference = 0;
   testObject->SetCompareFilterResult(&compareResult);
 
   MITK_TEST_CONDITION_REQUIRED(testObject->GetCompareFilterResult() != NULL, "Testing set/get of compare result struct" );
   MITK_TEST_CONDITION_REQUIRED(testObject->GetResult() == false, "CompareResult still false" );
 
   //now load an image with several components and present it to the filter
   mitk::ItkImageFileReader::Pointer imgReader = mitk::ItkImageFileReader::New();
   imgReader->SetFileName(argv[1]);
   imgReader->Update();
 
   mitk::Image::Pointer testImg = imgReader->GetOutput();
   mitk::Image::Pointer testImg2 = testImg->Clone();
 
   testObject->SetValidImage(testImg);
   testObject->SetTestImage(testImg2);
 
   MITK_TEST_CONDITION_REQUIRED(testObject->GetNumberOfIndexedInputs() == 2, "Testing correct handling of input images");
 
   testObject->Update();
 
   MITK_TEST_CONDITION_REQUIRED(testObject->GetResult(), "Testing filter processing with equal image data");
 
   // now change some of the data and check if the response is correct
   mitk::ImageReadAccessor imgAcc(testImg2);
   unsigned char* imgData = (unsigned char*) imgAcc.GetData();
   imgData[10] += 1;
   imgData[20] += 2;
   imgData[30] += 3;
 
   testObject->Update();
 
   MITK_TEST_CONDITION_REQUIRED(testObject->GetResult() == false, "Testing filter processing with unequal image data");
   MITK_TEST_CONDITION_REQUIRED(mitk::Equal((int)testObject->GetCompareFilterResult()->m_PixelsWithDifference, (int) 3) &&
     mitk::Equal((double)testObject->GetCompareFilterResult()->m_MaximumDifference, (double) 3.0) &&
     mitk::Equal((double)testObject->GetCompareFilterResult()->m_MeanDifference, (double) 2.0), "Assessing calculated image differences");
   MITK_TEST_END();
 }