diff --git a/Modules/Core/files.cmake b/Modules/Core/files.cmake
index b5a6a7cccb..00e0fe2e86 100644
--- a/Modules/Core/files.cmake
+++ b/Modules/Core/files.cmake
@@ -1,315 +1,315 @@
 file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   mitkCoreActivator.cpp
   mitkCoreObjectFactoryBase.cpp
   mitkCoreObjectFactory.cpp
   mitkCoreServices.cpp
   mitkException.cpp
 
   Algorithms/mitkBaseDataSource.cpp
   Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
   Algorithms/mitkCompareImageDataFilter.cpp
   Algorithms/mitkConvert2Dto3DImageFilter.cpp
   Algorithms/mitkDataNodeSource.cpp
   Algorithms/mitkExtractSliceFilter.cpp
   Algorithms/mitkHistogramGenerator.cpp
   Algorithms/mitkImageChannelSelector.cpp
   Algorithms/mitkImageSliceSelector.cpp
   Algorithms/mitkImageSource.cpp
   Algorithms/mitkImageTimeSelector.cpp
   Algorithms/mitkImageToImageFilter.cpp
   Algorithms/mitkImageToSurfaceFilter.cpp
   Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp
   Algorithms/mitkPlaneGeometryDataToSurfaceFilter.cpp
   Algorithms/mitkPointSetSource.cpp
   Algorithms/mitkPointSetToPointSetFilter.cpp
   Algorithms/mitkRGBToRGBACastImageFilter.cpp
   Algorithms/mitkSubImageSelector.cpp
   Algorithms/mitkSurfaceSource.cpp
   Algorithms/mitkSurfaceToImageFilter.cpp
   Algorithms/mitkSurfaceToSurfaceFilter.cpp
   Algorithms/mitkUIDGenerator.cpp
   Algorithms/mitkVolumeCalculator.cpp
 
   Controllers/mitkBaseController.cpp
   Controllers/mitkCallbackFromGUIThread.cpp
   Controllers/mitkCameraController.cpp
   Controllers/mitkCameraRotationController.cpp
   Controllers/mitkLimitedLinearUndo.cpp
   Controllers/mitkOperationEvent.cpp
   Controllers/mitkPlanePositionManager.cpp
   Controllers/mitkProgressBar.cpp
   Controllers/mitkRenderingManager.cpp
   Controllers/mitkSliceNavigationController.cpp
   Controllers/mitkSlicesCoordinator.cpp
   Controllers/mitkStatusBar.cpp
   Controllers/mitkStepper.cpp
   Controllers/mitkTestManager.cpp
   Controllers/mitkUndoController.cpp
   Controllers/mitkVerboseLimitedLinearUndo.cpp
   Controllers/mitkVtkLayerController.cpp
   DataManagement/mitkAnatomicalStructureColorPresets.cpp
   DataManagement/mitkArbitraryTimeGeometry.cpp
   DataManagement/mitkAbstractTransformGeometry.cpp
   DataManagement/mitkAnnotationProperty.cpp
   DataManagement/mitkApplicationCursor.cpp
   DataManagement/mitkApplyTransformMatrixOperation.cpp
   DataManagement/mitkBaseData.cpp
   DataManagement/mitkBaseGeometry.cpp
   DataManagement/mitkBaseProperty.cpp
   DataManagement/mitkChannelDescriptor.cpp
   DataManagement/mitkClippingProperty.cpp
   DataManagement/mitkColorProperty.cpp
   DataManagement/mitkDataNode.cpp
   DataManagement/mitkDataStorage.cpp
   DataManagement/mitkEnumerationProperty.cpp
   DataManagement/mitkFloatPropertyExtension.cpp
   DataManagement/mitkGeometry3D.cpp
   DataManagement/mitkGeometryData.cpp
   DataManagement/mitkGeometryTransformHolder.cpp
   DataManagement/mitkGroupTagProperty.cpp
   DataManagement/mitkImageAccessorBase.cpp
   DataManagement/mitkImageCaster.cpp
   DataManagement/mitkImageCastPart1.cpp
   DataManagement/mitkImageCastPart2.cpp
   DataManagement/mitkImageCastPart3.cpp
   DataManagement/mitkImageCastPart4.cpp
   DataManagement/mitkImage.cpp
   DataManagement/mitkImageDataItem.cpp
   DataManagement/mitkImageDescriptor.cpp
   DataManagement/mitkImageReadAccessor.cpp
   DataManagement/mitkImageStatisticsHolder.cpp
   DataManagement/mitkImageVtkAccessor.cpp
   DataManagement/mitkImageVtkReadAccessor.cpp
   DataManagement/mitkImageVtkWriteAccessor.cpp
   DataManagement/mitkImageWriteAccessor.cpp
   DataManagement/mitkIntPropertyExtension.cpp
   DataManagement/mitkIPersistenceService.cpp
   DataManagement/mitkIPropertyAliases.cpp
   DataManagement/mitkIPropertyDescriptions.cpp
   DataManagement/mitkIPropertyExtensions.cpp
   DataManagement/mitkIPropertyFilters.cpp
   DataManagement/mitkIPropertyPersistence.cpp
   DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
   DataManagement/mitkLandmarkProjector.cpp
   DataManagement/mitkLevelWindow.cpp
   DataManagement/mitkLevelWindowManager.cpp
   DataManagement/mitkLevelWindowPreset.cpp
   DataManagement/mitkLevelWindowProperty.cpp
   DataManagement/mitkLine.cpp
   DataManagement/mitkLookupTable.cpp
   DataManagement/mitkLookupTableProperty.cpp
   DataManagement/mitkLookupTables.cpp # specializations of GenericLookupTable
   DataManagement/mitkMaterial.cpp
   DataManagement/mitkMemoryUtilities.cpp
   DataManagement/mitkModalityProperty.cpp
   DataManagement/mitkModifiedLock.cpp
   DataManagement/mitkNodePredicateAnd.cpp
   DataManagement/mitkNodePredicateBase.cpp
   DataManagement/mitkNodePredicateCompositeBase.cpp
   DataManagement/mitkNodePredicateData.cpp
   DataManagement/mitkNodePredicateDataType.cpp
   DataManagement/mitkNodePredicateDimension.cpp
   DataManagement/mitkNodePredicateFirstLevel.cpp
   DataManagement/mitkNodePredicateNot.cpp
   DataManagement/mitkNodePredicateOr.cpp
   DataManagement/mitkNodePredicateProperty.cpp
   DataManagement/mitkNodePredicateSource.cpp
   DataManagement/mitkNumericConstants.cpp
   DataManagement/mitkPlaneGeometry.cpp
   DataManagement/mitkPlaneGeometryData.cpp
   DataManagement/mitkPlaneOperation.cpp
   DataManagement/mitkPlaneOrientationProperty.cpp
   DataManagement/mitkPointOperation.cpp
   DataManagement/mitkPointSet.cpp
   DataManagement/mitkPointSetShapeProperty.cpp
   DataManagement/mitkProperties.cpp
   DataManagement/mitkPropertyAliases.cpp
   DataManagement/mitkPropertyDescriptions.cpp
   DataManagement/mitkPropertyExtension.cpp
   DataManagement/mitkPropertyExtensions.cpp
   DataManagement/mitkPropertyFilter.cpp
   DataManagement/mitkPropertyFilters.cpp
   DataManagement/mitkPropertyList.cpp
   DataManagement/mitkPropertyListReplacedObserver.cpp
   DataManagement/mitkPropertyNameHelper.cpp
   DataManagement/mitkPropertyObserver.cpp
   DataManagement/mitkPropertyPersistence.cpp
   DataManagement/mitkPropertyPersistenceInfo.cpp
   DataManagement/mitkProportionalTimeGeometry.cpp
   DataManagement/mitkRenderingModeProperty.cpp
   DataManagement/mitkResliceMethodProperty.cpp
   DataManagement/mitkRestorePlanePositionOperation.cpp
   DataManagement/mitkRotationOperation.cpp
   DataManagement/mitkScaleOperation.cpp
   DataManagement/mitkShaderProperty.cpp
   DataManagement/mitkSlicedData.cpp
   DataManagement/mitkSlicedGeometry3D.cpp
   DataManagement/mitkSmartPointerProperty.cpp
   DataManagement/mitkStandaloneDataStorage.cpp
   DataManagement/mitkStringProperty.cpp
   DataManagement/mitkSurface.cpp
   DataManagement/mitkSurfaceOperation.cpp
   DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
   DataManagement/mitkTimeGeometry.cpp
   DataManagement/mitkTransferFunction.cpp
   DataManagement/mitkTransferFunctionInitializer.cpp
   DataManagement/mitkTransferFunctionProperty.cpp
   DataManagement/mitkTemporoSpatialStringProperty.cpp
   DataManagement/mitkVector.cpp
   DataManagement/mitkVectorProperty.cpp
   DataManagement/mitkVtkInterpolationProperty.cpp
   DataManagement/mitkVtkRepresentationProperty.cpp
   DataManagement/mitkVtkResliceInterpolationProperty.cpp
   DataManagement/mitkVtkScalarModeProperty.cpp
   DataManagement/mitkVtkVolumeRenderingProperty.cpp
   DataManagement/mitkWeakPointerProperty.cpp
 
   Interactions/mitkAction.cpp
   Interactions/mitkBindDispatcherInteractor.cpp
   Interactions/mitkCrosshairPositionEvent.cpp
   Interactions/mitkDataInteractor.cpp
   Interactions/mitkDispatcher.cpp
   Interactions/mitkDisplayCoordinateOperation.cpp
   Interactions/mitkDisplayInteractor.cpp
   Interactions/mitkEventConfig.cpp
   Interactions/mitkEventFactory.cpp
   Interactions/mitkEventRecorder.cpp
   Interactions/mitkEventStateMachine.cpp
   Interactions/mitkInteractionEventConst.cpp
   Interactions/mitkInteractionEvent.cpp
   Interactions/mitkInteractionEventHandler.cpp
   Interactions/mitkInteractionEventObserver.cpp
   Interactions/mitkInteractionKeyEvent.cpp
   Interactions/mitkInteractionPositionEvent.cpp
   Interactions/mitkInternalEvent.cpp
   Interactions/mitkMouseDoubleClickEvent.cpp
   Interactions/mitkMouseModeSwitcher.cpp
   Interactions/mitkMouseMoveEvent.cpp
   Interactions/mitkMousePressEvent.cpp
   Interactions/mitkMouseReleaseEvent.cpp
   Interactions/mitkMouseWheelEvent.cpp
   Interactions/mitkPointSetDataInteractor.cpp
   Interactions/mitkSinglePointDataInteractor.cpp
   Interactions/mitkStateMachineAction.cpp
   Interactions/mitkStateMachineCondition.cpp
   Interactions/mitkStateMachineContainer.cpp
   Interactions/mitkStateMachineState.cpp
   Interactions/mitkStateMachineTransition.cpp
   Interactions/mitkVtkEventAdapter.cpp
   Interactions/mitkVtkInteractorStyle.cxx
   Interactions/mitkXML2EventParser.cpp
 
   IO/mitkAbstractFileIO.cpp
   IO/mitkAbstractFileReader.cpp
   IO/mitkAbstractFileWriter.cpp
   IO/mitkCustomMimeType.cpp
   IO/mitkDicomSeriesReader.cpp
   IO/mitkDicomSeriesReaderService.cpp
   IO/mitkDicomSR_GantryTiltInformation.cpp
   IO/mitkDicomSR_ImageBlockDescriptor.cpp
   IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp
   IO/mitkDicomSR_LoadDICOMRGBPixel.cpp
   IO/mitkDicomSR_LoadDICOMScalar4D.cpp
   IO/mitkDicomSR_LoadDICOMScalar.cpp
   IO/mitkDicomSR_SliceGroupingResult.cpp
   IO/mitkFileReader.cpp
   IO/mitkFileReaderRegistry.cpp
   IO/mitkFileReaderSelector.cpp
   IO/mitkFileReaderWriterBase.cpp
   IO/mitkFileWriter.cpp
   IO/mitkFileWriterRegistry.cpp
   IO/mitkFileWriterSelector.cpp
   IO/mitkGeometry3DToXML.cpp
   IO/mitkIFileIO.cpp
   IO/mitkIFileReader.cpp
   IO/mitkIFileWriter.cpp
   IO/mitkGeometryDataReaderService.cpp
   IO/mitkGeometryDataWriterService.cpp
   IO/mitkImageGenerator.cpp
   IO/mitkImageVtkLegacyIO.cpp
   IO/mitkImageVtkXmlIO.cpp
   IO/mitkIMimeTypeProvider.cpp
   IO/mitkIOConstants.cpp
   IO/mitkIOMimeTypes.cpp
   IO/mitkIOUtil.cpp
   IO/mitkItkImageIO.cpp
   IO/mitkItkLoggingAdapter.cpp
   IO/mitkLegacyFileReaderService.cpp
   IO/mitkLegacyFileWriterService.cpp
   IO/mitkLocaleSwitch.cpp
   IO/mitkLog.cpp
   IO/mitkMimeType.cpp
   IO/mitkMimeTypeProvider.cpp
   IO/mitkOperation.cpp
   IO/mitkPixelType.cpp
   IO/mitkPointSetReaderService.cpp
   IO/mitkPointSetWriterService.cpp
   IO/mitkProportionalTimeGeometryToXML.cpp
   IO/mitkRawImageFileReader.cpp
   IO/mitkStandardFileLocations.cpp
   IO/mitkSurfaceStlIO.cpp
   IO/mitkSurfaceVtkIO.cpp
   IO/mitkSurfaceVtkLegacyIO.cpp
   IO/mitkSurfaceVtkXmlIO.cpp
   IO/mitkVtkLoggingAdapter.cpp
-  IO/mitkWhiteListReaderOptionsFunctor.cpp
+  IO/mitkPreferenceListReaderOptionsFunctor.cpp
 
   Rendering/mitkAbstractOverlayLayouter.cpp
   Rendering/mitkBaseRenderer.cpp
   #Rendering/mitkGLMapper.cpp Moved to deprecated LegacyGL Module
   Rendering/mitkGradientBackground.cpp
   Rendering/mitkImageVtkMapper2D.cpp
   Rendering/mitkIShaderRepository.cpp
   Rendering/mitkManufacturerLogo.cpp
   Rendering/mitkMapper.cpp
   Rendering/mitkOverlay.cpp
   Rendering/mitkOverlayManager.cpp
   Rendering/mitkPlaneGeometryDataMapper2D.cpp
   Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp
   Rendering/mitkPointSetVtkMapper2D.cpp
   Rendering/mitkPointSetVtkMapper3D.cpp
   Rendering/mitkRenderWindowBase.cpp
   Rendering/mitkRenderWindow.cpp
   Rendering/mitkRenderWindowFrame.cpp
   #Rendering/mitkSurfaceGLMapper2D.cpp Moved to deprecated LegacyGL Module
   Rendering/mitkSurfaceVtkMapper2D.cpp
   Rendering/mitkSurfaceVtkMapper3D.cpp
   Rendering/mitkVtkEventProvider.cpp
   Rendering/mitkVtkMapper.cpp
   Rendering/mitkVtkOverlay2D.cpp
   Rendering/mitkVtkOverlay3D.cpp
   Rendering/mitkVtkOverlay.cpp
   Rendering/mitkVtkPropRenderer.cpp
   Rendering/mitkVtkWidgetRendering.cpp
   Rendering/vtkMitkLevelWindowFilter.cpp
   Rendering/vtkMitkRectangleProp.cpp
   Rendering/vtkMitkRenderProp.cpp
   Rendering/vtkMitkThickSlicesFilter.cpp
   Rendering/vtkNeverTranslucentTexture.cpp
 )
 
 set(RESOURCE_FILES
 Interactions/globalConfig.xml
 Interactions/DisplayInteraction.xml
 Interactions/DisplayConfig.xml
 Interactions/DisplayConfigPACS.xml
 Interactions/DisplayConfigPACSPan.xml
 Interactions/DisplayConfigPACSScroll.xml
 Interactions/DisplayConfigPACSZoom.xml
 Interactions/DisplayConfigPACSLevelWindow.xml
 Interactions/DisplayConfigMITK.xml
 Interactions/DisplayConfigMITKNoCrosshair.xml
 Interactions/DisplayConfigMITKRotation.xml
 Interactions/DisplayConfigMITKRotationUnCoupled.xml
 Interactions/DisplayConfigMITKSwivel.xml
 Interactions/DisplayConfigMITKLimited.xml
 Interactions/PointSet.xml
 Interactions/Legacy/StateMachine.xml
 Interactions/Legacy/DisplayConfigMITKTools.xml
 Interactions/PointSetConfig.xml
 
 mitkLevelWindowPresets.xml
 mitkAnatomicalStructureColorPresets.xml
 )
diff --git a/Modules/Core/include/mitkIOUtil.h b/Modules/Core/include/mitkIOUtil.h
index 917f332080..0cca48810c 100644
--- a/Modules/Core/include/mitkIOUtil.h
+++ b/Modules/Core/include/mitkIOUtil.h
@@ -1,541 +1,542 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef MITKIOUTIL_H
 #define MITKIOUTIL_H
 
 #include <MitkCoreExports.h>
 #include <mitkDataStorage.h>
 #include <mitkImage.h>
 #include <mitkPointSet.h>
 #include <mitkSurface.h>
 
 #include <mitkFileReaderSelector.h>
 #include <mitkFileWriterSelector.h>
 #include <mitkIFileReader.h>
 #include <mitkIFileWriter.h>
 
 #include <fstream>
 
 namespace us
 {
   class ModuleResource;
 }
 
 namespace mitk
 {
   /**
    * \ingroup IO
    *
    * \brief A utility class to load and save data from/to the local file system.
    *
    * The methods LoadImage, LoadSurface, and LoadPointSet are convenience methods for general loading of
    * the three main data types in MITK. They all use the more generic method Load().
    *
    * \see QmitkIOUtil
    */
   class MITKCORE_EXPORT IOUtil
   {
   public:
     /**Struct that containes information regarding the current loading process. (e.g. Path that should be loaded,
     all found readers for the load path,...). It is set be IOUtil and used to pass information via the option callback
     in load operations.
     */
     struct MITKCORE_EXPORT LoadInfo
     {
       LoadInfo(const std::string &path);
 
       std::string m_Path;
       std::vector<BaseData::Pointer> m_Output;
 
       FileReaderSelector m_ReaderSelector;
       bool m_Cancel;
     };
 
     /**Struct that is the base class for option callbacks used in load operations. The callback is used by IOUtil, if
     more than one suitable reader was found or the a reader containes options that can be set. The callback allows to
     change option settings and select the reader that should be used (via loadInfo).
     */
     struct MITKCORE_EXPORT ReaderOptionsFunctorBase
     {
       virtual bool operator()(LoadInfo &loadInfo) const = 0;
     };
 
     struct MITKCORE_EXPORT SaveInfo
     {
       SaveInfo(const BaseData *baseData, const MimeType &mimeType, const std::string &path);
 
       bool operator<(const SaveInfo &other) const;
 
       /// The BaseData object to save.
       const BaseData *m_BaseData;
 
       /// Contains a set of IFileWriter objects.
       FileWriterSelector m_WriterSelector;
       /// The selected mime-type, used to restrict results from FileWriterSelector.
       MimeType m_MimeType;
       /// The path to write the BaseData object to.
       std::string m_Path;
       /// Flag indicating if sub-sequent save operations are to be canceled.
       bool m_Cancel;
     };
 
     /**Struct that is the base class for option callbacks used in save operations. The callback is used by IOUtil, if
     more than one suitable writer was found or the a writer containes options that can be set. The callback allows to
     change option settings and select the writer that should be used (via saveInfo).
     */
     struct MITKCORE_EXPORT WriterOptionsFunctorBase
     {
       virtual bool operator()(SaveInfo &saveInfo) const = 0;
     };
 
     /**
      * Get the file system path where the running executable is located.
      *
      * @return The location of the currently running executable, without the filename.
      */
     static std::string GetProgramPath();
 
     /**
      * Get the default temporary path.
      *
      * @return The default path for temporary data.
      */
     static std::string GetTempPath();
 
     /**
     * Returns the Directory Seperator for the current OS.
     *
     * @return the Directory Seperator for the current OS, i.e. "\\" for Windows and "/" otherwise.
     */
     static char GetDirectorySeparator();
 
     /**
      * Create and open a temporary file.
      *
      * This method generates a unique temporary filename from \c templateName, creates
      * and opens the file using the output stream \c tmpStream and returns the name of
      * the newly create file.
      *
      * The \c templateName argument must contain six consective 'X' characters ("XXXXXX")
      * and these are replaced with a string that makes the filename unique.
      *
      * The file is created with read and write permissions for owner only.
      *
      * @param tmpStream The output stream for writing to the temporary file.
      * @param templateName An optional template for the filename.
      * @param path An optional path where the temporary file should be created. Defaults
      *        to the default temp path as returned by GetTempPath().
      * @return The filename of the created temporary file.
      *
      * @throw mitk::Exception if the temporary file could not be created.
      */
     static std::string CreateTemporaryFile(std::ofstream &tmpStream,
                                            const std::string &templateName = "XXXXXX",
                                            std::string path = std::string());
 
     /**
      * Create and open a temporary file.
      *
      * This method generates a unique temporary filename from \c templateName, creates
      * and opens the file using the output stream \c tmpStream and the specified open
      * mode \c mode and returns the name of the newly create file. The open mode is always
      * OR'd with \begin{code}std::ios_base::out | std::ios_base::trunc\end{code}.
      *
      * The \c templateName argument must contain six consective 'X' characters ("XXXXXX")
      * and these are replaced with a string that makes the filename unique.
      *
      * The file is created with read and write permissions for owner only.
      *
      * @param tmpStream The output stream for writing to the temporary file.
      * @param mode The open mode for the temporary file stream.
      * @param templateName An optional template for the filename.
      * @param path An optional path where the temporary file should be created. Defaults
      *        to the default temp path as returned by GetTempPath().
      * @return The filename of the created temporary file.
      *
      * @throw mitk::Exception if the temporary file could not be created.
      */
     static std::string CreateTemporaryFile(std::ofstream &tmpStream,
                                            std::ios_base::openmode mode,
                                            const std::string &templateName = "XXXXXX",
                                            std::string path = std::string());
 
     /**
     * Creates an empty temporary file.
     *
     * This method generates a unique temporary filename from \c templateName and creates
     * this file.
     *
     * The file is created with read and write permissions for owner only.
     *
     * ---
     * This version is potentially unsafe because the created temporary file is not kept open
     * and could be used by another process between calling this method and opening the returned
     * file path for reading or writing.
     * ---
     *
     * @return The filename of the created temporary file.
     * @param templateName An optional template for the filename.
     * @param path An optional path where the temporary file should be created. Defaults
     *        to the default temp path as returned by GetTempPath().
     * @throw mitk::Exception if the temporary file could not be created.
     */
     static std::string CreateTemporaryFile(const std::string &templateName = "XXXXXX",
                                            std::string path = std::string());
 
     /**
      * Create a temporary directory.
      *
      * This method generates a uniquely named temporary directory from \c templateName.
      * The last set of six consecutive 'X' characters in \c templateName is replaced
      * with a string that makes the directory name unique.
      *
      * The directory is created with read, write and executable permissions for owner only.
      *
      * @param templateName An optional template for the directory name.
      * @param path An optional path where the temporary directory should be created. Defaults
      *        to the default temp path as returned by GetTempPath().
      * @return The filename of the created temporary file.
      *
      * @throw mitk::Exception if the temporary directory could not be created.
      */
     static std::string CreateTemporaryDirectory(const std::string &templateName = "XXXXXX",
                                                 std::string path = std::string());
 
     /**
      * @brief Load a file into the given DataStorage.
      *
      * This method calls Load(const std::vector<std::string>&, DataStorage&) with a
      * one-element vector.
      *
      * @param path The absolute file name including the file extension.
      * @param storage A DataStorage object to which the loaded data will be added.
      * @param optionsCallback Pointer to a callback instance. The callback is used by
      * the load operation if more the suitable reader was found or the reader has options
      * that can be set.
      * @return The set of added DataNode objects.
      * @throws mitk::Exception if \c path could not be loaded.
      *
      * @sa Load(const std::vector<std::string>&, DataStorage&)
      */
     static DataStorage::SetOfObjects::Pointer Load(const std::string &path, DataStorage &storage,
                                                    const ReaderOptionsFunctorBase *optionsCallback = nullptr);
 
     /**
     * @brief Load a file into the given DataStorage given user defined IFileReader::Options.
     *
     * This method calls Load(const std::vector<std::string>&, DataStorage&) with a
     * one-element vector.
     *
     * @param path The absolute file name including the file extension.
     * @param options IFileReader option instance that should be used if selected reader
     * has options.
     * @param storage A DataStorage object to which the loaded data will be added.
     * @return The set of added DataNode objects.
     * @throws mitk::Exception if \c path could not be loaded.
     *
     * @sa Load(const std::vector<std::string>&, DataStorage&)
-    */    static DataStorage::SetOfObjects::Pointer Load(const std::string &path,
+    */
+    static DataStorage::SetOfObjects::Pointer Load(const std::string &path,
                                                    const IFileReader::Options &options,
                                                    DataStorage &storage);
 
     /**
     * @brief Load a file and return the loaded data.
     *
     * This method calls Load(const std::vector<std::string>&) with a
     * one-element vector.
     *
     * @param path The absolute file name including the file extension.
     * @param optionsCallback Pointer to a callback instance. The callback is used by
     * the load operation if more the suitable reader was found or the reader has options
     * that can be set.
     * @return The set of added DataNode objects.
     * @throws mitk::Exception if \c path could not be loaded.
     *
     * @sa Load(const std::vector<std::string>&, DataStorage&)
     */
     static std::vector<BaseData::Pointer> Load(const std::string &path,
                                                const ReaderOptionsFunctorBase *optionsCallback = nullptr);
 
     /**
     * @brief Load a file and return the loaded data.
     *
     * This method calls Load(const std::vector<std::string>&) with a
     * one-element vector.
     *
     * @param path The absolute file name including the file extension.
     * @param options IFileReader option instance that should be used if selected reader
     * has options.
     * @return The set of added DataNode objects.
     * @throws mitk::Exception if \c path could not be loaded.
     *
     * @sa Load(const std::vector<std::string>&, DataStorage&)
     */
     static std::vector<BaseData::Pointer> Load(const std::string &path, const IFileReader::Options &options);
 
     /**
      * @brief Loads a list of file paths into the given DataStorage.
      *
      * If an entry in \c paths cannot be loaded, this method will continue to load
      * the remaining entries into \c storage and throw an exception afterwards.
      *
      * @param paths A list of absolute file names including the file extension.
      * @param storage A DataStorage object to which the loaded data will be added.
      * @param optionsCallback Pointer to a callback instance. The callback is used by
      * the load operation if more the suitable reader was found or the reader has options
      * that can be set.
      * @return The set of added DataNode objects.
      * @throws mitk::Exception if an entry in \c paths could not be loaded.
      */
     static DataStorage::SetOfObjects::Pointer Load(const std::vector<std::string> &paths, DataStorage &storage,
                                                    const ReaderOptionsFunctorBase *optionsCallback = nullptr);
 
     static std::vector<BaseData::Pointer> Load(const std::vector<std::string> &paths,
                                                const ReaderOptionsFunctorBase *optionsCallback = nullptr);
 
     /**
      * Load files in <code>fileNames</code> and add the constructed mitk::DataNode instances
      * to the mitk::DataStorage <code>storage</code>
      *
      * @param fileNames A list (vector) of absolute file name paths.
      * @param storage The data storage to which the constructed data nodes are added.
      * @return The number of added mitk::DataNode instances.
      *
      * @deprecatedSince{2014_10} Use Load() instead
      */
     DEPRECATED(static int LoadFiles(const std::vector<std::string> &fileNames, DataStorage &storage));
 
     /**
      * This method will create a new mitk::DataStorage instance and pass it to
      * LoadFiles(std::vector<std::string>,DataStorage).
      *
      * @param fileNames A list (vector) of absolute file name paths.
      * @return The new mitk::DataStorage containing the constructed data nodes.
      *
      * @see LoadFiles(std::vector<std::string>,DataStorage)
      *
      * @deprecatedSince{2014_10} Use Load() instead
      */
     DEPRECATED(static DataStorage::Pointer LoadFiles(const std::vector<std::string> &fileNames));
 
     /**
      * @brief Create a BaseData object from the given file.
      * @param path The path to the file including file name and file extension.
      * @throws mitk::Exception In case of an error when reading the file.
      * @return Returns the created BaseData object.
      *
      * @deprecatedSince{2014_10} Use Load() or FileReaderRegistry::Read() instead.
      */
     DEPRECATED(static mitk::BaseData::Pointer LoadBaseData(const std::string &path));
 
     /**
      * @brief LoadDataNode Method to load an arbitrary DataNode.
      * @param path The path to the file including file name and file extension.
      * @throws mitk::Exception This exception is thrown when the DataNodeFactory is not able to read/find the file
      * or the DataNode is NULL.
      * @return Returns the DataNode.
      *
      * @deprecatedSince{2014_10} Use Load() instead.
      */
     DEPRECATED(static mitk::DataNode::Pointer LoadDataNode(const std::string &path));
 
     /**
      * @brief LoadImage Convenience method to load an arbitrary mitkImage.
      * @param path The path to the image including file name and file extension.
      * @param optionsCallback Pointer to a callback instance. The callback is used by
      * the load operation if more the suitable reader was found or the reader has options
      * that can be set.
      * @throws mitk::Exception This exception is thrown when the Image is NULL.
      * @return Returns the mitkImage.
      */
     static mitk::Image::Pointer LoadImage(const std::string &path,
       const ReaderOptionsFunctorBase *optionsCallback = nullptr);
 
     /**
      * @brief LoadSurface Convenience method to load an arbitrary mitkSurface.
      * @param path The path to the surface including file name and file extension.
      * @param optionsCallback Pointer to a callback instance. The callback is used by
      * the load operation if more the suitable reader was found or the reader has options
      * that can be set.
      * @throws mitk::Exception This exception is thrown when the Surface is NULL.
      * @return Returns the mitkSurface.
      */
     static mitk::Surface::Pointer LoadSurface(const std::string &path,
       const ReaderOptionsFunctorBase *optionsCallback = nullptr);
 
     /**
      * @brief LoadPointSet Convenience method to load an arbitrary mitkPointSet.
      * @param path The path to the pointset including file name and file extension (currently, only .mps is supported).
      * @param optionsCallback Pointer to a callback instance. The callback is used by
      * the load operation if more the suitable reader was found or the reader has options
      * that can be set.
      * @throws mitk::Exception This exception is thrown when the PointSet is NULL.
      * @return Returns the mitkPointSet.
      */
     static mitk::PointSet::Pointer LoadPointSet(const std::string &path,
       const ReaderOptionsFunctorBase *optionsCallback = nullptr);
 
     /**
      * @brief Loads the contents of a us::ModuleResource and returns the corresponding mitk::BaseData
      * @param usResource a ModuleResource, representing a BaseData object
      * @param mode Optional parameter to set the openmode of the stream
      * @return The set of loaded BaseData objects. \c Should contain either one or zero elements, since a resource
      * stream
      * respresents one object.
      * @throws mitk::Exception if no reader was found for the stream.
      */
     static std::vector<BaseData::Pointer> Load(const us::ModuleResource &usResource,
                                                std::ios_base::openmode mode = std::ios_base::in);
 
     /**
      * @brief Save a mitk::BaseData instance.
      * @param data The data to save.
      * @param path The path to the image including file name and and optional file extension.
      *        If no extension is set, the default extension and mime-type for the
      *        BaseData type of \c data is used.
      * @throws mitk::Exception if no writer for \c data is available or the writer
      *         is not able to write the image.
      */
     static void Save(const mitk::BaseData *data, const std::string &path);
 
     /**
      * @brief Save a mitk::BaseData instance.
      * @param data The data to save.
      * @param path The path to the image including file name and an optional file extension.
      *        If no extension is set, the default extension and mime-type for the
      *        BaseData type of \c data is used.
      * @param options The IFileWriter options to use for the selected writer.
      * @throws mitk::Exception if no writer for \c data is available or the writer
      *         is not able to write the image.
      */
     static void Save(const mitk::BaseData *data, const std::string &path, const IFileWriter::Options &options);
 
     /**
      * @brief Save a mitk::BaseData instance.
      * @param data The data to save.
      * @param mimeType The mime-type to use for writing \c data.
      * @param path The path to the image including file name and an optional file extension.
      * @param addExtension If \c true, an extension according to the given \c mimeType
      *        is added to \c path if it does not contain one. If \c path already contains
      *        a file name extension, it is not checked for compatibility with \c mimeType.
      *
      * @throws mitk::Exception if no writer for the combination of \c data and \c mimeType is
      *         available or the writer is not able to write the image.
      */
     static void Save(const mitk::BaseData *data,
                      const std::string &mimeType,
                      const std::string &path,
                      bool addExtension = true);
 
     /**
      * @brief Save a mitk::BaseData instance.
      * @param data The data to save.
      * @param mimeType The mime-type to use for writing \c data.
      * @param path The path to the image including file name and an optional file extension.
      * @param options Configuration data for the used IFileWriter instance.
      * @param addExtension If \c true, an extension according to the given \c mimeType
      *        is added to \c path if it does not contain one. If \c path already contains
      *        a file name extension, it is not checked for compatibility with \c mimeType.
      *
      * @throws mitk::Exception if no writer for the combination of \c data and \c mimeType is
      *         available or the writer is not able to write the image.
      */
     static void Save(const mitk::BaseData *data,
                      const std::string &mimeType,
                      const std::string &path,
                      const mitk::IFileWriter::Options &options,
                      bool addExtension = true);
 
     /**
      * @brief Use SaveInfo objects to save BaseData instances.
      *
      * This is a low-level method for directly working with SaveInfo objects. Usually,
      * the Save() methods taking a BaseData object as an argument are more appropriate.
      *
      * @param saveInfos A list of SaveInfo objects for saving contained BaseData objects.
      *
      * @see Save(const mitk::BaseData*, const std::string&)
      */
     static void Save(std::vector<SaveInfo> &saveInfos);
 
     /**
      * @brief SaveImage Convenience method to save an arbitrary mitkImage.
      * @param path The path to the image including file name and file extension.
      *        If no extention is set, the default value (defined in DEFAULTIMAGEEXTENSION) is used.
      * @param image The image to save.
      * @throws mitk::Exception This exception is thrown when the writer is not able to write the image.
      * @return Returns true for success else false.
      *
      * @deprecatedSince{2014_10} Use Save() instead.
      */
     DEPRECATED(static bool SaveImage(mitk::Image::Pointer image, const std::string &path));
 
     /**
      * @brief SaveBaseData Convenience method to save arbitrary baseData.
      * @param path The path to the image including file name and file extension.
      *        If no extention is set, the default extension is used.
      * @param data The data to save.
      * @throws mitk::Exception This exception is thrown when the writer is not able to write the image.
      * @return Returns true for success else false.
      *
      * @deprecatedSince{2014_10} Use Save() instead.
      */
     DEPRECATED(static bool SaveBaseData(mitk::BaseData *data, const std::string &path));
 
     /**
      * @brief SaveSurface Convenience method to save an arbitrary mitkSurface.
      * @param path The path to the surface including file name and file extension.
      *        If no extention is set, the default extension is used.
      * @throws mitk::Exception This exception is thrown when the writer is not able to write the surface.
      * or if the fileextension is not suitable for writing.
      * @return Returns true for success else false.
      *
      * @deprecatedSince{2014_10} Use Save() instead.
      */
     DEPRECATED(static bool SaveSurface(mitk::Surface::Pointer surface, const std::string &path));
 
     /**
      * @brief SavePointSet Convenience method to save an mitkPointSet.
      * @param path The path to the pointset including file name and file extension.
      *        If no extention is set, the default extension is used.
      * @throws mitk::Exception This exception is thrown when the writer is not able to write the pointset.
      * @return Returns true for success else false.
      *
      * @deprecatedSince{2014_10} Use Save() instead.
      */
     DEPRECATED(static bool SavePointSet(mitk::PointSet::Pointer pointset, const std::string &path));
 
   protected:
     static std::string Load(std::vector<LoadInfo> &loadInfos,
                             DataStorage::SetOfObjects *nodeResult,
                             DataStorage *ds,
                             const ReaderOptionsFunctorBase *optionsCallback);
 
     static std::string Save(const BaseData *data,
                             const std::string &mimeType,
                             const std::string &path,
                             WriterOptionsFunctorBase *optionsCallback,
                             bool addExtension);
 
     static std::string Save(std::vector<SaveInfo> &saveInfos, WriterOptionsFunctorBase *optionsCallback);
 
   private:
     struct Impl;
   };
 }
 
 #endif // MITKIOUTIL_H
diff --git a/Modules/Core/include/mitkWhiteListReaderOptionsFunctor.h b/Modules/Core/include/mitkPreferenceListReaderOptionsFunctor.h
similarity index 52%
rename from Modules/Core/include/mitkWhiteListReaderOptionsFunctor.h
rename to Modules/Core/include/mitkPreferenceListReaderOptionsFunctor.h
index cc552d478e..17be2d169c 100644
--- a/Modules/Core/include/mitkWhiteListReaderOptionsFunctor.h
+++ b/Modules/Core/include/mitkPreferenceListReaderOptionsFunctor.h
@@ -1,56 +1,61 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
-#ifndef MITKWHITELISTREADEROPTIONSFUNCTOR_H
-#define MITKWHITELISTREADEROPTIONSFUNCTOR_H
+#ifndef MITKPREFERENCELISTREADEROPTIONSFUNCTOR_H
+#define MITKPREFERENCELISTREADEROPTIONSFUNCTOR_H
 
 #include <MitkCoreExports.h>
 #include <mitkIOUtil.h>
 
 #include <vector>
 #include <string>
 
 
 namespace mitk
 {
   /**
    * \ingroup IO
    *
-   * \brief Option callback functor with a white list/ black list option selection strategy.
+   * \brief Option callback functor with a preference list/ black list option selection strategy.
    *
    * This functor can be used if a option selection should be done without user interaction.
-   * Setting up the functor one can specify a white and black lists of controller descriptions.
+   * Setting up the functor one can specify a preference and black lists of controller descriptions.
    * Any controller description on the black list will be ignored and never selected.
-   * The first controller description found on the white list will be selected.
+   * The first controller description found on the preference list will be selected.
+   * Any controller listed on the black list is always ignored. Even if it is also
+   * listed on the preference list.
+   * If no preference listed controller is available, the functor will use the pre selected reader.
+   * If no pre selected controller is available, the functor will use the first not black
+   * listed reader.
    *
    * \see IOUtil
    */
-  struct MITKCORE_EXPORT WhiteListReaderOptionsFunctor : public IOUtil::ReaderOptionsFunctorBase
+  struct MITKCORE_EXPORT PreferenceListReaderOptionsFunctor : public IOUtil::ReaderOptionsFunctorBase
   {
     using ListType = std::vector<std::string>;
 
     virtual bool operator()(IOUtil::LoadInfo &loadInfo) const override;
 
-    WhiteListReaderOptionsFunctor();
-    WhiteListReaderOptionsFunctor(const ListType& white, const ListType& black);
+    PreferenceListReaderOptionsFunctor();
+    PreferenceListReaderOptionsFunctor(const ListType& preference, const ListType& black);
 
   protected:
-    ListType m_WhiteList;
+    ListType m_PreferenceList;
     ListType m_BlackList;
   };
 }
 
 #endif // MITKWHITELISTREADEROPTIONSFUNCTOR_H
diff --git a/Modules/Core/src/IO/mitkWhiteListReaderOptionsFunctor.cpp b/Modules/Core/src/IO/mitkPreferenceListReaderOptionsFunctor.cpp
similarity index 60%
rename from Modules/Core/src/IO/mitkWhiteListReaderOptionsFunctor.cpp
rename to Modules/Core/src/IO/mitkPreferenceListReaderOptionsFunctor.cpp
index 55178e3712..1736a284fc 100644
--- a/Modules/Core/src/IO/mitkWhiteListReaderOptionsFunctor.cpp
+++ b/Modules/Core/src/IO/mitkPreferenceListReaderOptionsFunctor.cpp
@@ -1,68 +1,76 @@
 /*===================================================================
 
 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 "mitkWhiteListReaderOptionsFunctor.h"
+#include "mitkPreferenceListReaderOptionsFunctor.h"
 
-mitk::WhiteListReaderOptionsFunctor::WhiteListReaderOptionsFunctor()
+mitk::PreferenceListReaderOptionsFunctor::PreferenceListReaderOptionsFunctor()
 {
 
 }
 
-mitk::WhiteListReaderOptionsFunctor::WhiteListReaderOptionsFunctor(const ListType& white, const ListType& black) : m_WhiteList(white), m_BlackList(black)
+mitk::PreferenceListReaderOptionsFunctor::PreferenceListReaderOptionsFunctor(const ListType& preference, const ListType& black) : m_PreferenceList(preference), m_BlackList(black)
 {
 
 }
 
-bool mitk::WhiteListReaderOptionsFunctor::operator()(IOUtil::LoadInfo &loadInfo) const
+bool mitk::PreferenceListReaderOptionsFunctor::operator()(IOUtil::LoadInfo &loadInfo) const
 {
   auto readerItems = loadInfo.m_ReaderSelector.Get();
 
   auto selectedID = loadInfo.m_ReaderSelector.GetSelectedId();
 
   //check if the pre selected ID is on the blacklist. If true, "un"select.
   auto finding = std::find(m_BlackList.begin(), m_BlackList.end(), loadInfo.m_ReaderSelector.GetSelected().GetDescription());
   if (finding != m_BlackList.end())
   {
     selectedID = -1;
   }
 
   for (auto reader : readerItems)
   {
     finding = std::find(m_BlackList.begin(), m_BlackList.end(), reader.GetDescription());
 
     if (finding != m_BlackList.end())
     {
       continue;
     }
 
-    finding = std::find(m_WhiteList.begin(), m_WhiteList.end(), reader.GetDescription());
+    finding = std::find(m_PreferenceList.begin(), m_PreferenceList.end(), reader.GetDescription());
 
-    if (finding != m_WhiteList.end())
+    if (finding != m_PreferenceList.end())
     {
       selectedID = reader.GetServiceId();
       break;
     }
 
     if (selectedID==-1)
     {
       selectedID = reader.GetServiceId();
     }
   }
 
-  loadInfo.m_ReaderSelector.Select(selectedID);
+  if (selectedID == -1)
+  {
+    mitkThrow() << "No valid reader found. All available readers are black listed.";
+  }
+
+  if (!loadInfo.m_ReaderSelector.Select(selectedID))
+  {
+    MITK_DEBUG << "Was not able to select reader found by the PreferenceListReaderOptionsFunctor";
+  }
 
   return true;
 }
diff --git a/Modules/Core/test/files.cmake b/Modules/Core/test/files.cmake
index b88efd51dd..01e8cbce55 100644
--- a/Modules/Core/test/files.cmake
+++ b/Modules/Core/test/files.cmake
@@ -1,197 +1,197 @@
 # tests with no extra command line parameter
 set(MODULE_TESTS
   # IMPORTANT: If you plan to deactivate / comment out a test please write a bug number to the commented out line of code.
   #
   #     Example: #mitkMyTest #this test is commented out because of bug 12345
   #
   # It is important that the bug is open and that the test will be activated again before the bug is closed. This assures that
   # no test is forgotten after it was commented out. If there is no bug for your current problem, please add a new one and
   # mark it as critical.
 
   ################## DISABLED TESTS #################################################
   #mitkAbstractTransformGeometryTest.cpp #seems as tested class mitkExternAbstractTransformGeometry doesnt exist any more
   #mitkStateMachineContainerTest.cpp #rewrite test, indirect since no longer exported Bug 14529
   #mitkRegistrationBaseTest.cpp #tested class  mitkRegistrationBase doesn't exist any more
   #mitkSegmentationInterpolationTest.cpp #file doesn't exist!
   #mitkPipelineSmartPointerCorrectnessTest.cpp #file doesn't exist!
   #mitkITKThreadingTest.cpp #test outdated because itk::Semaphore was removed from ITK
   #mitkAbstractTransformPlaneGeometryTest.cpp #mitkVtkAbstractTransformPlaneGeometry doesn't exist any more
   #mitkTestUtilSharedLibrary.cpp #Linker problem with this test...
   #mitkTextOverlay2DSymbolsRenderingTest.cpp #Implementation of the tested feature is not finished yet. Ask Christoph or see bug 15104 for details.
 
   ################# RUNNING TESTS ###################################################
   mitkAccessByItkTest.cpp
   mitkCoreObjectFactoryTest.cpp
   mitkDataNodeTest.cpp
   mitkMaterialTest.cpp
   mitkActionTest.cpp
   mitkDispatcherTest.cpp
   mitkEnumerationPropertyTest.cpp
   mitkFileReaderRegistryTest.cpp
   #mitkFileWriterRegistryTest.cpp
   mitkFloatToStringTest.cpp
   mitkGenericPropertyTest.cpp
   mitkGeometry3DTest.cpp
   mitkGeometry3DEqualTest.cpp
   mitkGeometryDataIOTest.cpp
   mitkGeometryDataToSurfaceFilterTest.cpp
   mitkImageCastTest.cpp
   mitkImageEqualTest.cpp
   mitkImageDataItemTest.cpp
   mitkImageGeneratorTest.cpp
   mitkIOUtilTest.cpp
   mitkBaseDataTest.cpp
   mitkImportItkImageTest.cpp
   mitkGrabItkImageMemoryTest.cpp
   mitkInstantiateAccessFunctionTest.cpp
   mitkLevelWindowTest.cpp
   mitkMessageTest.cpp
   mitkPixelTypeTest.cpp
   mitkPlaneGeometryTest.cpp
   mitkPointSetTest.cpp
   mitkPointSetEqualTest.cpp
   mitkPointSetFileIOTest.cpp
   mitkPointSetOnEmptyTest.cpp
   mitkPointSetLocaleTest.cpp
   mitkPointSetWriterTest.cpp
   mitkPointSetReaderTest.cpp
   mitkPointSetPointOperationsTest.cpp
   mitkProgressBarTest.cpp
   mitkPropertyTest.cpp
   mitkPropertyListTest.cpp
   mitkPropertyPersistenceTest.cpp
   mitkPropertyPersistenceInfoTest.cpp
   mitkSlicedGeometry3DTest.cpp
   mitkSliceNavigationControllerTest.cpp
   mitkSurfaceTest.cpp
   mitkSurfaceEqualTest.cpp
   mitkSurfaceToSurfaceFilterTest.cpp
   mitkTimeGeometryTest.cpp
   mitkProportionalTimeGeometryTest.cpp
   mitkUndoControllerTest.cpp
   mitkVtkWidgetRenderingTest.cpp
   mitkVerboseLimitedLinearUndoTest.cpp
   mitkWeakPointerTest.cpp
   mitkTransferFunctionTest.cpp
   mitkStepperTest.cpp
   mitkRenderingManagerTest.cpp
   vtkMitkThickSlicesFilterTest.cpp
   mitkNodePredicateSourceTest.cpp
   mitkVectorTest.cpp
   mitkClippedSurfaceBoundsCalculatorTest.cpp
   mitkExceptionTest.cpp
   mitkExtractSliceFilterTest.cpp
   mitkLogTest.cpp
   mitkImageDimensionConverterTest.cpp
   mitkLoggingAdapterTest.cpp
   mitkUIDGeneratorTest.cpp
   mitkShaderRepositoryTest.cpp
   mitkPlanePositionManagerTest.cpp
   mitkAffineTransformBaseTest.cpp
   mitkPropertyAliasesTest.cpp
   mitkPropertyDescriptionsTest.cpp
   mitkPropertyExtensionsTest.cpp
   mitkPropertyFiltersTest.cpp
   mitkTinyXMLTest.cpp
   mitkRawImageFileReaderTest.cpp
   mitkInteractionEventTest.cpp
   mitkLookupTableTest.cpp
   mitkSTLFileReaderTest.cpp
   mitkPointTypeConversionTest.cpp
   mitkVectorTypeConversionTest.cpp
   mitkMatrixTypeConversionTest.cpp
   mitkArrayTypeConversionTest.cpp
   mitkSurfaceToImageFilterTest.cpp
   mitkBaseGeometryTest.cpp
   mitkImageToSurfaceFilterTest.cpp
   mitkEqualTest.cpp
   mitkLineTest.cpp
   mitkArbitraryTimeGeometryTest
   mitkItkImageIOTest.cpp
   mitkRotatedSlice4DTest.cpp
   mitkLevelWindowManagerCppUnitTest.cpp
   mitkVectorPropertyTest.cpp
   mitkTemporoSpatialStringPropertyTest.cpp
   mitkPropertyNameHelperTest.cpp
-  mitkWhiteListReaderOptionsFunctorTest.cpp
+  mitkPreferenceListReaderOptionsFunctorTest.cpp
 )
 
 if(MITK_ENABLE_RENDERING_TESTING)
 set(MODULE_TESTS
   ${MODULE_TESTS}
   mitkPlaneGeometryDataMapper2DTest.cpp
   mitkPointSetDataInteractorTest.cpp #since mitkInteractionTestHelper is currently creating a vtkRenderWindow
   mitkSurfaceVtkMapper2DTest.cpp #new rendering test in CppUnit style
   mitkSurfaceVtkMapper2D3DTest.cpp # comparisons/consistency 2D/3D
 )
 endif()
 
 
 
 # test with image filename as an extra command line parameter
 set(MODULE_IMAGE_TESTS
   mitkImageTimeSelectorTest.cpp #only runs on images
   mitkImageAccessorTest.cpp #only runs on images
 )
 
 set(MODULE_SURFACE_TESTS
   mitkSurfaceVtkWriterTest.cpp #only runs on surfaces
 )
 
 # list of images for which the tests are run
 set(MODULE_TESTIMAGE
   US4DCyl.nrrd
   Pic3D.nrrd
   Pic2DplusT.nrrd
   BallBinary30x30x30.nrrd
   Png2D-bw.png
 )
 set(MODULE_TESTSURFACE
   binary.stl
   ball.stl
 )
 
 set(MODULE_CUSTOM_TESTS
     mitkDataStorageTest.cpp
     mitkDicomSeriesReaderTest.cpp
     mitkDICOMLocaleTest.cpp
     mitkDataNodeTest.cpp
     mitkEventConfigTest.cpp
     mitkPointSetLocaleTest.cpp
     mitkImageTest.cpp
     mitkImageVtkMapper2DTest.cpp
     mitkImageVtkMapper2DLevelWindowTest.cpp
     mitkImageVtkMapper2DOpacityTest.cpp
     mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp
     mitkImageVtkMapper2DColorTest.cpp
     mitkImageVtkMapper2DSwivelTest.cpp
     mitkImageVtkMapper2DTransferFunctionTest.cpp
     mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp
     mitkImageVtkMapper2DLookupTableTest.cpp
     mitkSurfaceVtkMapper3DTest
     mitkSurfaceVtkMapper3DTexturedSphereTest.cpp
     mitkVolumeCalculatorTest.cpp
     mitkLevelWindowManagerTest.cpp
     mitkPointSetVtkMapper2DTest.cpp
     mitkPointSetVtkMapper2DImageTest.cpp
     mitkPointSetVtkMapper2DGlyphTypeTest.cpp
     mitkPointSetVtkMapper2DTransformedPointsTest.cpp
     mitkVTKRenderWindowSizeTest.cpp
     mitkMultiComponentImageDataComparisonFilterTest.cpp
     mitkImageToItkTest.cpp
     mitkImageSliceSelectorTest.cpp
     mitkSurfaceDepthPeelingTest.cpp
 )
 
 # Currently not working on windows because of a rendering timing issue
 # see bug 18083 for details
 if(NOT WIN32)
  set(MODULE_CUSTOM_TESTS ${MODULE_CUSTOM_TESTS} mitkSurfaceDepthSortingTest.cpp)
 endif()
 
 set(RESOURCE_FILES
   Interactions/AddAndRemovePoints.xml
   Interactions/globalConfig.xml
   Interactions/StatemachineTest.xml
   Interactions/StatemachineConfigTest.xml
 )
diff --git a/Modules/Core/test/mitkPreferenceListReaderOptionsFunctorTest.cpp b/Modules/Core/test/mitkPreferenceListReaderOptionsFunctorTest.cpp
new file mode 100644
index 0000000000..d00b0b454f
--- /dev/null
+++ b/Modules/Core/test/mitkPreferenceListReaderOptionsFunctorTest.cpp
@@ -0,0 +1,129 @@
+/*===================================================================
+
+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 "mitkPreferenceListReaderOptionsFunctor.h"
+#include "mitkTestFixture.h"
+#include "mitkTestingMacros.h"
+
+#include <limits>
+
+class mitkPreferenceListReaderOptionsFunctorTestSuite : public mitk::TestFixture
+{
+  CPPUNIT_TEST_SUITE(mitkPreferenceListReaderOptionsFunctorTestSuite);
+
+  MITK_TEST(UsePreferenceList);
+  MITK_TEST(UseBlackList);
+  MITK_TEST(UseNoList);
+  MITK_TEST(UseBlackAndPreferenceList);
+  MITK_TEST(UseOverlappingBlackAndPreferenceList);
+  MITK_TEST(UsePreferenceListWithInexistantReaders);
+  MITK_TEST(UseAllBlackedList);
+
+
+  CPPUNIT_TEST_SUITE_END();
+
+private:
+  std::string m_ImagePath;
+  mitk::PreferenceListReaderOptionsFunctor::ListType preference;
+  mitk::PreferenceListReaderOptionsFunctor::ListType black;
+  mitk::PreferenceListReaderOptionsFunctor::ListType emptyList;
+
+public:
+  void setUp() override
+  {
+    m_ImagePath = GetTestDataFilePath("TinyCTAbdomen_DICOMReader/100");
+    
+    preference = { "MITK DICOM Reader v2 (classic config)" };
+    black = { "MITK DICOM Reader" };
+    emptyList = {};
+  }
+
+  void tearDown() override
+  {
+  }
+
+  void UsePreferenceList()
+  {
+    mitk::IOUtil::LoadInfo info(m_ImagePath);
+
+    mitk::PreferenceListReaderOptionsFunctor functor = mitk::PreferenceListReaderOptionsFunctor(preference, emptyList);
+    CPPUNIT_ASSERT(true == functor(info));
+    CPPUNIT_ASSERT_EQUAL(std::string("MITK DICOM Reader v2 (classic config)"), info.m_ReaderSelector.GetSelected().GetDescription());
+  }
+
+  void UseNoList()
+  {
+    mitk::IOUtil::LoadInfo info(m_ImagePath);
+
+    mitk::PreferenceListReaderOptionsFunctor functor = mitk::PreferenceListReaderOptionsFunctor(emptyList, emptyList);
+    CPPUNIT_ASSERT(true == functor(info));
+    CPPUNIT_ASSERT_EQUAL(std::string("MITK DICOM Reader"), info.m_ReaderSelector.GetSelected().GetDescription());
+  }
+
+  void UseBlackList()
+  {
+    mitk::IOUtil::LoadInfo info(m_ImagePath);
+
+    mitk::PreferenceListReaderOptionsFunctor functor = mitk::PreferenceListReaderOptionsFunctor(emptyList, black);
+    CPPUNIT_ASSERT(true == functor(info));
+    CPPUNIT_ASSERT(info.m_ReaderSelector.GetSelected().GetDescription() != "MITK DICOM Reader");
+  }
+
+  void UseBlackAndPreferenceList()
+  {
+    mitk::IOUtil::LoadInfo info(m_ImagePath);
+
+    mitk::PreferenceListReaderOptionsFunctor functor = mitk::PreferenceListReaderOptionsFunctor(preference, black);
+    CPPUNIT_ASSERT(true == functor(info));
+    CPPUNIT_ASSERT_EQUAL(std::string("MITK DICOM Reader v2 (classic config)"), info.m_ReaderSelector.GetSelected().GetDescription());
+  }
+
+  void UseOverlappingBlackAndPreferenceList()
+  {
+    mitk::IOUtil::LoadInfo info(m_ImagePath);
+
+    black.push_back("MITK DICOM Reader v2 (classic config)");
+
+    mitk::PreferenceListReaderOptionsFunctor functor = mitk::PreferenceListReaderOptionsFunctor(preference, black);
+    CPPUNIT_ASSERT(true == functor(info));
+    CPPUNIT_ASSERT_EQUAL(std::string("MITK DICOM Reader v2 (autoselect)"), info.m_ReaderSelector.GetSelected().GetDescription());
+  }
+
+  void UsePreferenceListWithInexistantReaders()
+  {
+    mitk::IOUtil::LoadInfo info(m_ImagePath);
+    preference.push_back("InexistantReader");
+
+    mitk::PreferenceListReaderOptionsFunctor functor = mitk::PreferenceListReaderOptionsFunctor(preference, emptyList);
+    CPPUNIT_ASSERT(true == functor(info));
+    CPPUNIT_ASSERT_EQUAL(std::string("MITK DICOM Reader v2 (classic config)"), info.m_ReaderSelector.GetSelected().GetDescription());
+  }
+
+  void UseAllBlackedList()
+  {
+    mitk::IOUtil::LoadInfo info(m_ImagePath);
+
+    for (auto reader : info.m_ReaderSelector.Get())
+    {
+      black.push_back(reader.GetDescription());
+    }
+
+    mitk::PreferenceListReaderOptionsFunctor functor = mitk::PreferenceListReaderOptionsFunctor(emptyList, black);
+    CPPUNIT_ASSERT_THROW(functor(info), mitk::Exception);
+  }
+};
+
+MITK_TEST_SUITE_REGISTRATION(mitkPreferenceListReaderOptionsFunctor)
diff --git a/Modules/Core/test/mitkWhiteListReaderOptionsFunctorTest.cpp b/Modules/Core/test/mitkWhiteListReaderOptionsFunctorTest.cpp
deleted file mode 100644
index 4d5788269e..0000000000
--- a/Modules/Core/test/mitkWhiteListReaderOptionsFunctorTest.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*===================================================================
-
-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 "mitkWhiteListReaderOptionsFunctor.h"
-#include "mitkTestFixture.h"
-#include "mitkTestingMacros.h"
-
-#include <limits>
-
-class mitkWhiteListReaderOptionsFunctorTestSuite : public mitk::TestFixture
-{
-  CPPUNIT_TEST_SUITE(mitkWhiteListReaderOptionsFunctorTestSuite);
-
-  MITK_TEST(UseWhiteList);
-  MITK_TEST(UseBlackList);
-  MITK_TEST(UseNoList);
-
-  CPPUNIT_TEST_SUITE_END();
-
-private:
-  std::string m_ImagePath;
-  mitk::WhiteListReaderOptionsFunctor::ListType white;
-  mitk::WhiteListReaderOptionsFunctor::ListType black;
-
-
-public:
-  void setUp() override
-  {
-    m_ImagePath = GetTestDataFilePath("TinyCTAbdomen_DICOMReader/100");
-    
-    white = { "MITK DICOM Reader v2 (classic config)" };
-    black = { "MITK DICOM Reader" };
-  }
-
-  void tearDown() override
-  {
-  }
-
-  void UseWhiteList()
-  {
-    mitk::IOUtil::LoadInfo info(m_ImagePath);
-
-    mitk::WhiteListReaderOptionsFunctor functor = mitk::WhiteListReaderOptionsFunctor(white, mitk::WhiteListReaderOptionsFunctor::ListType());
-    CPPUNIT_ASSERT(true == functor(info));
-    CPPUNIT_ASSERT_EQUAL(std::string("MITK DICOM Reader v2 (classic config)"), info.m_ReaderSelector.GetSelected().GetDescription());
-  }
-
-  void UseNoList()
-  {
-    mitk::IOUtil::LoadInfo info(m_ImagePath);
-
-    mitk::WhiteListReaderOptionsFunctor functor = mitk::WhiteListReaderOptionsFunctor(mitk::WhiteListReaderOptionsFunctor::ListType(), mitk::WhiteListReaderOptionsFunctor::ListType());
-    CPPUNIT_ASSERT(true == functor(info));
-    CPPUNIT_ASSERT_EQUAL(std::string("MITK DICOM Reader"), info.m_ReaderSelector.GetSelected().GetDescription());
-  }
-
-  void UseBlackList()
-  {
-    mitk::IOUtil::LoadInfo info(m_ImagePath);
-
-    mitk::WhiteListReaderOptionsFunctor functor = mitk::WhiteListReaderOptionsFunctor(mitk::WhiteListReaderOptionsFunctor::ListType(), black);
-    CPPUNIT_ASSERT(true == functor(info));
-    CPPUNIT_ASSERT(info.m_ReaderSelector.GetSelected().GetDescription() != "MITK DICOM Reader");
-  }
-};
-
-MITK_TEST_SUITE_REGISTRATION(mitkWhiteListReaderOptionsFunctor)