diff --git a/Modules/ToFHardware/Testing/files.cmake b/Modules/ToFHardware/Testing/files.cmake
index 66a7fe95e0..b44ed99833 100644
--- a/Modules/ToFHardware/Testing/files.cmake
+++ b/Modules/ToFHardware/Testing/files.cmake
@@ -1,30 +1,30 @@
 set(MODULE_TESTS
   mitkThreadedToFRawDataReconstructionTest.cpp
   mitkToFCameraMITKPlayerControllerTest.cpp
   mitkToFCameraMITKPlayerDeviceTest.cpp
   mitkToFCameraPMDCamBoardControllerTest.cpp
   mitkToFCameraPMDCamBoardDeviceTest.cpp
 #  mitkToFCameraPMDRawDataCamBoardDeviceTest.cpp
   mitkToFCameraPMDCamCubeControllerTest.cpp
   mitkToFCameraPMDCamCubeDeviceTest.cpp
 # mitkToFCameraPMDRawDataCamCubeDeviceTest.cpp
   mitkToFCameraPMDControllerTest.cpp
   mitkToFCameraPMDDeviceTest.cpp
   mitkToFCameraPMDRawDataDeviceTest.cpp
   mitkToFCameraPMDMITKPlayerControllerTest.cpp
   mitkToFCameraPMDMITKPlayerDeviceTest.cpp
   mitkToFCameraPMDO3ControllerTest.cpp
   mitkToFCameraPMDO3DeviceTest.cpp
   mitkToFCameraPMDPlayerControllerTest.cpp
   mitkToFCameraPMDPlayerDeviceTest.cpp
   mitkToFImageCsvWriterTest.cpp
   mitkToFImageGrabberTest.cpp
   #mitkToFImageRecorderTest.cpp
-  #mitkToFImageRecorderFilterTest.cpp
+  mitkToFImageRecorderFilterTest.cpp
   mitkToFImageWriterTest.cpp
-  #mitkToFNrrdImageWriterTest.cpp
+  mitkToFNrrdImageWriterTest.cpp
   mitkToFOpenCVImageGrabberTest.cpp
   mitkKinectControllerTest.cpp
   mitkKinectDeviceTest.cpp
 )
 
diff --git a/Modules/ToFHardware/Testing/mitkToFNrrdImageWriterTest.cpp b/Modules/ToFHardware/Testing/mitkToFNrrdImageWriterTest.cpp
index cccabecadd..098120b25c 100644
--- a/Modules/ToFHardware/Testing/mitkToFNrrdImageWriterTest.cpp
+++ b/Modules/ToFHardware/Testing/mitkToFNrrdImageWriterTest.cpp
@@ -1,137 +1,137 @@
 /*===================================================================
 
 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 <mitkTestingMacros.h>
 #include <mitkToFNrrdImageWriter.h>
 #include <mitkImageGenerator.h>
 #include <mitkImageSliceSelector.h>
 #include "mitkItkImageFileReader.h"
 
 /**Documentation
  *  test for the class "ToFImageWriter".
  */
 int mitkToFNrrdImageWriterTest(int /* argc */, char* /*argv*/[])
 {
   MITK_TEST_BEGIN("ToFNrrdImageWriter");
 
   mitk::ToFNrrdImageWriter::Pointer tofNrrdWriter = mitk::ToFNrrdImageWriter::New();
   // testing correct initialization 
   MITK_TEST_CONDITION_REQUIRED(tofNrrdWriter.GetPointer(), "Testing initialization of test object!");
   MITK_TEST_CONDITION_REQUIRED(tofNrrdWriter->GetExtension() == ".nrrd", "testing initialization of extension member variable!");
 
   //GENERATE TEST DATA
   ////run the test with some unusual parameters
   unsigned int dimX = 255;
   unsigned int dimY = 178;
   unsigned int pixelNumber = dimX*dimY;
   unsigned int numOfFrames = 23; //or numberOfSlices
   ////create 3 images filled with random values
   mitk::Image::Pointer distanceImage = mitk::ImageGenerator::GenerateRandomImage<float>(dimX, dimY, numOfFrames,0, 1.0f, 1.0f);
   mitk::Image::Pointer amplitudeImage = mitk::ImageGenerator::GenerateRandomImage<float>(dimX, dimY, numOfFrames,0, 0.0f, 2000.0f);
   mitk::Image::Pointer intensityImage = mitk::ImageGenerator::GenerateRandomImage<float>(dimX, dimY, numOfFrames,0, 0.0f, 100000.0f);
 
   //SET NEEDED PARAMETER
   //file names on the disc
   std::string distanceImageFileName("distImg.nrrd");
   std::string amplitudeImageFileName("amplImg.nrrd");
   std::string intensityImageFileName("intImg.nrrd");
  
   // set file name methods
   tofNrrdWriter->SetDistanceImageFileName(distanceImageFileName);
   tofNrrdWriter->SetAmplitudeImageFileName(amplitudeImageFileName);
   tofNrrdWriter->SetIntensityImageFileName(intensityImageFileName);
-  tofNrrdWriter->SetCaptureWidth(dimX);
-  tofNrrdWriter->SetCaptureHeight(dimY);
+  tofNrrdWriter->SetToFCaptureWidth(dimX);
+  tofNrrdWriter->SetToFCaptureHeight(dimY);
   tofNrrdWriter->SetToFImageType(mitk::ToFNrrdImageWriter::ToFImageType3D);
   tofNrrdWriter->SetRGBImageSelected(false);
 
   //buffer for each slice
   float* distanceArray;
   float* amplitudeArray;
   float* intensityArray;
 
   float* distanceArrayRead;
   float* amplitudeArrayRead;
   float* intensityArrayRead;
 
   tofNrrdWriter->Open(); //open file/stream
 
   for(unsigned int i = 0; i < numOfFrames ; i++)
   { 
     distanceArray = (float*)distanceImage->GetSliceData(i, 0, 0)->GetData();
     amplitudeArray = (float*)amplitudeImage->GetSliceData(i, 0, 0)->GetData();
     intensityArray = (float*)intensityImage->GetSliceData(i, 0, 0)->GetData();
 
     //write (or add) the three slices to the file
     tofNrrdWriter->Add(distanceArray, amplitudeArray, intensityArray);
   }
  
   tofNrrdWriter->Close(); //close file
 
 
   //read in the three images from disc
   mitk::ItkImageFileReader::Pointer fileReader = mitk::ItkImageFileReader::New();
   fileReader->SetFileName(distanceImageFileName);
   fileReader->Update();
   mitk::Image::Pointer distanceImageRead = fileReader->GetOutput();
 
   fileReader = mitk::ItkImageFileReader::New();
   fileReader->SetFileName(amplitudeImageFileName);
   fileReader->Update();
   mitk::Image::Pointer amplitudeImageRead = fileReader->GetOutput();
 
   fileReader = mitk::ItkImageFileReader::New();
   fileReader->SetFileName(intensityImageFileName);
   fileReader->Update();
   mitk::Image::Pointer intensityImageRead = fileReader->GetOutput();
 
   bool readingCorrect = true;
   //  for all frames...
   for(unsigned int j=0; j < numOfFrames; j++)
   {
     //get one slice of each image and compare it
     //original data
     distanceArray = (float*)distanceImage->GetSliceData(j, 0, 0)->GetData();
     amplitudeArray = (float*)amplitudeImage->GetSliceData(j, 0, 0)->GetData();
     intensityArray = (float*)intensityImage->GetSliceData(j, 0, 0)->GetData();
 
     //data read from disc
     distanceArrayRead = (float*)distanceImageRead->GetSliceData(j, 0, 0)->GetData();
     amplitudeArrayRead = (float*)amplitudeImageRead->GetSliceData(j, 0, 0)->GetData();
     intensityArrayRead = (float*)intensityImageRead->GetSliceData(j, 0, 0)->GetData();
 
     //for all pixels
     for(unsigned int i=0; i<pixelNumber; i++)
     {
       //compare if input == output
       if(!mitk::Equal(distanceArrayRead[i], distanceArray[i]) ||
          !mitk::Equal(amplitudeArrayRead[i], amplitudeArray[i]) ||
          !mitk::Equal(intensityArrayRead[i], intensityArray[i]))
       {
         readingCorrect = false;
       }
     }
   }
 
   remove( distanceImageFileName.c_str() );
   remove( amplitudeImageFileName.c_str() );
   remove( intensityImageFileName.c_str() );
   MITK_TEST_CONDITION_REQUIRED(readingCorrect, "Testing if the output values are correct.");
 
   //delete created image files
 
   MITK_TEST_END();  
 }