diff --git a/Modules/IGT/Testing/mitkNavigationDataEvaluationFilterTest.cpp b/Modules/IGT/Testing/mitkNavigationDataEvaluationFilterTest.cpp
index b8bee687bc..0a50b942cc 100644
--- a/Modules/IGT/Testing/mitkNavigationDataEvaluationFilterTest.cpp
+++ b/Modules/IGT/Testing/mitkNavigationDataEvaluationFilterTest.cpp
@@ -1,76 +1,111 @@
 /*=========================================================================
 
 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 "mitkNavigationDataEvaluationFilter.h"
 #include "mitkTestingMacros.h"
 
 /**Documentation
 * NavigationDataEvaluationFilter has a protected constructor and a protected itkNewMacro
 * so that only it's friend class ClaronTrackingDevice is able to instantiate
 * tool objects. Therefore, we derive from NavigationDataEvaluationFilter and add a
 * public itkNewMacro, so that we can instantiate and test the class
 */
 class NavigationDataEvaluationFilterTestClass : public mitk::NavigationDataEvaluationFilter
 {
+
+     /**************************** 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::NavigationDataEvaluationFilter::Pointer myNavigationDataEvaluationFilter = mitk::NavigationDataEvaluationFilter::New();
     MITK_TEST_CONDITION_REQUIRED(myNavigationDataEvaluationFilter.IsNotNull(),"Testing instantiation")
     }
 
 static void TestSimpleCase()
     {
     MITK_TEST_OUTPUT(<< "Starting simple test case...");
     mitk::NavigationData::Pointer testData = mitk::NavigationData::New();
     mitk::NavigationDataEvaluationFilter::Pointer myNavigationDataEvaluationFilter = mitk::NavigationDataEvaluationFilter::New();
     myNavigationDataEvaluationFilter->SetInput(testData);
     myNavigationDataEvaluationFilter->Update();
     testData->SetDataValid(true);
     myNavigationDataEvaluationFilter->Update();
     MITK_TEST_CONDITION_REQUIRED(myNavigationDataEvaluationFilter->GetNumberOfAnalysedNavigationData(0)==1,".. Testing GetNumberOfAnalysedNavigationData");
     mitk::Point3D test;
     test[0] = 1;
     test[1] = 1;
     test[2] = 1;
     testData->SetPosition(test);
     myNavigationDataEvaluationFilter->Update();
     MITK_TEST_CONDITION_REQUIRED(myNavigationDataEvaluationFilter->GetNumberOfAnalysedNavigationData(0)==2,".. Testing GetNumberOfAnalysedNavigationData (2nd test)");
     MITK_TEST_CONDITION_REQUIRED(myNavigationDataEvaluationFilter->GetNumberOfInvalidSamples(0)==1,".. Testing GetNumberOfInvalidSamples");
-    MITK_TEST_CONDITION_REQUIRED(((myNavigationDataEvaluationFilter->GetPercentageOfInvalidSamples(0)<33.34) && (myNavigationDataEvaluationFilter->GetPercentageOfInvalidSamples(0)>33.33)),".. Testing GetPercentageOfInvalidSamples");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPercentageOfInvalidSamples(0),33.33333333),".. Testing GetPercentageOfInvalidSamples");
     MITK_TEST_CONDITION_REQUIRED((myNavigationDataEvaluationFilter->GetPositionStandardDeviation(0)[0]==0.5),".. Testing GetPositionStandardDeviation");
-    MITK_TEST_CONDITION_REQUIRED(((myNavigationDataEvaluationFilter->GetPositionSampleStandardDeviation(0)[0]<0.708)&&(myNavigationDataEvaluationFilter->GetPositionSampleStandardDeviation(0)[0]>0.707)),".. Testing GetPositionStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPositionSampleStandardDeviation(0)[0],0.70710672),".. Testing GetPositionStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPositionErrorMean(0),0.8660254),".. Testing GetPositionErrorMean");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPositionErrorRMS(0),0.8660254),".. Testing GetPositionErrorRMS");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPositionErrorMax(0),0.8660254),".. Testing GetPositionErrorMax");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPositionErrorMedian(0),0.8660254),".. Testing GetPositionErrorMedian");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPositionErrorMin(0),0.8660254),".. Testing GetPositionErrorMin");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPositionErrorSampleStandardDeviation(0),0),".. Testing GetPositionErrorSampleStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetPositionErrorStandardDeviation(0),0),".. Testing GetPositionErrorStandardDeviation");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetQuaternionMean(0)[0],0),".. Testing GetQuaternionMean");
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetQuaternionStandardDeviation(0)[0],0),".. Testing GetQuaternionStandardDeviation");
+    myNavigationDataEvaluationFilter->ResetStatistic();
+    MITK_TEST_CONDITION_REQUIRED(equals(myNavigationDataEvaluationFilter->GetNumberOfAnalysedNavigationData(0),0),".. Testing ResetStatistic");
     }
 
 };
 
 /**
  * This function tests the NavigationDataEvaluationFilter class.
  */
 int mitkNavigationDataEvaluationFilterTest(int /* argc */, char* /*argv*/[])
 {
   // always start with this!
   MITK_TEST_BEGIN("NavigationDataEvaluationFilter")
   
   NavigationDataEvaluationFilterTestClass::TestInstantiation();
   NavigationDataEvaluationFilterTestClass::TestSimpleCase();
 
   // always end with this!
   MITK_TEST_END()
 }