diff --git a/testing/apps/DoseTool/CMakeLists.txt b/testing/apps/DoseTool/CMakeLists.txt
index 469cf4b..5d9a879 100644
--- a/testing/apps/DoseTool/CMakeLists.txt
+++ b/testing/apps/DoseTool/CMakeLists.txt
@@ -1,36 +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(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 IF(MSVC)
      ADD_DEFINITIONS(/bigobj)
 ENDIF()
 
 IF (WIN32)
 	SET(DOSETOOLEXE "DoseTool.exe")
 ELSE (WIN32)
 	SET(DOSETOOLEXE "./DoseTool")
 ENDIF (WIN32)
 
 ADD_TEST(DoseToolInvalidParametersTest ${DOSETOOL_TEST} DoseToolInvalidParametersTest ${DOSETOOLEXE})
 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"
-"${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml")
+"${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml" "DoseToolITKDoseDicomStructTestOutput.xml" "DoseToolITKDoseDicomStructTestOutputComplex.xml")
 ADD_TEST(DoseToolITKDoseITKStructTest ${DOSETOOL_TEST} DoseToolITKDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/ITK/dicompylerTestDose.mhd" "${TEST_DATA_ROOT}/StructureSet/ITK/voxelizedNodes.nrrd" "Nodes"
-"${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml")
-#"${TEST_DATA_ROOT}/DoseStatistics/XML/itkitkStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkitkStructComplex.xml")
+"${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml" "DoseToolITKDoseITKStructTestOutput.xml" "DoseToolITKDoseITKStructTestOutputComplex.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 RTTBData)
diff --git a/testing/apps/DoseTool/DoseToolITKDoseTest.cpp b/testing/apps/DoseTool/DoseToolITKDoseTest.cpp
index 9f3fc6d..6099a8d 100644
--- a/testing/apps/DoseTool/DoseToolITKDoseTest.cpp
+++ b/testing/apps/DoseTool/DoseToolITKDoseTest.cpp
@@ -1,114 +1,115 @@
 // -----------------------------------------------------------------------
 // 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 referenceXMLFilename;
 			std::string referenceXMLComplexFilename;
+			std::string defaultOutputFilename;
+			std::string complexOutputFilename;
 
 			boost::filesystem::path callingPath(_callingAppPath);
 
-			if (argc > 6)
+			if (argc > 8)
 			{
 				doseToolExecutable = argv[1];
 				doseFilename = argv[2];
 				structFilename = argv[3];
 				structName = argv[4];
 				referenceXMLFilename = argv[5];
 				referenceXMLComplexFilename = argv[6];
+				defaultOutputFilename = argv[7];
+				complexOutputFilename = argv[8];
 			}
 
 			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 (boost::filesystem::extension(structFilename).compare(".nrrd") == 0) {
 				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);
 
 			RETURN_AND_REPORT_TEST_SUCCESS;
 		}
 	} //namespace testing
 } //namespace rttb