diff --git a/Modules/DiffusionImaging/FiberTracking/Testing/CMakeLists.txt b/Modules/DiffusionImaging/FiberTracking/Testing/CMakeLists.txt
index 2587dd900c..0e1e716e8b 100644
--- a/Modules/DiffusionImaging/FiberTracking/Testing/CMakeLists.txt
+++ b/Modules/DiffusionImaging/FiberTracking/Testing/CMakeLists.txt
@@ -1,6 +1,7 @@
 MITK_CREATE_MODULE_TESTS()
 
 mitkAddCustomModuleTest(mitkFiberBundleXReaderWriterTest mitkFiberBundleXReaderWriterTest ${MITK_DATA_DIR}/DiffusionImaging/fiberBundleX.fib)
 #mitkAddCustomModuleTest(mitkGibbsTrackingTest mitkGibbsTrackingTest ${MITK_DATA_DIR}/DiffusionImaging/qBallImage.qbi ${MITK_DATA_DIR}/DiffusionImaging/diffusionImageMask.nrrd ${MITK_DATA_DIR}/DiffusionImaging/gibbsTrackingParameters.gtp ${MITK_DATA_DIR}/DiffusionImaging/fiberBundleX.fib)
 #mitkAddCustomModuleTest(mitkFiberBundleXTest mitkFiberBundleXTest ${MITK_DATA_DIR}/DiffusionImaging/fiberBundleX.fib)
 mitkAddCustomModuleTest(mitkStreamlineTrackingTest mitkStreamlineTrackingTest ${MITK_DATA_DIR}/DiffusionImaging/tensorImage.dti ${MITK_DATA_DIR}/DiffusionImaging/diffusionImageMask.nrrd ${MITK_DATA_DIR}/DiffusionImaging/streamlineTractogram.fib)
+mitkAddCustomModuleTest(mitkPeakExtractionTest mitkPeakExtractionTest ${MITK_DATA_DIR}/DiffusionImaging/qBallImage_SHCoeffs.nrrd ${MITK_DATA_DIR}/DiffusionImaging/diffusionImageMask.nrrd ${MITK_DATA_DIR}/DiffusionImaging/qBallImage_VectorField.fib)
diff --git a/Modules/DiffusionImaging/FiberTracking/Testing/files.cmake b/Modules/DiffusionImaging/FiberTracking/Testing/files.cmake
index 05e7339667..e4f646dbf1 100644
--- a/Modules/DiffusionImaging/FiberTracking/Testing/files.cmake
+++ b/Modules/DiffusionImaging/FiberTracking/Testing/files.cmake
@@ -1,8 +1,9 @@
 SET(MODULE_CUSTOM_TESTS
   mitkFiberBundleXReaderWriterTest.cpp
   mitkFiberBundleXTest.cpp
   mitkGibbsTrackingTest.cpp
   mitkStreamlineTrackingTest.cpp
+  mitkPeakExtractionTest.cpp
 )
 
 
diff --git a/Modules/DiffusionImaging/FiberTracking/Testing/mitkPeakExtractionTest.cpp b/Modules/DiffusionImaging/FiberTracking/Testing/mitkPeakExtractionTest.cpp
new file mode 100755
index 0000000000..2c00150dc2
--- /dev/null
+++ b/Modules/DiffusionImaging/FiberTracking/Testing/mitkPeakExtractionTest.cpp
@@ -0,0 +1,115 @@
+/*===================================================================
+
+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 <itkImageFileWriter.h>
+#include <itkResampleImageFilter.h>
+#include <itkFiniteDiffOdfMaximaExtractionFilter.h>
+
+#include <mitkBaseDataIOFactory.h>
+#include <mitkDiffusionImage.h>
+#include <mitkQBallImage.h>
+#include <mitkImageCast.h>
+#include <mitkImageToItk.h>
+#include <mitkTensorImage.h>
+
+#include <mitkDiffusionCoreObjectFactory.h>
+#include <mitkFiberTrackingObjectFactory.h>
+#include <mitkCoreExtObjectFactory.h>
+#include <mitkCoreObjectFactory.h>
+#include <mitkFiberBundleXWriter.h>
+#include <itkShCoefficientImageImporter.h>
+#include <mitkNrrdQBallImageWriter.h>
+#include <itkFlipImageFilter.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp>
+#include <mitkTestingMacros.h>
+#include <mitkIOUtil.h>
+
+using namespace std;
+
+int mitkPeakExtractionTest(int argc, char* argv[])
+{
+    MITK_TEST_BEGIN("mitkStreamlineTrackingTest");
+
+    MITK_TEST_CONDITION_REQUIRED(argc>3,"check for input data")
+
+    string shCoeffFileName = argv[1];
+    string maskFileName = argv[2];
+    string referenceFileName = argv[3];
+
+    MITK_INFO << "SH-coefficient file: " << shCoeffFileName;
+    MITK_INFO << "Mask file: " << maskFileName;
+    MITK_INFO << "Reference fiber file: " << referenceFileName;
+
+    try
+    {
+        mitk::CoreObjectFactory::GetInstance();
+
+        RegisterDiffusionCoreObjectFactory();
+        RegisterFiberTrackingObjectFactory();
+
+        mitk::Image::Pointer image = mitk::IOUtil::LoadImage(shCoeffFileName);
+        mitk::Image::Pointer mitkMaskImage = mitk::IOUtil::LoadImage(maskFileName);
+
+        typedef itk::Image<unsigned char, 3>  ItkUcharImgType;
+        typedef itk::FiniteDiffOdfMaximaExtractionFilter< float, 4, 20242 > MaximaExtractionFilterType;
+        typename MaximaExtractionFilterType::Pointer filter = MaximaExtractionFilterType::New();
+
+        MITK_INFO << "Casting mask image ...";
+        ItkUcharImgType::Pointer itkMask = ItkUcharImgType::New();
+        mitk::CastToItkImage<ItkUcharImgType>(mitkMaskImage, itkMask);
+        filter->SetMaskImage(itkMask);
+
+        MITK_INFO << "Casting SH image ...";
+        typedef mitk::ImageToItk< typename MaximaExtractionFilterType::CoefficientImageType > CasterType;
+        typename CasterType::Pointer caster = CasterType::New();
+        caster->SetInput(image);
+        caster->Update();
+        filter->SetInput(caster->GetOutput());
+        filter->SetMaxNumPeaks(2);
+        filter->SetPeakThreshold(0.4);
+        filter->SetAbsolutePeakThreshold(0.01);
+        filter->SetAngularThreshold(25);
+        filter->SetNormalizationMethod(MaximaExtractionFilterType::MAX_VEC_NORM);
+        MITK_INFO << "Starting extraction ...";
+        filter->Update();
+        mitk::FiberBundleX::Pointer fib1 = filter->GetOutputFiberBundle();
+
+        MITK_INFO << "Loading reference ...";
+        const std::string s1="", s2="";
+        std::vector<mitk::BaseData::Pointer> infile = mitk::BaseDataIO::LoadBaseDataFromFile( referenceFileName, s1, s2, false );
+        mitk::FiberBundleX::Pointer fib2 = dynamic_cast<mitk::FiberBundleX*>(infile.at(0).GetPointer());
+
+        MITK_TEST_CONDITION_REQUIRED(fib1->Equals(fib2), "Check if tractograms are equal.");
+    }
+    catch (itk::ExceptionObject e)
+    {
+        MITK_INFO << e;
+        return EXIT_FAILURE;
+    }
+    catch (std::exception e)
+    {
+        MITK_INFO << e.what();
+        return EXIT_FAILURE;
+    }
+    catch (...)
+    {
+        MITK_INFO << "ERROR!?!";
+        return EXIT_FAILURE;
+    }
+
+    MITK_TEST_END();
+}
diff --git a/Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTrackingTest.cpp b/Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTrackingTest.cpp
index 7455227b3b..14c6008ed0 100755
--- a/Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTrackingTest.cpp
+++ b/Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTrackingTest.cpp
@@ -1,135 +1,129 @@
 /*===================================================================
 
 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 <mitkImageCast.h>
 #include <mitkTensorImage.h>
 #include <mitkIOUtil.h>
 #include <mitkBaseDataIOFactory.h>
 #include <mitkDiffusionCoreObjectFactory.h>
 #include <mitkFiberTrackingObjectFactory.h>
 #include <mitkFiberBundleX.h>
 #include <itkStreamlineTrackingFilter.h>
 #include <itkDiffusionTensor3D.h>
 #include <mitkTestingMacros.h>
 
 using namespace std;
 
 int mitkStreamlineTrackingTest(int argc, char* argv[])
 {
     MITK_TEST_BEGIN("mitkStreamlineTrackingTest");
 
-    MITK_INFO << "BLA1";
-
     MITK_TEST_CONDITION_REQUIRED(argc>3,"check for input data")
 
-    MITK_INFO << "BLA2";
-
     string dtiFileName = argv[1];
     string maskFileName = argv[2];
     string referenceFileName = argv[3];
 
-    MITK_INFO << "BLA3";
-
     MITK_INFO << "DTI file: " << dtiFileName;
     MITK_INFO << "Mask file: " << maskFileName;
     MITK_INFO << "Reference fiber file: " << referenceFileName;
 
     float minFA = 0.05;
     float minCurv = -1;
     float stepSize = -1;
     float tendf = 1;
     float tendg = 0;
     float minLength = 20;
     int numSeeds = 1;
     bool interpolate = false;
 
     try
     {
         RegisterDiffusionCoreObjectFactory();
         RegisterFiberTrackingObjectFactory();
 
         // load input image
         const std::string s1="", s2="";
         std::vector<mitk::BaseData::Pointer> infile = mitk::BaseDataIO::LoadBaseDataFromFile( dtiFileName, s1, s2, false );
 
         MITK_INFO << "Loading tensor image ...";
         typedef itk::Image< itk::DiffusionTensor3D<float>, 3 >    ItkTensorImage;
         mitk::TensorImage::Pointer mitkTensorImage = dynamic_cast<mitk::TensorImage*>(infile.at(0).GetPointer());
         ItkTensorImage::Pointer itk_dti = ItkTensorImage::New();
         mitk::CastToItkImage<ItkTensorImage>(mitkTensorImage, itk_dti);
 
         MITK_INFO << "Loading seed image ...";
         typedef itk::Image< unsigned char, 3 >    ItkUCharImageType;
         mitk::Image::Pointer mitkSeedImage = mitk::IOUtil::LoadImage(maskFileName);
 
         MITK_INFO << "Loading mask image ...";
         mitk::Image::Pointer mitkMaskImage = mitk::IOUtil::LoadImage(maskFileName);
 
         // instantiate tracker
         typedef itk::StreamlineTrackingFilter< float > FilterType;
         FilterType::Pointer filter = FilterType::New();
         filter->SetInput(itk_dti);
         filter->SetSeedsPerVoxel(numSeeds);
         filter->SetFaThreshold(minFA);
         filter->SetMinCurvatureRadius(minCurv);
         filter->SetStepSize(stepSize);
         filter->SetF(tendf);
         filter->SetG(tendg);
         filter->SetInterpolate(interpolate);
         filter->SetMinTractLength(minLength);
 
         if (mitkSeedImage.IsNotNull())
         {
             ItkUCharImageType::Pointer mask = ItkUCharImageType::New();
             mitk::CastToItkImage<ItkUCharImageType>(mitkSeedImage, mask);
             filter->SetSeedImage(mask);
         }
 
         if (mitkMaskImage.IsNotNull())
         {
             ItkUCharImageType::Pointer mask = ItkUCharImageType::New();
             mitk::CastToItkImage<ItkUCharImageType>(mitkMaskImage, mask);
             filter->SetMaskImage(mask);
         }
 
         filter->Update();
 
         vtkSmartPointer<vtkPolyData> fiberBundle = filter->GetFiberPolyData();
         mitk::FiberBundleX::Pointer fib1 = mitk::FiberBundleX::New(fiberBundle);
-        MITK_TEST_CONDITION_REQUIRED(fib1.IsNotNull(), "Check if reference tractogram is not null.");
 
         infile = mitk::BaseDataIO::LoadBaseDataFromFile( referenceFileName, s1, s2, false );
         mitk::FiberBundleX::Pointer fib2 = dynamic_cast<mitk::FiberBundleX*>(infile.at(0).GetPointer());
+        MITK_TEST_CONDITION_REQUIRED(fib2.IsNotNull(), "Check if reference tractogram is not null.");
         MITK_TEST_CONDITION_REQUIRED(fib1->Equals(fib2), "Check if tractograms are equal.");
     }
     catch (itk::ExceptionObject e)
     {
         MITK_INFO << e;
         return EXIT_FAILURE;
     }
     catch (std::exception e)
     {
         MITK_INFO << e.what();
         return EXIT_FAILURE;
     }
     catch (...)
     {
         MITK_INFO << "ERROR!?!";
         return EXIT_FAILURE;
     }
 
     MITK_TEST_END();
 }