diff --git a/Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp b/Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp
index ab62099932..29e3fc56c2 100644
--- a/Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp
+++ b/Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp
@@ -1,56 +1,187 @@
 /*=========================================================================
 
 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 "mitkTrackingDeviceSourceConfigurator.h"
 #include <mitkClaronTrackingDevice.h>
+#include <mitkNDITrackingDevice.h>
 #include <mitkNavigationTool.h>
 #include <mitkTestingMacros.h>
+#include <mitkStandardFileLocations.h>
 
 class mitkTrackingDeviceSourceConfiguratorTestClass
 {
 public:
 
   static void TestInstantiation()
   {
     // let's create an object of our class
     mitk::TrackingDeviceSourceConfigurator::Pointer testInstance;
     mitk::NavigationToolStorage::Pointer emptyStorage = mitk::NavigationToolStorage::New();
     mitk::TrackingDevice::Pointer dummyDevice = mitk::ClaronTrackingDevice::New();
     testInstance = mitk::TrackingDeviceSourceConfigurator::New(emptyStorage,dummyDevice);
     MITK_TEST_CONDITION_REQUIRED(testInstance.IsNotNull(),"Testing instantiation:");
   }
 
-  static void TestSimpleClaronTrackingDevice()
+  static void TestInvalidClaronTrackingDevice()
   {
+    MITK_TEST_OUTPUT(<<"Testing simple claron tracking device with 2 invalid tools");
+
+    mitk::TrackingDeviceSourceConfigurator::Pointer testInstance;
+
+    mitk::NavigationToolStorage::Pointer claronStorage = mitk::NavigationToolStorage::New();
+
+    //create invalid tool 1
+    mitk::NavigationTool::Pointer firstTool = mitk::NavigationTool::New();
+    firstTool->SetTrackingDeviceType(mitk::ClaronMicron);
+    mitk::DataNode::Pointer firstNode = mitk::DataNode::New();
+    firstNode->SetName("Tool1");
+    firstTool->SetDataNode(firstNode);
+    claronStorage->AddTool(firstTool);
+
+    //create invalid tool 2
+    mitk::NavigationTool::Pointer secondTool = mitk::NavigationTool::New();
+    secondTool->SetTrackingDeviceType(mitk::ClaronMicron);
+    mitk::DataNode::Pointer secondNode = mitk::DataNode::New();
+    secondNode->SetName("Tool2");
+    secondTool->SetDataNode(secondNode);
+    claronStorage->AddTool(secondTool);
+    
+    mitk::TrackingDevice::Pointer testDevice = mitk::ClaronTrackingDevice::New();
+
+    testInstance = mitk::TrackingDeviceSourceConfigurator::New(claronStorage,testDevice);
+
+    mitk::TrackingDeviceSource::Pointer testSource = testInstance->CreateTrackingDeviceSource();
+    
+    MITK_TEST_CONDITION_REQUIRED(testSource.IsNull(),"..testing return value");
+    MITK_TEST_CONDITION_REQUIRED(testInstance->GetErrorMessage().size()>1,"..testing if there is an error message");
+
+    MITK_TEST_OUTPUT(<<"Testing simple claron tracking device with another 2 invalid tools");
+    
+    secondTool->SetTrackingDeviceType(mitk::NDIAurora);
+    claronStorage = mitk::NavigationToolStorage::New();
+    claronStorage->AddTool(secondTool);
+
+    testInstance = mitk::TrackingDeviceSourceConfigurator::New(claronStorage,testDevice);
+
+    MITK_TEST_CONDITION_REQUIRED(!testInstance->IsCreateTrackingDeviceSourcePossible(),"..testing if factory class detects the invalid data");
+
+    testSource = testInstance->CreateTrackingDeviceSource();
+
+    MITK_TEST_CONDITION_REQUIRED(testSource.IsNull(),"..testing return value");
+    MITK_TEST_CONDITION_REQUIRED(testInstance->GetErrorMessage().size()>1,"..testing if there is an error message");
+    MITK_TEST_CONDITION_REQUIRED(testInstance->GetUpdatedNavigationToolStorage()->GetToolCount()==1,"..testing if navigation tool storage is still there");
+
+    MITK_TEST_OUTPUT(<<"Testing other invalid test cases");
+    testInstance = mitk::TrackingDeviceSourceConfigurator::New(claronStorage,NULL);
+    MITK_TEST_CONDITION_REQUIRED(!testInstance->IsCreateTrackingDeviceSourcePossible(),"..(1) testing if factory class detects the invalid data");
+    testInstance = mitk::TrackingDeviceSourceConfigurator::New(NULL,testDevice);
+    MITK_TEST_CONDITION_REQUIRED(!testInstance->IsCreateTrackingDeviceSourcePossible(),"..(2) testing if factory class detects the invalid data");
+
+
+   
+  
+  }
+  static void TestValidClaronTrackingDevice()
+  {
+    MITK_TEST_OUTPUT(<<"Testing simple claron tracking device with 2 valid tools");
+
+    std::string toolFileName = mitk::StandardFileLocations::GetInstance()->FindFile("ClaronTool", "Modules/IGT/Testing/Data");
+    MITK_TEST_CONDITION(toolFileName.empty() == false, "Check if tool calibration of claron tool file exists");
+
     mitk::TrackingDeviceSourceConfigurator::Pointer testInstance;
 
     mitk::NavigationToolStorage::Pointer claronStorage = mitk::NavigationToolStorage::New();
 
+    //create valid tool 1
+    mitk::NavigationTool::Pointer firstTool = mitk::NavigationTool::New();
+    firstTool->SetTrackingDeviceType(mitk::ClaronMicron);
+    mitk::DataNode::Pointer firstNode = mitk::DataNode::New();
+    firstNode->SetName("Tool1");
+    firstTool->SetDataNode(firstNode);
+    firstTool->SetCalibrationFile(toolFileName);
+    firstTool->SetIdentifier("Tool#1");
+    claronStorage->AddTool(firstTool);
+
+    //create valid tool 2
+    mitk::NavigationTool::Pointer secondTool = mitk::NavigationTool::New();
+    secondTool->SetTrackingDeviceType(mitk::ClaronMicron);
+    mitk::DataNode::Pointer secondNode = mitk::DataNode::New();
+    secondNode->SetName("Tool2");
+    secondTool->SetDataNode(secondNode);
+    secondTool->SetCalibrationFile(toolFileName);
+    secondTool->SetIdentifier("Tool#2");
+    claronStorage->AddTool(secondTool);
+    
+    mitk::TrackingDevice::Pointer testDevice = mitk::ClaronTrackingDevice::New();
+
+    testInstance = mitk::TrackingDeviceSourceConfigurator::New(claronStorage,testDevice);
+
+    mitk::TrackingDeviceSource::Pointer testSource = testInstance->CreateTrackingDeviceSource();
+    
+    MITK_TEST_CONDITION_REQUIRED(testSource->GetNumberOfOutputs()==2,"testing number of outputs");
+    MITK_TEST_CONDITION_REQUIRED(testSource->GetTrackingDevice()->GetToolCount()==2,"testing tracking device");
+  }
+
+  static void TestNDIAuroraTrackingDevice()
+  {
+  
+  }
+
+  static void TestNDIPolarisTrackingDevice()
+  {
+    MITK_TEST_OUTPUT(<<"Testing simple NDI Polaris tracking device with 1 valid tool");
+
+    std::string toolFileName = mitk::StandardFileLocations::GetInstance()->FindFile("SROMFile.rom", "Modules/IGT/Testing/Data");
+    MITK_TEST_CONDITION(toolFileName.empty() == false, "..check if tool calibration of claron tool file exists");
+
+    mitk::TrackingDeviceSourceConfigurator::Pointer testInstance;
+
+    mitk::NavigationToolStorage::Pointer polarisStorage = mitk::NavigationToolStorage::New();
+
+    //create valid tool 1
     mitk::NavigationTool::Pointer firstTool = mitk::NavigationTool::New();
-    //firstTool
+    firstTool->SetTrackingDeviceType(mitk::NDIPolaris);
+    mitk::DataNode::Pointer firstNode = mitk::DataNode::New();
+    firstNode->SetName("Tool1");
+    firstTool->SetDataNode(firstNode);
+    firstTool->SetCalibrationFile(toolFileName);
+    firstTool->SetIdentifier("Tool#1");
+    polarisStorage->AddTool(firstTool);
+
+    mitk::NDITrackingDevice::Pointer ndiDevice = mitk::NDITrackingDevice::New();
+    ndiDevice->SetType(mitk::NDIPolaris);
+    mitk::TrackingDevice::Pointer testDevice = dynamic_cast<mitk::TrackingDevice*>(ndiDevice.GetPointer());
+
+    testInstance = mitk::TrackingDeviceSourceConfigurator::New(polarisStorage,testDevice);
 
+    mitk::TrackingDeviceSource::Pointer testSource = testInstance->CreateTrackingDeviceSource();
+    
+    MITK_TEST_CONDITION_REQUIRED(testSource->GetNumberOfOutputs()==1,"..testing number of outputs");
+    MITK_TEST_CONDITION_REQUIRED(testSource->GetTrackingDevice()->GetToolCount()==1,"..testing tracking device");
   }
 };
 
 int mitkTrackingDeviceSourceConfiguratorTest(int /* argc */, char* /*argv*/[])
 {
   MITK_TEST_BEGIN("TrackingDeviceConfigurator");
 
   mitkTrackingDeviceSourceConfiguratorTestClass::TestInstantiation();
+  mitkTrackingDeviceSourceConfiguratorTestClass::TestInvalidClaronTrackingDevice();
+  mitkTrackingDeviceSourceConfiguratorTestClass::TestValidClaronTrackingDevice();
   
   MITK_TEST_END();
 }
\ No newline at end of file