diff --git a/Modules/ImageStatistics/Testing/mitkPointSetStatisticsCalculatorTest.cpp b/Modules/ImageStatistics/Testing/mitkPointSetStatisticsCalculatorTest.cpp
index c7b3e6fa84..a28c3915e1 100644
--- a/Modules/ImageStatistics/Testing/mitkPointSetStatisticsCalculatorTest.cpp
+++ b/Modules/ImageStatistics/Testing/mitkPointSetStatisticsCalculatorTest.cpp
@@ -1,41 +1,165 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date: 2008-02-25 17:27:17 +0100 (Mo, 25 Feb 2008) $
 Version:   $Revision: 7837 $
 
 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.
 
 =========================================================================*/
 
 #include "mitkStandardFileLocations.h"
 #include "mitkTestingMacros.h"
 #include "mitkPointSetStatisticsCalculator.h"
 
 //#include <QtCore>
 
 /**
  * \brief Test class for mitkPointSetStatisticsCalculator
  */
 class mitkPointSetStatisticsCalculatorTestClass
 {
+    /**************************** a few private help funktions ***********************************/
+     private:
+     /** @brief Rounds a double.
+      *  @param precision   number of tested decimal places */
+     static double round(double number, int precision)
+      {
+        double t = std::pow(10.,precision);
+        double returnValue = (int)(number*t+0.5)/t;
+        return returnValue;
+      }
+     /** @brief Tests two double values for equality.
+      *  @param precision   number of tested decimal places */
+    static bool equals(double a, double b, int precision = 5)
+      {
+      if (round(a,precision)==round(b,precision)) return true;
+      else 
+        {
+          std::cout << a << " is not " << b << std::endl;
+          return false;
+        }
+      }
+    /**********************************************************************************************/
 
 public:
 
+  static void TestInstantiation()
+    {
+    // let's create an object of our class
+    mitk::PointSetStatisticsCalculator::Pointer myPointSetStatisticsCalculator = mitk::PointSetStatisticsCalculator::New();
+    MITK_TEST_CONDITION_REQUIRED(myPointSetStatisticsCalculator.IsNotNull(),"Testing instantiation with constructor 1.");
+
+    mitk::PointSet::Pointer myTestPointSet = mitk::PointSet::New();
+    mitk::PointSetStatisticsCalculator::Pointer myPointSetStatisticsCalculator2 = mitk::PointSetStatisticsCalculator::New(myTestPointSet);
+    MITK_TEST_CONDITION_REQUIRED(myPointSetStatisticsCalculator2.IsNotNull(),"Testing instantiation with constructor 2.");
+    }
+
+static void TestSimpleCase()
+    {
+    
+    MITK_TEST_OUTPUT(<< "Starting simple test case...");
+
+    mitk::Point3D test;
+    mitk::PointSet::Pointer testPointSet = mitk::PointSet::New();
+
+    mitk::FillVector3D(test,0,0,0);
+    testPointSet->InsertPoint(0,test);
+
+    mitk::FillVector3D(test,1,1,1);
+    testPointSet->InsertPoint(1,test);
+
+    mitk::PointSetStatisticsCalculator::Pointer myPointSetStatisticsCalculator = mitk::PointSetStatisticsCalculator::New(testPointSet);
+  
+    MITK_TEST_CONDITION_REQUIRED((myPointSetStatisticsCalculator->GetPositionMean()[0]==0.5),".. Testing GetPositionMean");
+    MITK_TEST_CONDITION_REQUIRED((myPointSetStatisticsCalculator->GetPositionStandardDeviation()[0]==0.5),".. Testing GetPositionStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionSampleStandardDeviation()[0],0.70710672),".. Testing GetPositionStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorMean(),0.8660254),".. Testing GetPositionErrorMean");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorRMS(),0.8660254),".. Testing GetPositionErrorRMS");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorMax(),0.8660254),".. Testing GetPositionErrorMax");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorMedian(),0.8660254),".. Testing GetPositionErrorMedian");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorMin(),0.8660254),".. Testing GetPositionErrorMin");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorSampleStandardDeviation(),0),".. Testing GetPositionErrorSampleStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorStandardDeviation(),0),".. Testing GetPositionErrorStandardDeviation");
+    }
+
+static void TestComplexCase()
+    {
+    
+    MITK_TEST_OUTPUT(<< "Starting complex test case...");
+    mitk::Point3D testPoint;
+    mitk::PointSet::Pointer testPointSet = mitk::PointSet::New();
+   
+    //1st point
+    mitk::FillVector3D(testPoint,0,1,0);
+    testPointSet->InsertPoint(0,testPoint);
+
+    //2nd point
+    mitk::FillVector3D(testPoint,0,1,0.34);
+    testPointSet->InsertPoint(1,testPoint);
+
+    //3rd point
+    mitk::FillVector3D(testPoint,1,0.5,1);
+    testPointSet->InsertPoint(2,testPoint);
+
+    //4th point
+    mitk::FillVector3D(testPoint,15,3,2);
+    testPointSet->InsertPoint(3,testPoint);
+
+    //5th point
+    mitk::FillVector3D(testPoint,2,22.5,1.2655);
+    testPointSet->InsertPoint(4,testPoint);
+
+    //6th point
+    mitk::FillVector3D(testPoint,4,1.3,2);
+    testPointSet->InsertPoint(5,testPoint);
+
+    //7th point
+    mitk::FillVector3D(testPoint,0.001,0,1);
+    testPointSet->InsertPoint(6,testPoint);
+
+    //8th point
+    mitk::FillVector3D(testPoint,1.2525,2.22,3);
+    testPointSet->InsertPoint(7,testPoint);
+
+    //9th point
+    mitk::FillVector3D(testPoint,3.1,3,1);
+    testPointSet->InsertPoint(8,testPoint);
+
+    mitk::PointSetStatisticsCalculator::Pointer myPointSetStatisticsCalculator = mitk::PointSetStatisticsCalculator::New();
+    myPointSetStatisticsCalculator->SetPointSet(testPointSet);
+    
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionMean()[2],1.2895),".. Testing GetPositionMean");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionStandardDeviation()[2],0.86614074),".. Testing GetPositionStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionSampleStandardDeviation()[2],0.91868098),".. Testing GetPositionStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorMean(),6.06656587),".. Testing GetPositionErrorMean");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorRMS(),8.0793161),".. Testing GetPositionErrorRMS");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorMax(),18.6875241),".. Testing GetPositionErrorMax");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorMedian(),4.18522229),".. Testing GetPositionErrorMedian");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorMin(),0.90082741),".. Testing GetPositionErrorMin");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorSampleStandardDeviation(),5.65960626),".. Testing GetPositionErrorSampleStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myPointSetStatisticsCalculator->GetPositionErrorStandardDeviation(),5.33592795),".. Testing GetPositionErrorStandardDeviation");
+ 
+    }
+
 
 };
 
 int mitkPointSetStatisticsCalculatorTest(int argc, char* argv[])
 {
   // always start with this!
   MITK_TEST_BEGIN("mitkPointSetStatisticsCalculatorTest")
 
+  mitkPointSetStatisticsCalculatorTestClass::TestInstantiation();
+  mitkPointSetStatisticsCalculatorTestClass::TestSimpleCase();
+  mitkPointSetStatisticsCalculatorTestClass::TestComplexCase();
+
   MITK_TEST_END()
 }