diff --git a/Examples/Tutorial/QtTesting.cpp b/Examples/Tutorial/QtTesting.cpp
deleted file mode 100644
index dad5e46090..0000000000
--- a/Examples/Tutorial/QtTesting.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*============================================================================
-
-The Medical Imaging Interaction Toolkit (MITK)
-
-Copyright (c) German Cancer Research Center (DKFZ)
-All rights reserved.
-
-Use of this source code is governed by a 3-clause BSD license that can be
-found in the LICENSE file.
-
-============================================================================*/
-#include <QApplication>
-#include <QTimer>
-
-#include <iostream>
-#include <stdlib.h>
-
-int QtTesting(void)
-{
-  // QtTestingClass *qttestingclass = new QtTestingClass;
-  std::cout << "Testing ... " << std::endl;
-  auto timer = new QTimer(QApplication::instance());
-  timer->setSingleShot(true);
-  QObject::connect(timer, SIGNAL(timeout()), QApplication::instance(), SLOT(quit()));
-  timer->start(2000); // 2 seconds single-shot timer
-  QApplication::instance()->exec();
-  return EXIT_SUCCESS;
-}
diff --git a/Examples/Tutorial/QtTesting.h b/Examples/Tutorial/QtTesting.h
deleted file mode 100644
index 66c4a6f467..0000000000
--- a/Examples/Tutorial/QtTesting.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*============================================================================
-
-The Medical Imaging Interaction Toolkit (MITK)
-
-Copyright (c) German Cancer Research Center (DKFZ)
-All rights reserved.
-
-Use of this source code is governed by a 3-clause BSD license that can be
-found in the LICENSE file.
-
-============================================================================*/
-
-//#include <QObject>
-
-int QtTesting(void);
-
-// class QtTestingClass : public QObject
-//{
-//  Q_OBJECT
-// public:
-//  QtTestingClass( QObject * parent = 0, const char * name = 0 );
-//
-//}
diff --git a/Examples/Tutorial/Step1/Step1.cpp b/Examples/Tutorial/Step1/Step1.cpp
index c0fe5e65a5..c203119b7f 100644
--- a/Examples/Tutorial/Step1/Step1.cpp
+++ b/Examples/Tutorial/Step1/Step1.cpp
@@ -1,93 +1,85 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkRegisterClasses.h"
 #include "QmitkRenderWindow.h"
 
 #include <mitkStandaloneDataStorage.h>
 
 #include <QApplication>
 #include <itksys/SystemTools.hxx>
 
 #include <mitkIOUtil.h>
 
 //##Documentation
 //## @brief Load image (nrrd format) and display it in a 2D view
 int main(int argc, char *argv[])
 {
   QApplication qtapplication(argc, argv);
 
   if (argc < 2)
   {
     fprintf(stderr, "Usage:   %s [filename] \n\n", itksys::SystemTools::GetFilenameName(argv[0]).c_str());
     return 1;
   }
 
   // Register Qmitk-dependent global instances
   QmitkRegisterClasses();
 
   //*************************************************************************
   // Part I: Basic initialization
   //*************************************************************************
 
   // Create a DataStorage
   // The DataStorage manages all data objects. It is used by the
   // rendering mechanism to render all data objects
   // We use the standard implementation mitk::StandaloneDataStorage.
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
 
   //*************************************************************************
   // Part II: Create some data by reading a file
   //*************************************************************************
 
   // Load datanode (eg. many image formats, surface formats, etc.)
   mitk::IOUtil::Load(argv[1], *ds);
 
   //*************************************************************************
   // Part IV: Create window and pass the datastorage to it
   //*************************************************************************
 
   // Create a RenderWindow
   QmitkRenderWindow renderWindow;
 
   // Tell the RenderWindow which (part of) the datastorage to render
   renderWindow.GetRenderer()->SetDataStorage(ds);
 
   // Initialize the RenderWindow
   auto geo = ds->ComputeBoundingGeometry3D(ds->GetAll());
   mitk::RenderingManager::GetInstance()->InitializeViews(geo);
   // mitk::RenderingManager::GetInstance()->InitializeViews();
 
   // Select a slice
   mitk::SliceNavigationController::Pointer sliceNaviController = renderWindow.GetSliceNavigationController();
   if (sliceNaviController)
     sliceNaviController->GetSlice()->SetPos(0);
 
   //*************************************************************************
   // Part V: Qt-specific initialization
   //*************************************************************************
   renderWindow.show();
   renderWindow.resize(256, 256);
 
-// for testing
-#include "QtTesting.h"
-  if (strcmp(argv[argc - 1], "-testing") != 0)
-    return qtapplication.exec();
-  else
-    return QtTesting();
-
-  // cleanup: Remove References to DataStorage. This will delete the object
-  ds = nullptr;
+  return qtapplication.exec();
 }
 /**
 \example Step1.cpp
 */
diff --git a/Examples/Tutorial/Step1/files.cmake b/Examples/Tutorial/Step1/files.cmake
index f737b9bdaa..8568729050 100644
--- a/Examples/Tutorial/Step1/files.cmake
+++ b/Examples/Tutorial/Step1/files.cmake
@@ -1,4 +1,3 @@
 set(CPP_FILES
   Step1.cpp
-  ../QtTesting.cpp
-  )
+)
diff --git a/Examples/Tutorial/Step2/Step2.cpp b/Examples/Tutorial/Step2/Step2.cpp
index 8de4088bed..690cecd5b4 100644
--- a/Examples/Tutorial/Step2/Step2.cpp
+++ b/Examples/Tutorial/Step2/Step2.cpp
@@ -1,98 +1,93 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkRegisterClasses.h"
 #include "QmitkRenderWindow.h"
 
 #include <mitkStandaloneDataStorage.h>
 
 #include <QApplication>
 #include <itksys/SystemTools.hxx>
 #include <mitkIOUtil.h>
 
 //##Documentation
 //## @brief Load one or more data sets (many image, surface
 //## and other formats) and display it in a 2D view
 int main(int argc, char *argv[])
 {
   QApplication qtapplication(argc, argv);
 
   if (argc < 2)
   {
     fprintf(
       stderr, "Usage:   %s [filename1] [filename2] ...\n\n", itksys::SystemTools::GetFilenameName(argv[0]).c_str());
     return 1;
   }
 
   // Register Qmitk-dependent global instances
   QmitkRegisterClasses();
 
   //*************************************************************************
   // Part I: Basic initialization
   //*************************************************************************
 
   // Create a data storage object. We will use it as a singleton
   mitk::StandaloneDataStorage::Pointer storage = mitk::StandaloneDataStorage::New();
 
   //*************************************************************************
   // Part II: Create some data by reading files
   //*************************************************************************
   int i;
   for (i = 1; i < argc; ++i)
   {
     // For testing
     if (strcmp(argv[i], "-testing") == 0)
       continue;
 
     //*********************************************************************
     // Part III: Put the data into the datastorage
     //*********************************************************************
     // Add the node to the DataStorage
     mitk::IOUtil::Load(argv[i], *storage);
   }
 
   //*************************************************************************
   // Part IV: Create window and pass the datastorage to it
   //*************************************************************************
 
   // Create a RenderWindow
   QmitkRenderWindow renderWindow;
 
   // Tell the RenderWindow which (part of) the datastorage to render
   renderWindow.GetRenderer()->SetDataStorage(storage);
 
   // Initialize the RenderWindow
   auto geo = storage->ComputeBoundingGeometry3D(storage->GetAll());
   mitk::RenderingManager::GetInstance()->InitializeViews(geo);
 
   // Select a slice
   mitk::SliceNavigationController::Pointer sliceNaviController = renderWindow.GetSliceNavigationController();
   if (sliceNaviController)
     sliceNaviController->GetSlice()->SetPos(2);
 
   //*************************************************************************
   // Part V: Qt-specific initialization
   //*************************************************************************
   renderWindow.show();
   renderWindow.resize(256, 256);
 
-// for testing
-#include "QtTesting.h"
-  if (strcmp(argv[argc - 1], "-testing") != 0)
-    return qtapplication.exec();
-  else
-    return QtTesting();
+  return qtapplication.exec();
 }
 
 /**
 \example Step2.cpp
 */
diff --git a/Examples/Tutorial/Step2/files.cmake b/Examples/Tutorial/Step2/files.cmake
index 228aaba31f..d062a05faa 100644
--- a/Examples/Tutorial/Step2/files.cmake
+++ b/Examples/Tutorial/Step2/files.cmake
@@ -1,4 +1,3 @@
 set(CPP_FILES
   Step2.cpp
-  ../QtTesting.cpp
-  )
+)
diff --git a/Examples/Tutorial/Step3/Step3.cpp b/Examples/Tutorial/Step3/Step3.cpp
index 6e5015d309..dd50e6d8d4 100644
--- a/Examples/Tutorial/Step3/Step3.cpp
+++ b/Examples/Tutorial/Step3/Step3.cpp
@@ -1,159 +1,154 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkRegisterClasses.h"
 #include "QmitkRenderWindow.h"
 
 #include <mitkIOUtil.h>
 #include <mitkProperties.h>
 #include <mitkRenderingManager.h>
 #include <mitkStandaloneDataStorage.h>
 #include <mitkTransferFunction.h>
 #include <mitkTransferFunctionProperty.h>
 
 #include <itksys/SystemTools.hxx>
 
 #include <QApplication>
 
 //##Documentation
 //## @brief Change the type of display to 3D
 //##
 //## As in Step2, load one or more data sets (many image, surface
 //## and other formats), but display it in a 3D view.
 //## The QmitkRenderWindow is now used for displaying a 3D view, by
 //## setting the used mapper-slot to Standard3D.
 //## Since volume-rendering is a (rather) slow procedure, the default
 //## is that images are not displayed in the 3D view. For this example,
 //## we want volume-rendering, thus we switch it on by setting
 //## the Boolean-property "volumerendering" to "true".
 int main(int argc, char *argv[])
 {
   QApplication qtapplication(argc, argv);
   if (argc < 2)
   {
     fprintf(
       stderr, "Usage:   %s [filename1] [filename2] ...\n\n", itksys::SystemTools::GetFilenameName(argv[0]).c_str());
     return 1;
   }
 
   // Register Qmitk-dependent global instances
   QmitkRegisterClasses();
 
   //*************************************************************************
   // Part I: Basic initialization
   //*************************************************************************
 
   // Create a DataStorage
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
 
   //*************************************************************************
   // Part II: Create some data by reading files
   //*************************************************************************
   int i;
   for (i = 1; i < argc; ++i)
   {
     // For testing
     if (strcmp(argv[i], "-testing") == 0)
       continue;
 
     //*********************************************************************
     // Part III: Put the data into the datastorage
     //*********************************************************************
     // Load datanode (eg. many image formats, surface formats, etc.)
     mitk::StandaloneDataStorage::SetOfObjects::Pointer dataNodes = mitk::IOUtil::Load(argv[i], *ds);
 
     if (dataNodes->empty())
     {
       fprintf(stderr, "Could not open file %s \n\n", argv[i]);
       exit(2);
     }
     mitk::DataNode::Pointer node = dataNodes->at(0);
 
     // *********************************************************
     // ********************* START OF NEW PART 1 (Step 3a) *****
     // *********************************************************
 
     //*********************************************************************
     // Part IV: We want all images to be volume-rendered
     //*********************************************************************
 
     // Check if the data is an image by dynamic_cast-ing the data
     // contained in the node. Warning: dynamic_cast's are rather slow,
     // do not use it too often!
     mitk::Image::Pointer image = dynamic_cast<mitk::Image *>(node->GetData());
     if (image.IsNotNull())
     {
       // Set the property "volumerendering" to the Boolean value "true"
       node->SetProperty("volumerendering", mitk::BoolProperty::New(true));
 
       // Create a transfer function to assign optical properties (color and opacity) to grey-values of the data
       mitk::TransferFunction::Pointer tf = mitk::TransferFunction::New();
       tf->InitializeByMitkImage(image);
 
       // Set the color transfer function AddRGBPoint(double x, double r, double g, double b)
       tf->GetColorTransferFunction()->AddRGBPoint(tf->GetColorTransferFunction()->GetRange()[0], 1.0, 0.0, 0.0);
       tf->GetColorTransferFunction()->AddRGBPoint(tf->GetColorTransferFunction()->GetRange()[1], 1.0, 1.0, 0.0);
 
       // Set the piecewise opacity transfer function AddPoint(double x, double y)
       tf->GetScalarOpacityFunction()->AddPoint(0, 0);
       tf->GetScalarOpacityFunction()->AddPoint(tf->GetColorTransferFunction()->GetRange()[1], 1);
 
       node->SetProperty("TransferFunction", mitk::TransferFunctionProperty::New(tf.GetPointer()));
     }
 
     // *********************************************************
     // ******************* END OF NEW PART 1 (Step 3a) *********
     // *********************************************************
   }
 
   //*************************************************************************
   // Part V: Create window and pass the tree to it
   //*************************************************************************
 
   // Create a renderwindow
   QmitkRenderWindow renderWindow;
 
   // Tell the renderwindow which (part of) the datastorage to render
   renderWindow.GetRenderer()->SetDataStorage(ds);
 
   // *********************************************************
   // ****************** START OF NEW PART 2 (Step 3b) ********
   // *********************************************************
   // Use it as a 3D view!
   renderWindow.GetRenderer()->SetMapperID(mitk::BaseRenderer::Standard3D);
 
   // Reposition the camera to include all visible actors
   renderWindow.GetRenderer()->GetVtkRenderer()->ResetCamera();
 
   // *********************************************************
   // ******************* END OF NEW PART 2 (Step 3b) *********
   // *********************************************************
 
   //*************************************************************************
   // Part VI: Qt-specific initialization
   //*************************************************************************
   renderWindow.show();
   renderWindow.resize(256, 256);
 
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 
-// for testing
-#include "QtTesting.h"
-  if (strcmp(argv[argc - 1], "-testing") != 0)
-    return qtapplication.exec();
-  else
-    return QtTesting();
+  return qtapplication.exec();
 }
 
 /**
 \example Step3.cpp
 */
diff --git a/Examples/Tutorial/Step3/files.cmake b/Examples/Tutorial/Step3/files.cmake
index 92387dd3f9..30d2410c08 100644
--- a/Examples/Tutorial/Step3/files.cmake
+++ b/Examples/Tutorial/Step3/files.cmake
@@ -1,4 +1,3 @@
 set(CPP_FILES
   Step3.cpp
-  ../QtTesting.cpp
-  )
+)
diff --git a/Examples/Tutorial/Step4/Step4.cpp b/Examples/Tutorial/Step4/Step4.cpp
index 36e6888a4c..236d2200c0 100644
--- a/Examples/Tutorial/Step4/Step4.cpp
+++ b/Examples/Tutorial/Step4/Step4.cpp
@@ -1,169 +1,164 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkRegisterClasses.h"
 #include "QmitkRenderWindow.h"
 #include "QmitkSliceWidget.h"
 
 #include "mitkNodePredicateDataType.h"
 #include "mitkProperties.h"
 #include "mitkRenderingManager.h"
 #include "mitkStandaloneDataStorage.h"
 #include <mitkIOUtil.h>
 
 #include <QApplication>
 #include <QHBoxLayout>
 #include <itksys/SystemTools.hxx>
 #include <mitkImage.h>
 
 //##Documentation
 //## @brief Use several views to explore data
 //##
 //## As in Step2 and Step3, load one or more data sets (many image,
 //## surface and other formats), but create 3 views on the data.
 //## The QmitkRenderWindow is used for displaying a 3D view as in Step3,
 //## but without volume-rendering.
 //## Furthermore, we create two 2D views for slicing through the data.
 //## We use the class QmitkSliceWidget, which is based on the class
 //## QmitkRenderWindow, but additionally provides sliders
 //## to slice through the data. We create two instances of
 //## QmitkSliceWidget, one for axial and one for sagittal slicing.
 //## The two slices are also shown at their correct position in 3D as
 //## well as intersection-line, each in the other 2D view.
 int main(int argc, char *argv[])
 {
   QApplication qtapplication(argc, argv);
 
   if (argc < 2)
   {
     fprintf(
       stderr, "Usage:   %s [filename1] [filename2] ...\n\n", itksys::SystemTools::GetFilenameName(argv[0]).c_str());
     return 1;
   }
 
   // Register Qmitk-dependent global instances
   QmitkRegisterClasses();
 
   //*************************************************************************
   // Part I: Basic initialization
   //*************************************************************************
 
   // Create a DataStorage
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
 
   //*************************************************************************
   // Part II: Create some data by reading files
   //*************************************************************************
   int i;
   for (i = 1; i < argc; ++i)
   {
     // For testing
     if (strcmp(argv[i], "-testing") == 0)
       continue;
 
     //*********************************************************************
     // Part III: Put the data into the datastorage
     //*********************************************************************
     // Load datanode (eg. many image formats, surface formats, etc.)
     mitk::IOUtil::Load(argv[i], *ds);
   }
 
   //*************************************************************************
   // Part IV: Create windows and pass the tree to it
   //*************************************************************************
 
   // Create toplevel widget with horizontal layout
   QWidget toplevelWidget;
   QHBoxLayout layout;
   layout.setSpacing(2);
   layout.setMargin(0);
   toplevelWidget.setLayout(&layout);
 
   //*************************************************************************
   // Part IVa: 3D view
   //*************************************************************************
 
   // Create a renderwindow
   QmitkRenderWindow renderWindow(&toplevelWidget);
   layout.addWidget(&renderWindow);
 
   // Tell the renderwindow which (part of) the datastorage to render
   renderWindow.GetRenderer()->SetDataStorage(ds);
 
   // Use it as a 3D view
   renderWindow.GetRenderer()->SetMapperID(mitk::BaseRenderer::Standard3D);
 
   // Reposition the camera to include all visible actors
   renderWindow.GetRenderer()->GetVtkRenderer()->ResetCamera();
 
   // *******************************************************
   // ****************** START OF NEW PART ******************
   // *******************************************************
 
   //*************************************************************************
   // Part IVb: 2D view for slicing axially
   //*************************************************************************
 
   // Create QmitkSliceWidget, which is based on the class
   // QmitkRenderWindow, but additionally provides sliders
   QmitkSliceWidget view2(&toplevelWidget);
   layout.addWidget(&view2);
   view2.SetLevelWindowEnabled(true);
   // Tell the QmitkSliceWidget which (part of) the tree to render.
   // By default, it slices the data axially
   view2.SetDataStorage(ds);
 
   // Get the image from the data storage. A predicate (mitk::NodePredicateBase)
   // is used to get only nodes of the type mitk::Image.
   mitk::DataStorage::SetOfObjects::ConstPointer rs = ds->GetSubset(mitk::TNodePredicateDataType<mitk::Image>::New());
 
   view2.SetData(rs->Begin(), mitk::SliceNavigationController::Axial);
   // We want to see the position of the slice in 2D and the
   // slice itself in 3D: add it to the datastorage!
   ds->Add(view2.GetRenderer()->GetCurrentWorldPlaneGeometryNode());
 
   //*************************************************************************
   // Part IVc: 2D view for slicing sagitally
   //*************************************************************************
 
   // Create QmitkSliceWidget, which is based on the class
   // QmitkRenderWindow, but additionally provides sliders
   QmitkSliceWidget view3(&toplevelWidget);
   layout.addWidget(&view3);
   view3.SetDataStorage(ds);
   // Tell the QmitkSliceWidget which (part of) the datastorage to render
   // and to slice sagitally
   view3.SetData(rs->Begin(), mitk::SliceNavigationController::Sagittal);
   // We want to see the position of the slice in 2D and the
   // slice itself in 3D: add it to the datastorage!
   ds->Add(view3.GetRenderer()->GetCurrentWorldPlaneGeometryNode());
 
   // *******************************************************
   // ******************* END OF NEW PART *******************
   // *******************************************************
 
   //*************************************************************************
   // Part V: Qt-specific initialization
   //*************************************************************************
   toplevelWidget.show();
 
-// for testing
-#include "QtTesting.h"
-  if (strcmp(argv[argc - 1], "-testing") != 0)
-    return qtapplication.exec();
-  else
-    return QtTesting();
+  return qtapplication.exec();
 }
 
 /**
 \example Step4.cpp
 */
diff --git a/Examples/Tutorial/Step4/files.cmake b/Examples/Tutorial/Step4/files.cmake
index 97d991f251..f092ddd9de 100644
--- a/Examples/Tutorial/Step4/files.cmake
+++ b/Examples/Tutorial/Step4/files.cmake
@@ -1,4 +1,3 @@
 set(CPP_FILES
   Step4.cpp
-  ../QtTesting.cpp
-  )
+)
diff --git a/Examples/Tutorial/Step5/Step5.cpp b/Examples/Tutorial/Step5/Step5.cpp
index f6f81e571d..6e3204d641 100644
--- a/Examples/Tutorial/Step5/Step5.cpp
+++ b/Examples/Tutorial/Step5/Step5.cpp
@@ -1,208 +1,203 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkRegisterClasses.h"
 #include "QmitkRenderWindow.h"
 #include "QmitkSliceWidget.h"
 
 #include "mitkNodePredicateDataType.h"
 #include "mitkProperties.h"
 #include "mitkRenderingManager.h"
 #include "mitkStandaloneDataStorage.h"
 
 #include "mitkPointSet.h"
 // NEW INCLUDE
 #include "mitkPointSetDataInteractor.h"
 
 #include <QApplication>
 #include <QHBoxLayout>
 #include <itksys/SystemTools.hxx>
 #include <mitkIOUtil.h>
 
 //##Documentation
 //## @brief Interactively add points
 //##
 //## As in Step4, load one or more data sets (many image,
 //## surface and other formats) and create 3 views on the data.
 //## Additionally, we want to interactively add points. A node containing
 //## a PointSet as data is added to the data tree and a PointSetDataInteractor
 //## is associated with the node, which handles the interaction. The
 //## @em interaction @em pattern is defined in a state-machine, stored in an
 //## external XML file. Thus, we need to load a state-machine
 //## The interaction patterns defines the @em events,
 //## on which the interactor reacts (e.g., which mouse buttons are used to
 //## set a point), the @em transition to the next state (e.g., the initial
 //## may be "empty point set") and associated @a actions (e.g., add a point
 //## at the position where the mouse-click occured).
 int main(int argc, char *argv[])
 {
   QApplication qtapplication(argc, argv);
 
   if (argc < 2)
   {
     fprintf(
       stderr, "Usage:   %s [filename1] [filename2] ...\n\n", itksys::SystemTools::GetFilenameName(argv[0]).c_str());
     return 1;
   }
 
   // Register Qmitk-dependent global instances
   QmitkRegisterClasses();
 
   //*************************************************************************
   // Part I: Basic initialization
   //*************************************************************************
 
   // Create a DataStorage
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
 
   //*************************************************************************
   // Part II: Create some data by reading files
   //*************************************************************************
   int i;
   for (i = 1; i < argc; ++i)
   {
     // For testing
     if (strcmp(argv[i], "-testing") == 0)
       continue;
 
     // Load datanode (eg. many image formats, surface formats, etc.)
     mitk::StandaloneDataStorage::SetOfObjects::Pointer dataNodes = mitk::IOUtil::Load(argv[i], *ds);
 
     //*********************************************************************
     // Part III: Put the data into the datastorage
     //*********************************************************************
     // Add the node to the DataStorage
     if (dataNodes->empty())
     {
       fprintf(stderr, "Could not open file %s \n\n", argv[i]);
       exit(2);
     }
   }
 
   //*************************************************************************
   // Part V: Create windows and pass the tree to it
   //*************************************************************************
 
   // Create toplevel widget with horizontal layout
   QWidget toplevelWidget;
   QHBoxLayout layout;
   layout.setSpacing(2);
   layout.setMargin(0);
   toplevelWidget.setLayout(&layout);
 
   //*************************************************************************
   // Part Va: 3D view
   //*************************************************************************
 
   // Create a renderwindow
   QmitkRenderWindow renderWindow(&toplevelWidget);
   layout.addWidget(&renderWindow);
 
   // Tell the renderwindow which (part of) the tree to render
 
   renderWindow.GetRenderer()->SetDataStorage(ds);
 
   // Use it as a 3D view
   renderWindow.GetRenderer()->SetMapperID(mitk::BaseRenderer::Standard3D);
 
   // Reposition the camera to include all visible actors
   renderWindow.GetRenderer()->GetVtkRenderer()->ResetCamera();
 
   //*************************************************************************
   // Part Vb: 2D view for slicing axially
   //*************************************************************************
 
   // Create QmitkSliceWidget, which is based on the class
   // QmitkRenderWindow, but additionally provides sliders
   QmitkSliceWidget view2(&toplevelWidget);
   layout.addWidget(&view2);
 
   // Tell the QmitkSliceWidget which (part of) the tree to render.
   // By default, it slices the data axially
   view2.SetDataStorage(ds);
   mitk::DataStorage::SetOfObjects::ConstPointer rs = ds->GetSubset(mitk::TNodePredicateDataType<mitk::Image>::New());
   view2.SetData(rs->Begin(), mitk::SliceNavigationController::Axial);
   // We want to see the position of the slice in 2D and the
   // slice itself in 3D: add it to the tree!
   ds->Add(view2.GetRenderer()->GetCurrentWorldPlaneGeometryNode());
 
   //*************************************************************************
   // Part Vc: 2D view for slicing sagitally
   //*************************************************************************
 
   // Create QmitkSliceWidget, which is based on the class
   // QmitkRenderWindow, but additionally provides sliders
   QmitkSliceWidget view3(&toplevelWidget);
   layout.addWidget(&view3);
 
   // Tell the QmitkSliceWidget which (part of) the tree to render
   // and to slice sagitall
   view3.SetDataStorage(ds);
   view3.SetData(rs->Begin(), mitk::SliceNavigationController::Sagittal);
 
   // We want to see the position of the slice in 2D and the
   // slice itself in 3D: add it to the tree!
   ds->Add(view3.GetRenderer()->GetCurrentWorldPlaneGeometryNode());
 
   // *******************************************************
   // ****************** START OF NEW PART ******************
   // *******************************************************
 
   //*************************************************************************
   // Part VI: For allowing to interactively add points ...
   //*************************************************************************
 
   // ATTENTION: It is very important that the renderer already know their DataStorage,
   // because registerig DataInteractors with the render windows is done automatically
   // and only works if the BaseRenderer and the DataStorage know each other.
 
   // Create PointSet and a node for it
   mitk::PointSet::Pointer pointSet = mitk::PointSet::New();
   mitk::DataNode::Pointer pointSetNode = mitk::DataNode::New();
   // Store the point set in the DataNode
   pointSetNode->SetData(pointSet);
 
   // Add the node to the tree
   ds->Add(pointSetNode);
 
   // Create PointSetDataInteractor
   mitk::PointSetDataInteractor::Pointer interactor = mitk::PointSetDataInteractor::New();
   // Set the StateMachine pattern that describes the flow of the interactions
   interactor->LoadStateMachine("PointSet.xml");
   // Set the configuration file, which describes the user interactions that trigger actions
   // in this file SHIFT + LeftClick triggers add Point, but by modifying this file,
   // it could as well be changes to any other user interaction.
   interactor->SetEventConfig("PointSetConfig.xml");
 
   // Assign the pointSetNode to the interactor,
   // alternatively one could also add the DataInteractor to the pointSetNode using the SetDataInteractor() method.
   interactor->SetDataNode(pointSetNode);
 
   // *******************************************************
   // ******************* END OF NEW PART *******************
   // *******************************************************
 
   //*************************************************************************
   // Part VII: Qt-specific initialization
   //*************************************************************************
   toplevelWidget.show();
 
-// For testing
-#include "QtTesting.h"
-  if (strcmp(argv[argc - 1], "-testing") != 0)
-    return qtapplication.exec();
-  else
-    return QtTesting();
+  return qtapplication.exec();
 }
 /**
 \example Step5.cpp
 */
diff --git a/Examples/Tutorial/Step5/files.cmake b/Examples/Tutorial/Step5/files.cmake
index 37b77371cc..61cbad6823 100644
--- a/Examples/Tutorial/Step5/files.cmake
+++ b/Examples/Tutorial/Step5/files.cmake
@@ -1,4 +1,3 @@
 set(CPP_FILES
   Step5.cpp
-  ../QtTesting.cpp
-  )
+)
diff --git a/Examples/Tutorial/Step6/Step6main.cpp b/Examples/Tutorial/Step6/Step6main.cpp
index e6c2c61f3a..119da5e240 100644
--- a/Examples/Tutorial/Step6/Step6main.cpp
+++ b/Examples/Tutorial/Step6/Step6main.cpp
@@ -1,47 +1,42 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkRegisterClasses.h"
 #include "Step6.h"
 
 #include "mitkDataStorage.h"
 
 #include <QApplication>
 #include <itksys/SystemTools.hxx>
 int main(int argc, char *argv[])
 {
   QApplication qtapplication(argc, argv);
 
   if (argc < 2)
   {
     fprintf(
       stderr, "Usage:   %s [filename1] [filename2] ...\n\n", itksys::SystemTools::GetFilenameName(argv[0]).c_str());
     return 1;
   }
 
   // Register Qmitk-dependent global instances
   QmitkRegisterClasses();
 
   Step6 mainWidget(argc, argv, nullptr);
   mainWidget.Initialize();
   mainWidget.show();
 
-// for testing
-#include "QtTesting.h"
-  if (strcmp(argv[argc - 1], "-testing") != 0)
-    return qtapplication.exec();
-  else
-    return QtTesting();
+  return qtapplication.exec();
 }
 /**
 \example Step6main.cpp
 */
diff --git a/Examples/Tutorial/Step6/files.cmake b/Examples/Tutorial/Step6/files.cmake
index 51e4db2011..f3137dce13 100644
--- a/Examples/Tutorial/Step6/files.cmake
+++ b/Examples/Tutorial/Step6/files.cmake
@@ -1,12 +1,11 @@
 set(CPP_FILES
   Step6.cpp
   Step6RegionGrowing1.cpp
   Step6RegionGrowing2.cpp
   Step6RegionGrowing3.cpp
   Step6main.cpp
-  ../QtTesting.cpp
-  )
+)
 
 set(MOC_H_FILES
   Step6.h
-  )
+)
diff --git a/Examples/Tutorial/Step7/Step7main.cpp b/Examples/Tutorial/Step7/Step7main.cpp
index fb44f54b43..e6139d294e 100644
--- a/Examples/Tutorial/Step7/Step7main.cpp
+++ b/Examples/Tutorial/Step7/Step7main.cpp
@@ -1,47 +1,42 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkRegisterClasses.h"
 #include "Step7.h"
 
 #include <QApplication>
 #include <itksys/SystemTools.hxx>
 
 int main(int argc, char *argv[])
 {
   QApplication qtapplication(argc, argv);
 
   if (argc < 2)
   {
     fprintf(
       stderr, "Usage:   %s [filename1] [filename2] ...\n\n", itksys::SystemTools::GetFilenameName(argv[0]).c_str());
     return 1;
   }
 
   // Register Qmitk-dependent global instances
   QmitkRegisterClasses();
 
   Step7 mainWidget(argc, argv, nullptr);
   mainWidget.Initialize();
   mainWidget.show();
 
-// for testing
-#include "QtTesting.h"
-  if (strcmp(argv[argc - 1], "-testing") != 0)
-    return qtapplication.exec();
-  else
-    return QtTesting();
+  return qtapplication.exec();
 }
 
 /**
 \example Step7main.cpp
 */
diff --git a/Examples/Tutorial/Step7/files.cmake b/Examples/Tutorial/Step7/files.cmake
index 72cf47060e..136d4ba66f 100644
--- a/Examples/Tutorial/Step7/files.cmake
+++ b/Examples/Tutorial/Step7/files.cmake
@@ -1,14 +1,13 @@
 set(CPP_FILES
   Step7.cpp
   Step7main.cpp
   ../Step6/Step6RegionGrowing1.cpp
   ../Step6/Step6RegionGrowing2.cpp
   ../Step6/Step6RegionGrowing3.cpp
   ../Step6/Step6.cpp
-  ../QtTesting.cpp
-  )
+)
 
 set(MOC_H_FILES
   ../Step6/Step6.h
   Step7.h
-  )
+)
diff --git a/Examples/Tutorial/Step8/Step8main.cpp b/Examples/Tutorial/Step8/Step8main.cpp
index ecf82688a9..c1f72618a6 100644
--- a/Examples/Tutorial/Step8/Step8main.cpp
+++ b/Examples/Tutorial/Step8/Step8main.cpp
@@ -1,46 +1,41 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkRegisterClasses.h"
 #include "Step8.h"
 
 #include <QApplication>
 #include <itksys/SystemTools.hxx>
 
 int main(int argc, char *argv[])
 {
   QApplication qtapplication(argc, argv);
 
   if (argc < 2)
   {
     fprintf(
       stderr, "Usage:   %s [filename1] [filename2] ...\n\n", itksys::SystemTools::GetFilenameName(argv[0]).c_str());
     return 1;
   }
 
   // Register Qmitk-dependent global instances
   QmitkRegisterClasses();
 
   Step8 mainWidget(argc, argv, nullptr);
   mainWidget.Initialize();
   mainWidget.show();
 
-// for testing
-#include "QtTesting.h"
-  if (strcmp(argv[argc - 1], "-testing") != 0)
-    return qtapplication.exec();
-  else
-    return QtTesting();
+  return qtapplication.exec();
 }
 /**
 \example Step8main.cpp
 */
diff --git a/Examples/Tutorial/Step8/files.cmake b/Examples/Tutorial/Step8/files.cmake
index 1be2ec21f7..1570dd9dda 100644
--- a/Examples/Tutorial/Step8/files.cmake
+++ b/Examples/Tutorial/Step8/files.cmake
@@ -1,16 +1,15 @@
 set(CPP_FILES
   Step8.cpp
   Step8main.cpp
   ../Step6/Step6RegionGrowing1.cpp
   ../Step6/Step6RegionGrowing2.cpp
   ../Step6/Step6RegionGrowing3.cpp
   ../Step6/Step6.cpp
   ../Step7/Step7.cpp
-  ../QtTesting.cpp
-  )
+)
 
 set(MOC_H_FILES
   ../Step6/Step6.h
   ../Step7/Step7.h
   Step8.h
-  )
+)