diff --git a/Modules/Core/TestingHelper/files.cmake b/Modules/Core/TestingHelper/files.cmake
index 6e96a4b477..b34dbf0623 100644
--- a/Modules/Core/TestingHelper/files.cmake
+++ b/Modules/Core/TestingHelper/files.cmake
@@ -1,7 +1,8 @@
 file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   mitkRenderingTestHelper.cpp
   mitkInteractionTestHelper.cpp
+  mitkTestDynamicImageGenerator.cpp
 )
 
diff --git a/Modules/ModelFit/include/mitkTestDynamicImageGenerator.h b/Modules/Core/TestingHelper/include/mitkTestDynamicImageGenerator.h
similarity index 66%
rename from Modules/ModelFit/include/mitkTestDynamicImageGenerator.h
rename to Modules/Core/TestingHelper/include/mitkTestDynamicImageGenerator.h
index e5e3334662..67bc9f782e 100644
--- a/Modules/ModelFit/include/mitkTestDynamicImageGenerator.h
+++ b/Modules/Core/TestingHelper/include/mitkTestDynamicImageGenerator.h
@@ -1,45 +1,44 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef __TEST_ARTIFACT_GENERATOR_H
 #define __TEST_ARTIFACT_GENERATOR_H
 
 #include "itkImage.h"
 #include "itkImageRegionIterator.h"
 
 #include "mitkImage.h"
 #include "mitkImagePixelReadAccessor.h"
 
-#include "MitkModelFitExports.h"
+#include <MitkTestingHelperExports.h>
 
 namespace mitk
 {
   typedef itk::Image<int> TestImageType;
   typedef itk::Image<unsigned char> TestMaskType;
 
-  TestImageType::Pointer MITKMODELFIT_EXPORT GenerateTestImage(int factor = 1);
+  TestImageType::Pointer MITKTESTINGHELPER_EXPORT GenerateTestImage(int factor = 1);
 
-  TestMaskType::Pointer MITKMODELFIT_EXPORT GenerateTestMask();
+  TestMaskType::Pointer MITKTESTINGHELPER_EXPORT GenerateTestMask();
 
-  Image::Pointer MITKMODELFIT_EXPORT GenerateTestFrame(double timePoint);
+  Image::Pointer MITKTESTINGHELPER_EXPORT GenerateTestFrame(double timePoint);
 
-  Image::Pointer MITKMODELFIT_EXPORT GenerateTestMaskMITK();
-
-  Image::Pointer MITKMODELFIT_EXPORT GenerateDynamicTestImageMITK();
+  Image::Pointer MITKTESTINGHELPER_EXPORT GenerateTestMaskMITK();
 
+  Image::Pointer MITKTESTINGHELPER_EXPORT GenerateDynamicTestImageMITK();
 }
 
 #endif
diff --git a/Modules/ModelFit/src/TestingHelper/mitkTestDynamicImageGenerator.cpp b/Modules/Core/TestingHelper/src/mitkTestDynamicImageGenerator.cpp
similarity index 100%
rename from Modules/ModelFit/src/TestingHelper/mitkTestDynamicImageGenerator.cpp
rename to Modules/Core/TestingHelper/src/mitkTestDynamicImageGenerator.cpp
diff --git a/Modules/ModelFit/files.cmake b/Modules/ModelFit/files.cmake
index b73cc7d9d3..40d7ada4fc 100644
--- a/Modules/ModelFit/files.cmake
+++ b/Modules/ModelFit/files.cmake
@@ -1,77 +1,76 @@
 file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   Common/mitkExtractTimeGrid.cpp
   Common/mitkTimeGridHelper.cpp
   Common/mitkMaskedDynamicImageStatisticsGenerator.cpp
   Common/mitkModelFitConstants.cpp
   Common/mitkModelFitParameter.cpp
   Common/mitkModelFitCmdAppsHelper.cpp
   Common/mitkParameterFitImageGeneratorBase.cpp
   Common/mitkPixelBasedParameterFitImageGenerator.cpp
   Common/mitkROIBasedParameterFitImageGenerator.cpp
   Common/mitkModelFitInfo.cpp
   Common/mitkModelFitStaticParameterMap.cpp
   Common/mitkModelGenerator.cpp
   Common/mitkModelFitUIDHelper.cpp
   Common/mitkModelFitResultHelper.cpp
   Common/mitkScalarListLookupTable.cpp
   Common/mitkScalarListLookupTableProperty.cpp
   Common/mitkScalarListLookupTablePropertySerializer.cpp
   Common/mitkIModelFitProvider.cpp
   Common/mitkModelFitParameterValueExtraction.cpp
   Common/mitkBinaryImageToLabelSetImageFilter.cpp
   Common/mitkFormulaParser.cpp
   Common/mitkFresnel.cpp
   Common/mitkModelFitPlotDataHelper.cpp
   Common/mitkModelSignalImageGenerator.cpp
   Functors/mitkSimpleFunctorBase.cpp
   Functors/mitkSimpleFunctorPolicy.cpp
   Functors/mitkChiSquareFitCostFunction.cpp
   Functors/mitkReducedChiSquareFitCostFunction.cpp
   Functors/mitkConstraintCheckerBase.cpp
   Functors/mitkSimpleBarrierConstraintChecker.cpp
   Functors/mitkSquaredDifferencesFitCostFunction.cpp
   Functors/mitkSumOfSquaredDifferencesFitCostFunction.cpp
   Functors/mitkMVConstrainedCostFunctionDecorator.cpp
   Functors/mitkMVModelFitCostFunction.cpp
   Functors/mitkNormalizedSumOfSquaredDifferencesFitCostFunction.cpp
   Functors/mitkSVModelFitCostFunction.cpp
   Functors/mitkModelFitFunctorBase.cpp
   Functors/mitkLevenbergMarquardtModelFitFunctor.cpp
   Functors/mitkDummyModelFitFunctor.cpp
   Functors/mitkModelFitInfoSignalGenerationFunctor.cpp
   Functors/mitkIndexedValueFunctorPolicy.cpp
   Functors/mitkModelDataGenerationFunctor.cpp
   Models/mitkModelBase.cpp
   Models/mitkModelFactoryBase.cpp
   Models/mitkModelParameterizerBase.cpp
   Models/mitkLinearModel.cpp
   Models/mitkLinearModelFactory.cpp
   Models/mitkInitialParameterizationDelegateBase.cpp
   Models/mitkImageBasedParameterizationDelegate.cpp
   Models/mitkGenericParamModel.cpp
   Models/mitkGenericParamModelFactory.cpp
   Models/mitkGenericParamModelParameterizer.cpp
   Models/mitkValueBasedParameterizationDelegate.cpp
   Models/mitkT2DecayModel.cpp
   Models/mitkT2DecayModelFactory.cpp
   Models/mitkT2DecayModelParameterizer.cpp  
-  TestingHelper/mitkTestDynamicImageGenerator.cpp
   TestingHelper/mitkTestModel.cpp
   TestingHelper/mitkTestModelFactory.cpp
 )
 
 set(TPP_FILES
     include/itkMultiOutputNaryFunctorImageFilter.tpp
     include/itkMaskedStatisticsImageFilter.hxx
     include/itkMaskedNaryStatisticsImageFilter.hxx
 	include/mitkModelFitProviderBase.tpp
 )
 
 set(HXX_FILES
 )
 
 
 set(MOC_H_FILES
 )
diff --git a/Plugins/org.mitk.gui.qt.fit.demo/CMakeLists.txt b/Plugins/org.mitk.gui.qt.fit.demo/CMakeLists.txt
index c4a48e7ffc..22d8affbe5 100644
--- a/Plugins/org.mitk.gui.qt.fit.demo/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.fit.demo/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(org_mitk_gui_qt_fit_demo)
 
 mitk_create_plugin(
     EXPORT_DIRECTIVE FitGeneratorDemo_EXPORT
 	EXPORTED_INCLUDE_SUFFIXES src
-	MODULE_DEPENDS MitkQtWidgetsExt MitkModelFit MitkModelFitUI
+	MODULE_DEPENDS MitkQtWidgetsExt MitkTestingHelper MitkModelFit MitkModelFitUI
 )