diff --git a/testing/apps/CMakeLists.txt b/testing/apps/CMakeLists.txt
index 123c7f9..bd27832 100644
--- a/testing/apps/CMakeLists.txt
+++ b/testing/apps/CMakeLists.txt
@@ -1,24 +1,27 @@
+MESSAGE (STATUS "Process All apps Tests...")
 
-  MESSAGE (STATUS "Process All apps Tests...")
-
-  #-----------------------------------------------------------------------------
-  # Include sub directories
-  #-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
+# Include sub directories
+#-----------------------------------------------------------------------------
 IF(BUILD_App_DoseTool)
   ADD_SUBDIRECTORY (DoseTool)
-ENDIF(BUILD_App_DoseTool)
+  IF(RTTB_VIRTUOS_SUPPORT AND BUILD_IO_Virtuos)
+	ADD_SUBDIRECTORY (DoseTool4V)
+  ENDIF()
+ENDIF()
 
 IF(BUILD_App_VoxelizerTool)
   ADD_SUBDIRECTORY (VoxelizerTool)
-ENDIF(BUILD_App_VoxelizerTool)
+ENDIF()
 
 IF(BUILD_App_DoseMap AND BUILD_IO_Virtuos)
   ADD_SUBDIRECTORY (DoseMap)
 ENDIF()
+
 IF(BUILD_App_BioModelCalc)
   ADD_SUBDIRECTORY (BioModelCalc)
 ENDIF()
 
 IF(BUILD_App_DoseAcc)
   ADD_SUBDIRECTORY (DoseAcc)
 ENDIF()
\ No newline at end of file
diff --git a/testing/apps/DoseTool/CMakeLists.txt b/testing/apps/DoseTool/CMakeLists.txt
index 855f8c9..b9107d7 100644
--- a/testing/apps/DoseTool/CMakeLists.txt
+++ b/testing/apps/DoseTool/CMakeLists.txt
@@ -1,44 +1,35 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 SET(DOSETOOL_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbDoseToolTests)
 
 SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
 
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 IF(MSVC)
      ADD_DEFINITIONS(/bigobj)
 ENDIF()
 
 IF (WIN32)
 	SET(DOSETOOLEXE "DoseTool.exe")
-	SET(DOSETOOL4VEXE "DoseTool4V.exe")
 ELSE (WIN32)
 	SET(DOSETOOLEXE "./DoseTool")
-	SET(DOSETOOL4VEXE "./DoseTool4V")
 ENDIF (WIN32)
 
 ADD_TEST(DoseToolInvalidParametersTest ${DOSETOOL_TEST} DoseToolInvalidParametersTest ${DOSETOOLEXE})
-IF(RTTB_VIRTUOS_SUPPORT AND BUILD_IO_Virtuos)
-	ADD_TEST(DoseToolVirtuosDoseVirtuosStructTest ${DOSETOOL_TEST} DoseToolVirtuosDoseTest ${DOSETOOL4VEXE} "${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac101.dos.gz" "${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac101.pln"
-		"${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac000.vdx" "${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac000.ctx.gz" "DARM"
-		 "${TEST_DATA_ROOT}/DoseStatistics/XML/virtuos.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/virtuosComplex.xml")
-	 ADD_TEST(DoseToolITKDoseVirtuosStructTest ${DOSETOOL_TEST} DoseToolITKDoseTest ${DOSETOOL4VEXE} "${TEST_DATA_ROOT}/Dose/ITK/virtuosTestDose.mhd" "${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac000.vdx"
-	"${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac000.ctx.gz"  "DARM" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkVirtuosStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkVirtuosStructComplex.xml")
-ENDIF()
 ADD_TEST(DoseToolDicomDoseDicomStructTest ${DOSETOOL_TEST} DoseToolDicomDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom.xml" "${TEST_DATA_ROOT}/DVH/XML/dicompylerDVH.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/dicomComplex.xml")
-ADD_TEST(DoseToolITKDoseDicomStructTest ${DOSETOOL_TEST} DoseToolITKDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/ITK/dicompylerTestDose.mhd" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "" "Nodes"
+ADD_TEST(DoseToolITKDoseDicomStructTest ${DOSETOOL_TEST} DoseToolITKDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/ITK/dicompylerTestDose.mhd" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml")
 ADD_TEST(DoseToolDicomDoseDicomStructRegexTest ${DOSETOOL_TEST} DoseToolRegexTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "dicom" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "dicom" "Nodes|Heart"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom_heart.xml")
 ADD_TEST(DoseToolDVHTest ${DOSETOOL_TEST} DoseToolDVHTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DVH/XML/dicompylerDVH.xml")
 
 RTTB_CREATE_APPLICATION_TESTS(DoseTool DEPENDS RTTBOtherIO PACKAGE_DEPENDS Litmus BoostBinaries)
diff --git a/testing/apps/DoseTool/DoseToolDVHTest.cpp b/testing/apps/DoseTool/DoseToolDVHTest.cpp
index 18f1d9b..d2df53d 100644
--- a/testing/apps/DoseTool/DoseToolDVHTest.cpp
+++ b/testing/apps/DoseTool/DoseToolDVHTest.cpp
@@ -1,96 +1,96 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // 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.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1233 $ (last changed revision)
 // @date    $Date: 2016-01-20 15:47:47 +0100 (Mi, 20 Jan 2016) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #include "litCheckMacros.h"
 
 #include "../../io/other/CompareDVH.h"
 #include "rttbDVHXMLFileReader.h"
 
 #include "boost/filesystem.hpp"
 
 namespace rttb
 {
 	namespace testing
 	{
 
 		//path to the current running directory. DoseTool is in the same directory (Debug/Release)
 		extern const char* _callingAppPath;
 
 		int DoseToolDVHTest(int argc, char* argv[])
 		{
 			PREPARE_DEFAULT_TEST_REPORTING;
 
 			std::string doseToolExecutable;
 			std::string doseFilename;
 			std::string structFilename;
 			std::string structName;
 			std::string referenceXMLFilename;
 
 			boost::filesystem::path callingPath(_callingAppPath);
 
 			if (argc > 5)
 			{
 				doseToolExecutable = argv[1];
 				doseFilename = argv[2];
 				structFilename = argv[3];
 				structName = argv[4];
 				referenceXMLFilename = argv[5];
 			}
 
 			std::string voxelizerToolExeWithPath = callingPath.parent_path().string() + "/" +
 			                                       doseToolExecutable;
 
 			std::string defaultOutputFilename = "dicomDVHOutput.xml";
 
 			std::string baseCommand = voxelizerToolExeWithPath;
 			baseCommand += " -d " + doseFilename;
 			baseCommand += " -s " + structFilename;
 
 			if (structName != "")
 			{
 				baseCommand += " -n " + structName;
 			}
 			else
 			{
 				baseCommand += " -u itk ";
 			}
 
 			std::string defaultDVHCommand = baseCommand + " -z " + defaultOutputFilename;
 			std::cout << "Command line call: " + defaultDVHCommand << std::endl;
 			CHECK_EQUAL(system(defaultDVHCommand.c_str()), 0);
 
 			//check if file exists
 			CHECK_EQUAL(boost::filesystem::exists(defaultOutputFilename), true);
 
             io::other::DVHXMLFileReader xmlDVHDefaultReaderActual(defaultOutputFilename);
             DVHPointer defaultDVHActual = xmlDVHDefaultReaderActual.generateDVH();
 
             io::other::DVHXMLFileReader xmlDVHDefaultReaderExpected(referenceXMLFilename);
             DVHPointer defaultDVHExpected = xmlDVHDefaultReaderExpected.generateDVH();
             CHECK(checkEqualDVH(defaultDVHActual, defaultDVHExpected));
 
 			//delete file again
-			//CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
 
 			RETURN_AND_REPORT_TEST_SUCCESS;
 		}
 	} //namespace testing
 } //namespace rttb
diff --git a/testing/apps/DoseTool/DoseToolDicomDoseTest.cpp b/testing/apps/DoseTool/DoseToolDicomDoseTest.cpp
index 5301c47..53ec134 100644
--- a/testing/apps/DoseTool/DoseToolDicomDoseTest.cpp
+++ b/testing/apps/DoseTool/DoseToolDicomDoseTest.cpp
@@ -1,136 +1,136 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // 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.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1221 $ (last changed revision)
 // @date    $Date: 2015-12-01 13:43:31 +0100 (Di, 01 Dez 2015) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #include "rttbDoseStatisticsXMLReader.h"
 #include "rttbDVHXMLFileReader.h"
 #include "../../io/other/CompareDoseStatistic.h"
 #include "../../io/other/CompareDVH.h"
 
 #include "litCheckMacros.h"
 
 #include "boost/filesystem.hpp"
 
 namespace rttb
 {
 	namespace testing
 	{
 
 		//path to the current running directory. DoseTool is in the same directory (Debug/Release)
 		extern const char* _callingAppPath;
 
 		int DoseToolDicomDoseTest(int argc, char* argv[])
 		{
 			PREPARE_DEFAULT_TEST_REPORTING;
 
 			std::string doseToolExecutable;
 			std::string doseFilename;
 			std::string structFilename;
 			std::string structName;
 			std::string referenceXMLFilename;
 			std::string referenceDVHXMLFilename;
 			std::string referenceXMLComplexFilename;
 
 			boost::filesystem::path callingPath(_callingAppPath);
 
 
 			if (argc > 7)
 			{
 				doseToolExecutable = argv[1];
 				doseFilename = argv[2];
 				structFilename = argv[3];
 				structName = argv[4];
 				referenceXMLFilename = argv[5];
 				referenceDVHXMLFilename = argv[6];
 				referenceXMLComplexFilename = argv[7];
 			}
 
 			std::string doseToolExeWithPath = callingPath.parent_path().string() + "/" + doseToolExecutable;
 
 			std::string defaultOutputFilename = "dicomOutput.xml";
 			std::string defaultDVHOutputFilename = "dicomDVHOutput.xml";
 			std::string complexOutputFilename = "dicomOutputComplex.xml";
 
 			std::string baseCommand = doseToolExeWithPath;
 			baseCommand += " -d " + doseFilename;
 			baseCommand += " -s " + structFilename;
 
 			if (structName != "")
 			{
 				baseCommand += " -n " + structName;
 			}
 			else
 			{
 				baseCommand += " -u itk ";
 			}
 
 			std::string defaultDoseStatisticsCommand = baseCommand + " -y " + defaultOutputFilename;
 			std::cout << "Command line call: " + defaultDoseStatisticsCommand << std::endl;
 			CHECK_EQUAL(system(defaultDoseStatisticsCommand.c_str()), 0);
 
 			std::string defaultDoseStatisticsAndDVHCommand = defaultDoseStatisticsCommand + " -z " +
 			        defaultDVHOutputFilename;
 			std::cout << "Command line call: " + defaultDoseStatisticsAndDVHCommand << std::endl;
 			CHECK_EQUAL(system(defaultDoseStatisticsAndDVHCommand.c_str()), 0);
 
 			std::string complexDoseStatisticsCommand = baseCommand + " -y " + complexOutputFilename;
 			//prescribed dose is 14 Gy
 			complexDoseStatisticsCommand += " -f -p 14";
 
 			std::cout << "Command line call: " + complexDoseStatisticsCommand << std::endl;
 			CHECK_EQUAL(system(complexDoseStatisticsCommand.c_str()), 0);
 
 			//check if file exists
 			CHECK_EQUAL(boost::filesystem::exists(defaultOutputFilename), true);
 			CHECK_EQUAL(boost::filesystem::exists(complexOutputFilename), true);
 			CHECK_EQUAL(boost::filesystem::exists(defaultDVHOutputFilename), true);
 
 			//check if file has dose statistics that are same than these in than reference file
             io::other::DoseStatisticsXMLReader readerDefaultExpected(referenceXMLFilename);
             auto doseStatisticsDefaultExpected = readerDefaultExpected.generateDoseStatistic();
             io::other::DoseStatisticsXMLReader readerDefaultActual(defaultOutputFilename);
             auto doseStatisticsDefaultActual = readerDefaultActual.generateDoseStatistic();
 
             CHECK(checkEqualDoseStatistic(doseStatisticsDefaultExpected, doseStatisticsDefaultActual));
 
             io::other::DoseStatisticsXMLReader readerComplexExpected(complexOutputFilename);
             auto doseStatisticsComplexExpected = readerComplexExpected.generateDoseStatistic();
             io::other::DoseStatisticsXMLReader readerComplexActual(referenceXMLComplexFilename);
             auto doseStatisticsComplexActual = readerComplexActual.generateDoseStatistic();
 
             CHECK(checkEqualDoseStatistic(doseStatisticsComplexExpected, doseStatisticsComplexActual));
 
             //check DVH files
             io::other::DVHXMLFileReader xmlDVHDefaultReaderActual(defaultDVHOutputFilename);
             DVHPointer defaultDVHActual = xmlDVHDefaultReaderActual.generateDVH();
 
             io::other::DVHXMLFileReader xmlDVHDefaultReaderExpected(referenceDVHXMLFilename);
             DVHPointer defaultDVHExpected = xmlDVHDefaultReaderExpected.generateDVH();
             CHECK(checkEqualDVH(defaultDVHActual, defaultDVHExpected));
 
 			//delete file again
-			//CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
-			//CHECK_EQUAL(std::remove(defaultDVHOutputFilename.c_str()), 0);
-			//CHECK_EQUAL(std::remove(complexOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(defaultDVHOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(complexOutputFilename.c_str()), 0);
 
 			RETURN_AND_REPORT_TEST_SUCCESS;
 		}
 	} //namespace testing
 } //namespace rttb
diff --git a/testing/apps/DoseTool/DoseToolITKDoseTest.cpp b/testing/apps/DoseTool/DoseToolITKDoseTest.cpp
index ea15c6f..d668a23 100644
--- a/testing/apps/DoseTool/DoseToolITKDoseTest.cpp
+++ b/testing/apps/DoseTool/DoseToolITKDoseTest.cpp
@@ -1,123 +1,116 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // 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.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1221 $ (last changed revision)
 // @date    $Date: 2015-12-01 13:43:31 +0100 (Di, 01 Dez 2015) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #include "litCheckMacros.h"
 
 #include "rttbDoseStatisticsXMLReader.h"
 #include "../../io/other/CompareDoseStatistic.h"
 
 #include "boost/filesystem.hpp"
 
 namespace rttb
 {
 	namespace testing
 	{
 
 		//path to the current running directory. DoseTool is in the same directory (Debug/Release)
 		extern const char* _callingAppPath;
 
 		int DoseToolITKDoseTest(int argc, char* argv[])
 		{
 			PREPARE_DEFAULT_TEST_REPORTING;
 
 			std::string doseToolExecutable;
 			std::string doseFilename;
 			std::string structFilename;
 			std::string structName;
-			std::string ctxFilename;
 			std::string referenceXMLFilename;
 			std::string referenceXMLComplexFilename;
 
 			boost::filesystem::path callingPath(_callingAppPath);
 
-			if (argc > 7)
+			if (argc > 6)
 			{
 				doseToolExecutable = argv[1];
 				doseFilename = argv[2];
 				structFilename = argv[3];
-				ctxFilename = argv[4];
-				structName = argv[5];
-				referenceXMLFilename = argv[6];
-				referenceXMLComplexFilename = argv[7];
+				structName = argv[4];
+				referenceXMLFilename = argv[5];
+				referenceXMLComplexFilename = argv[6];
 			}
 
 			std::string doseToolExeWithPath = callingPath.parent_path().string() + "/" + doseToolExecutable;
 
 			std::string defaultOutputFilename = "itkOutput.xml";
 			std::string complexOutputFilename = "itkOutputComplex.xml";
 
 			std::string baseCommand = doseToolExeWithPath;
 			baseCommand += " -d " + doseFilename;
 			baseCommand += " -s " + structFilename;
 			baseCommand += " -t itk ";
 
 			if (structName != "")
 			{
 				baseCommand += " -n " + structName;
-
-				if (ctxFilename != "")
-				{
-					baseCommand += " -u virtuos " + ctxFilename;
-				}
 			}
 			else
 			{
 				baseCommand += " -u itk ";
 			}
 
 			std::string defaultDoseStatisticsCommand = baseCommand + " -y " + defaultOutputFilename;
 			std::cout << "Command line call: " + defaultDoseStatisticsCommand << std::endl;
 			CHECK_EQUAL(system(defaultDoseStatisticsCommand.c_str()), 0);
 
 			std::string complexDoseStatisticsCommand = baseCommand + " -y " + complexOutputFilename;
 			//prescribed dose is 14 Gy
 			complexDoseStatisticsCommand += " -f -p 14";
 
 			std::cout << "Command line call: " + complexDoseStatisticsCommand << std::endl;
 			CHECK_EQUAL(system(complexDoseStatisticsCommand.c_str()), 0);
 
 			//check if file exists
 			CHECK_EQUAL(boost::filesystem::exists(defaultOutputFilename), true);
 			CHECK_EQUAL(boost::filesystem::exists(complexOutputFilename), true);
 
             //check if file has dose statistics that are same than these in than reference file
             io::other::DoseStatisticsXMLReader readerDefaultExpected(referenceXMLFilename);
             auto doseStatisticsDefaultExpected = readerDefaultExpected.generateDoseStatistic();
             io::other::DoseStatisticsXMLReader readerDefaultActual(defaultOutputFilename);
             auto doseStatisticsDefaultActual = readerDefaultActual.generateDoseStatistic();
 
             CHECK(checkEqualDoseStatistic(doseStatisticsDefaultExpected, doseStatisticsDefaultActual));
 
             io::other::DoseStatisticsXMLReader readerComplexExpected(referenceXMLComplexFilename);
             auto doseStatisticsComplexExpected = readerComplexExpected.generateDoseStatistic();
             io::other::DoseStatisticsXMLReader readerComplexActual(complexOutputFilename);
             auto doseStatisticsComplexActual = readerComplexActual.generateDoseStatistic();
 
             CHECK(checkEqualDoseStatistic(doseStatisticsComplexExpected, doseStatisticsComplexActual));
 
 			//delete file again
-			//CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
-			//CHECK_EQUAL(std::remove(complexOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(complexOutputFilename.c_str()), 0);
 
 			RETURN_AND_REPORT_TEST_SUCCESS;
 		}
 	} //namespace testing
 } //namespace rttb
diff --git a/testing/apps/DoseTool/DoseToolTests.cpp b/testing/apps/DoseTool/DoseToolTests.cpp
index b547cf5..783cd6f 100644
--- a/testing/apps/DoseTool/DoseToolTests.cpp
+++ b/testing/apps/DoseTool/DoseToolTests.cpp
@@ -1,79 +1,73 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // 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.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1374 $ (last changed revision)
 // @date    $Date: 2016-05-30 14:15:42 +0200 (Mo, 30 Mai 2016) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 // this file defines the rttbCoreTests for the test driver
 // and all it expects is that you have a function called registerTests()
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
 
 #include "litMultiTestsMain.h"
 
 #include "RTToolboxConfigure.h"
 
 namespace rttb
 {
 	namespace testing
 	{
 
 		const char* _callingAppPath = NULL;
 
 		void registerTests()
 		{
 			LIT_REGISTER_TEST(DoseToolInvalidParametersTest);
-
-			if (RTTB_VIRTUOS_SUPPORT)
-			{
-				LIT_REGISTER_TEST(DoseToolVirtuosDoseTest);
-			}
-
 			LIT_REGISTER_TEST(DoseToolDicomDoseTest);
 			LIT_REGISTER_TEST(DoseToolITKDoseTest);
 			LIT_REGISTER_TEST(DoseToolRegexTest);
 			LIT_REGISTER_TEST(DoseToolDVHTest);
 		}
 
 	} //namespace testing
 } //namespace map
 
 
 int main(int argc, char* argv[])
 {
 	int result = 0;
 
 	rttb::testing::registerTests();
 
 	if (argc > 0)
 	{
 		rttb::testing::_callingAppPath = argv[0];
 	}
 
 	try
 	{
 		result = lit::multiTestsMain(argc, argv);
 	}
 	catch (...)
 	{
 		result = -1;
 	}
 
 	return result;
 }
diff --git a/testing/apps/DoseTool/files.cmake b/testing/apps/DoseTool/files.cmake
index 8fb1564..72b4f45 100644
--- a/testing/apps/DoseTool/files.cmake
+++ b/testing/apps/DoseTool/files.cmake
@@ -1,19 +1,15 @@
 SET(CPP_FILES
 	../../io/other/CompareDoseStatistic.cpp
 	../../io/other/CompareDVH.cpp
 	DoseToolInvalidParametersTest.cpp
 	DoseToolDicomDoseTest.cpp
 	DoseToolITKDoseTest.cpp
 	DoseToolRegexTest.cpp
 	DoseToolDVHTest.cpp
 	DoseToolTests.cpp
   )
-  
-IF (RTTB_VIRTUOS_SUPPORT AND BUILD_IO_Virtuos)
-	SET(CPP_FILES ${CPP_FILES} DoseToolVirtuosDoseTest.cpp)
-ENDIF()
 
 SET(H_FILES
 	../../io/other/CompareDoseStatistic.h
 	../../io/other/CompareDVH.h
 )
diff --git a/testing/apps/DoseTool4V/CMakeLists.txt b/testing/apps/DoseTool4V/CMakeLists.txt
new file mode 100644
index 0000000..68602a3
--- /dev/null
+++ b/testing/apps/DoseTool4V/CMakeLists.txt
@@ -0,0 +1,31 @@
+#-----------------------------------------------------------------------------
+# Setup the system information test.  Write out some basic failsafe
+# information in case the test doesn't run.
+#-----------------------------------------------------------------------------
+
+SET(DOSETOOL4V_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbDoseTool4VTests)
+
+SET(TEST_DATA_ROOT ${RTTBTesting_SOURCE_DIR}/data)
+
+SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
+
+
+#-----------------------------------------------------------------------------
+
+IF(MSVC)
+     ADD_DEFINITIONS(/bigobj)
+ENDIF()
+
+IF (WIN32)
+	SET(DOSETOOL4VEXE "DoseTool4V.exe")
+ELSE (WIN32)
+	SET(DOSETOOL4VEXE "./DoseTool4V")
+ENDIF (WIN32)
+
+ADD_TEST(DoseTool4VVirtuosDoseVirtuosStructTest ${DOSETOOL4V_TEST} DoseTool4VVirtuosDoseTest ${DOSETOOL4VEXE} "${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac101.dos.gz" "${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac101.pln"
+		"${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac000.vdx" "${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac000.ctx.gz" "DARM"
+		 "${TEST_DATA_ROOT}/DoseStatistics/XML/virtuos.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/virtuosComplex.xml")
+ADD_TEST(DoseTool4VITKDoseVirtuosStructTest ${DOSETOOL4V_TEST} DoseTool4VITKDoseTest ${DOSETOOL4VEXE} "${TEST_DATA_ROOT}/Dose/ITK/virtuosTestDose.mhd" "${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac000.vdx"
+	"${TEST_DATA_ROOT}/Virtuos/prostate_ac/prostate_ac000.ctx.gz"  "DARM" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkVirtuosStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkVirtuosStructComplex.xml")
+
+RTTB_CREATE_APPLICATION_TESTS(DoseTool4V DEPENDS RTTBOtherIO PACKAGE_DEPENDS Litmus BoostBinaries)
diff --git a/testing/apps/DoseTool/DoseToolITKDoseTest.cpp b/testing/apps/DoseTool4V/DoseTool4VITKDoseTest.cpp
similarity index 93%
copy from testing/apps/DoseTool/DoseToolITKDoseTest.cpp
copy to testing/apps/DoseTool4V/DoseTool4VITKDoseTest.cpp
index ea15c6f..b2d0a9f 100644
--- a/testing/apps/DoseTool/DoseToolITKDoseTest.cpp
+++ b/testing/apps/DoseTool4V/DoseTool4VITKDoseTest.cpp
@@ -1,123 +1,123 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // 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.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1221 $ (last changed revision)
 // @date    $Date: 2015-12-01 13:43:31 +0100 (Di, 01 Dez 2015) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #include "litCheckMacros.h"
 
 #include "rttbDoseStatisticsXMLReader.h"
 #include "../../io/other/CompareDoseStatistic.h"
 
 #include "boost/filesystem.hpp"
 
 namespace rttb
 {
 	namespace testing
 	{
 
 		//path to the current running directory. DoseTool is in the same directory (Debug/Release)
 		extern const char* _callingAppPath;
 
-		int DoseToolITKDoseTest(int argc, char* argv[])
+		int DoseTool4VITKDoseTest(int argc, char* argv[])
 		{
 			PREPARE_DEFAULT_TEST_REPORTING;
 
 			std::string doseToolExecutable;
 			std::string doseFilename;
 			std::string structFilename;
 			std::string structName;
 			std::string ctxFilename;
 			std::string referenceXMLFilename;
 			std::string referenceXMLComplexFilename;
 
 			boost::filesystem::path callingPath(_callingAppPath);
 
 			if (argc > 7)
 			{
 				doseToolExecutable = argv[1];
 				doseFilename = argv[2];
 				structFilename = argv[3];
 				ctxFilename = argv[4];
 				structName = argv[5];
 				referenceXMLFilename = argv[6];
 				referenceXMLComplexFilename = argv[7];
 			}
 
 			std::string doseToolExeWithPath = callingPath.parent_path().string() + "/" + doseToolExecutable;
 
 			std::string defaultOutputFilename = "itkOutput.xml";
 			std::string complexOutputFilename = "itkOutputComplex.xml";
 
 			std::string baseCommand = doseToolExeWithPath;
 			baseCommand += " -d " + doseFilename;
 			baseCommand += " -s " + structFilename;
 			baseCommand += " -t itk ";
 
 			if (structName != "")
 			{
 				baseCommand += " -n " + structName;
 
 				if (ctxFilename != "")
 				{
 					baseCommand += " -u virtuos " + ctxFilename;
 				}
 			}
 			else
 			{
 				baseCommand += " -u itk ";
 			}
 
 			std::string defaultDoseStatisticsCommand = baseCommand + " -y " + defaultOutputFilename;
 			std::cout << "Command line call: " + defaultDoseStatisticsCommand << std::endl;
 			CHECK_EQUAL(system(defaultDoseStatisticsCommand.c_str()), 0);
 
 			std::string complexDoseStatisticsCommand = baseCommand + " -y " + complexOutputFilename;
 			//prescribed dose is 14 Gy
 			complexDoseStatisticsCommand += " -f -p 14";
 
 			std::cout << "Command line call: " + complexDoseStatisticsCommand << std::endl;
 			CHECK_EQUAL(system(complexDoseStatisticsCommand.c_str()), 0);
 
 			//check if file exists
 			CHECK_EQUAL(boost::filesystem::exists(defaultOutputFilename), true);
 			CHECK_EQUAL(boost::filesystem::exists(complexOutputFilename), true);
 
             //check if file has dose statistics that are same than these in than reference file
             io::other::DoseStatisticsXMLReader readerDefaultExpected(referenceXMLFilename);
             auto doseStatisticsDefaultExpected = readerDefaultExpected.generateDoseStatistic();
             io::other::DoseStatisticsXMLReader readerDefaultActual(defaultOutputFilename);
             auto doseStatisticsDefaultActual = readerDefaultActual.generateDoseStatistic();
 
             CHECK(checkEqualDoseStatistic(doseStatisticsDefaultExpected, doseStatisticsDefaultActual));
 
             io::other::DoseStatisticsXMLReader readerComplexExpected(referenceXMLComplexFilename);
             auto doseStatisticsComplexExpected = readerComplexExpected.generateDoseStatistic();
             io::other::DoseStatisticsXMLReader readerComplexActual(complexOutputFilename);
             auto doseStatisticsComplexActual = readerComplexActual.generateDoseStatistic();
 
             CHECK(checkEqualDoseStatistic(doseStatisticsComplexExpected, doseStatisticsComplexActual));
 
 			//delete file again
-			//CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
-			//CHECK_EQUAL(std::remove(complexOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(complexOutputFilename.c_str()), 0);
 
 			RETURN_AND_REPORT_TEST_SUCCESS;
 		}
 	} //namespace testing
 } //namespace rttb
diff --git a/testing/apps/DoseTool/DoseToolTests.cpp b/testing/apps/DoseTool4V/DoseTool4VTests.cpp
similarity index 79%
copy from testing/apps/DoseTool/DoseToolTests.cpp
copy to testing/apps/DoseTool4V/DoseTool4VTests.cpp
index b547cf5..95cfb45 100644
--- a/testing/apps/DoseTool/DoseToolTests.cpp
+++ b/testing/apps/DoseTool4V/DoseTool4VTests.cpp
@@ -1,79 +1,70 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // 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.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1374 $ (last changed revision)
 // @date    $Date: 2016-05-30 14:15:42 +0200 (Mo, 30 Mai 2016) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 // this file defines the rttbCoreTests for the test driver
 // and all it expects is that you have a function called registerTests()
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
 
 #include "litMultiTestsMain.h"
 
 #include "RTToolboxConfigure.h"
 
 namespace rttb
 {
 	namespace testing
 	{
 
 		const char* _callingAppPath = NULL;
 
 		void registerTests()
 		{
-			LIT_REGISTER_TEST(DoseToolInvalidParametersTest);
-
-			if (RTTB_VIRTUOS_SUPPORT)
-			{
-				LIT_REGISTER_TEST(DoseToolVirtuosDoseTest);
-			}
-
-			LIT_REGISTER_TEST(DoseToolDicomDoseTest);
-			LIT_REGISTER_TEST(DoseToolITKDoseTest);
-			LIT_REGISTER_TEST(DoseToolRegexTest);
-			LIT_REGISTER_TEST(DoseToolDVHTest);
+			LIT_REGISTER_TEST(DoseTool4VVirtuosDoseTest);
+			LIT_REGISTER_TEST(DoseTool4VITKDoseTest);
 		}
 
 	} //namespace testing
 } //namespace map
 
 
 int main(int argc, char* argv[])
 {
 	int result = 0;
 
 	rttb::testing::registerTests();
 
 	if (argc > 0)
 	{
 		rttb::testing::_callingAppPath = argv[0];
 	}
 
 	try
 	{
 		result = lit::multiTestsMain(argc, argv);
 	}
 	catch (...)
 	{
 		result = -1;
 	}
 
 	return result;
 }
diff --git a/testing/apps/DoseTool/DoseToolVirtuosDoseTest.cpp b/testing/apps/DoseTool4V/DoseTool4VVirtuosDoseTest.cpp
similarity index 93%
rename from testing/apps/DoseTool/DoseToolVirtuosDoseTest.cpp
rename to testing/apps/DoseTool4V/DoseTool4VVirtuosDoseTest.cpp
index 22f7766..27897a5 100644
--- a/testing/apps/DoseTool/DoseToolVirtuosDoseTest.cpp
+++ b/testing/apps/DoseTool4V/DoseTool4VVirtuosDoseTest.cpp
@@ -1,112 +1,112 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // 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.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1221 $ (last changed revision)
 // @date    $Date: 2015-12-01 13:43:31 +0100 (Di, 01 Dez 2015) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #include "litCheckMacros.h"
 
 #include "rttbDoseStatisticsXMLReader.h"
 #include "../../io/other/CompareDoseStatistic.h"
 
 #include "boost/filesystem.hpp"
 
 namespace rttb
 {
 	namespace testing
 	{
 
 		//path to the current running directory. DoseTool is in the same directory (Debug/Release)
 		extern const char* _callingAppPath;
 
-		int DoseToolVirtuosDoseTest(int argc, char* argv[])
+		int DoseTool4VVirtuosDoseTest(int argc, char* argv[])
 		{
 			PREPARE_DEFAULT_TEST_REPORTING;
 
 			std::string doseToolExecutable;
 			std::string doseFilename;
 			std::string planFilename;
 			std::string structFilename;
 			std::string ctxFilename;
 			std::string structName;
 			std::string referenceXMLFilename;
 			std::string referenceXMLComplexFilename;
 
 			boost::filesystem::path callingPath(_callingAppPath);
 
 
 			if (argc > 8)
 			{
 				doseToolExecutable = argv[1];
 				doseFilename = argv[2];
 				planFilename = argv[3];
 				structFilename = argv[4];
 				ctxFilename = argv[5];
 				structName = argv[6];
 				referenceXMLFilename = argv[7];
 				referenceXMLComplexFilename = argv[8];
 			}
 
 			std::string doseToolExeWithPath = callingPath.parent_path().string() + "/" + doseToolExecutable;
 
 			std::string defaultOutputFilename = "virtuosOutput.xml";
 			std::string complexOutputFilename = "virtuosOutputComplex.xml";
 
 			std::string baseCommand = doseToolExeWithPath;
 			baseCommand += " -d " + doseFilename;
 			baseCommand += " -t virtuos " + planFilename;
 			baseCommand += " -s " + structFilename;
 			baseCommand += " -u virtuos " + ctxFilename;
 			baseCommand += " -n " + structName;
 			std::string defaultDoseStatisticsCommand = baseCommand + " -y " + defaultOutputFilename;
 			std::cout << "Command line call: " + defaultDoseStatisticsCommand << std::endl;
 			CHECK_EQUAL(system(defaultDoseStatisticsCommand.c_str()), 0);
 
 			std::string complexDoseStatisticsCommand = baseCommand + " -y " + complexOutputFilename;
 			//prescribed dose is 50 Gy
 			complexDoseStatisticsCommand += " -f -p 50";
 
 			std::cout << "Command line call: " + complexDoseStatisticsCommand << std::endl;
 			CHECK_EQUAL(system(complexDoseStatisticsCommand.c_str()), 0);
 
 			//check if file exists
 			CHECK_EQUAL(boost::filesystem::exists(defaultOutputFilename), true);
 			CHECK_EQUAL(boost::filesystem::exists(complexOutputFilename), true);
 
             io::other::DoseStatisticsXMLReader readerDefaultExpected(referenceXMLFilename);
             auto doseStatisticsDefaultExpected = readerDefaultExpected.generateDoseStatistic();
             io::other::DoseStatisticsXMLReader readerDefaultActual(defaultOutputFilename);
             auto doseStatisticsDefaultActual = readerDefaultActual.generateDoseStatistic();
 
             CHECK(checkEqualDoseStatistic(doseStatisticsDefaultExpected, doseStatisticsDefaultActual));
 
             io::other::DoseStatisticsXMLReader readerComplexExpected(referenceXMLComplexFilename);
             auto doseStatisticsComplexExpected = readerComplexExpected.generateDoseStatistic();
             io::other::DoseStatisticsXMLReader readerComplexActual(complexOutputFilename);
             auto doseStatisticsComplexActual = readerComplexActual.generateDoseStatistic();
 
             CHECK(checkEqualDoseStatistic(doseStatisticsComplexExpected, doseStatisticsComplexActual));
 
 			//delete file again
-			//CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
-			//CHECK_EQUAL(std::remove(complexOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(defaultOutputFilename.c_str()), 0);
+			CHECK_EQUAL(std::remove(complexOutputFilename.c_str()), 0);
 
 			RETURN_AND_REPORT_TEST_SUCCESS;
 		}
 	} //namespace testing
 } //namespace rttb
diff --git a/testing/apps/DoseTool4V/files.cmake b/testing/apps/DoseTool4V/files.cmake
new file mode 100644
index 0000000..be2c22a
--- /dev/null
+++ b/testing/apps/DoseTool4V/files.cmake
@@ -0,0 +1,10 @@
+SET(CPP_FILES
+	../../io/other/CompareDoseStatistic.cpp
+	DoseTool4VITKDoseTest.cpp
+	DoseTool4VVirtuosDoseTest.cpp
+	DoseTool4VTests.cpp
+  )
+
+SET(H_FILES
+	../../io/other/CompareDoseStatistic.h
+	)
diff --git a/testing/apps/VoxelizerTool/VoxelizerToolDifferentCommandsTest.cpp b/testing/apps/VoxelizerTool/VoxelizerToolDifferentCommandsTest.cpp
index 604076a..94d0c87 100644
--- a/testing/apps/VoxelizerTool/VoxelizerToolDifferentCommandsTest.cpp
+++ b/testing/apps/VoxelizerTool/VoxelizerToolDifferentCommandsTest.cpp
@@ -1,110 +1,104 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // 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.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1333 $ (last changed revision)
 // @date    $Date: 2016-04-22 11:12:14 +0200 (Fr, 22 Apr 2016) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #include "litCheckMacros.h"
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <vector>
 
 /*! @brief VoxelizerToolTest3.
 Test the output, multipleStructs and the booleanVoxelization parameter.
 */
 namespace rttb
 {
 	namespace testing
 	{
 		//path to the current running directory. VoxelizerTool is in the same directory (Debug/Release)
 		extern const char* _callingAppPath;
 		int VoxelizerToolDifferentCommandsTest(int argc, char* argv[])
 		{
 			PREPARE_DEFAULT_TEST_REPORTING;
 
 			std::string voxelizerToolExe;
 			std::string tempDirectory;
 			std::string structFile;
 			std::string referenceFile;
 
 			if (argc > 4)
 			{
 				voxelizerToolExe = argv[1];
 				tempDirectory = argv[2];
 				structFile = argv[3];
 				referenceFile = argv[4];
 			}
 
 			std::vector<std::string> commands;
 			commands.push_back("\"Niere.*\" -m -o Test.hdr");
 			commands.push_back("\"Leber\" -o Boolean.hdr -z");
 
 			std::vector<std::string> filenames;
 			filenames.push_back("Test_Niere li");
 			filenames.push_back("Test_Niere re");
 			filenames.push_back("Boolean_Leber");
 
 			boost::filesystem::path callingPath(_callingAppPath);
 			std::string voxelizerToolExeWithPath = callingPath.parent_path().string() + "/" + voxelizerToolExe;
 
 			std::string baseCommand = voxelizerToolExeWithPath;
 			baseCommand += " -s " + structFile;
 			baseCommand += " -r " + referenceFile;
 			baseCommand += " -e ";
 
 			for (size_t i = 0; i < commands.size(); i++)
 			{
 				std::string command = baseCommand + commands.at(i);
 				int returnValue = system(command.c_str());
 				std::cout << "Command line call: " + command << std::endl;
 				CHECK_EQUAL(returnValue, 0);
 			}
 
-			std::string helpCommand = voxelizerToolExeWithPath + " -h";
-			int returnValue = system(helpCommand.c_str());
-			std::cout << "Command line call: " + helpCommand << std::endl;
-			CHECK_EQUAL(returnValue, 0);
-
-
 			for (size_t i = 0; i < filenames.size(); i++)
 			{
 				const std::string HDRfileName = tempDirectory + "/" + filenames.at(i) + ".hdr";
 				boost::filesystem::path HDRFile(HDRfileName);
 
 				const std::string IMGfileName = tempDirectory + "/" + filenames.at(i) + ".img";
 				boost::filesystem::path IMGFile(IMGfileName);
 
 				CHECK_EQUAL(boost::filesystem::exists(HDRFile), true);
 				CHECK_EQUAL(boost::filesystem::exists(IMGFile), true);
 
 				if (boost::filesystem::exists(IMGFile))
 				{
 					boost::filesystem::remove(IMGFile);
 				}
 
 				if (boost::filesystem::exists(HDRFile))
 				{
 					boost::filesystem::remove(HDRFile);
 				}
 			}
 
 			RETURN_AND_REPORT_TEST_SUCCESS;
 		}
 
 	}
 }