diff --git a/Core/Code/DataManagement/mitkRenderingModeProperty.h b/Core/Code/DataManagement/mitkRenderingModeProperty.h
index fb550df067..8d0ec3b66c 100644
--- a/Core/Code/DataManagement/mitkRenderingModeProperty.h
+++ b/Core/Code/DataManagement/mitkRenderingModeProperty.h
@@ -1,115 +1,116 @@
 /*===================================================================
 
 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 _MITK_RENDERING_MODE_PROPERTY__H_
 #define _MITK_RENDERING_MODE_PROPERTY__H_
 
 #include "mitkEnumerationProperty.h"
 
 namespace mitk
 {
 
 #ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4522)
 #endif
 
 /**
  * Encapsulates the enumeration for rendering modes. Valid values are:
  * \li LEVELWINDOW_COLOR: Level window and color will be applied to the image.
  * \li LOOKUPTABLE_LEVELWINDOW_COLOR: A lookup table, level window and color will be applied to the image.
  * \li COLORTRANSFERFUNCTION_LEVELWINDOW_COLOR: A colortransferfunction, level window and color will be applied to the image.
  * \li LOOKUPTABLE_COLOR: A lookup table and color will be applied to the image.
  * \li COLORTRANSFERFUNCTION_COLOR: A colortransferfunction and color will be applied to the image.
  *
  * The order is given by the names (e.g. LOOKUPTABLE_COLOR applies first a lookup table and next a color).
  * Currently, there is no GUI (in mitkWorkbench) support for controlling lookup tables or transfer functions.
  * This has to be done by the programmer. Color and level window are controled by color widget and level window slider.
  * Currently, the color is always applied. We do not set the color to white, if the user changes the mode. We assume
  * that users who change the mode know that a previously set color will still be applied (on top of the mode).
  */
 
 class MITK_CORE_EXPORT RenderingModeProperty : public EnumerationProperty
 {
 public:
 
   mitkClassMacro( RenderingModeProperty, EnumerationProperty );
 
   itkNewMacro(RenderingModeProperty);
 
   mitkNewMacro1Param(RenderingModeProperty, const IdType&);
 
   mitkNewMacro1Param(RenderingModeProperty, const std::string&);
 
+  //Never (!) change this without adaptation of mitkLevelWindowManagerTest::VerifyRenderingModes and mitkLevelWindowManagerTest::TestLevelWindowSliderVisibility !
   enum ImageRenderingMode
   {
     LEVELWINDOW_COLOR = 0,
     LOOKUPTABLE_LEVELWINDOW_COLOR = 1,
     COLORTRANSFERFUNCTION_LEVELWINDOW_COLOR = 2,
     LOOKUPTABLE_COLOR = 3,
     COLORTRANSFERFUNCTION_COLOR = 4
   //  Default = LEVELWINDOW_COLOR;
   };
 
   /**
    * Returns the current rendering mode
    */
   virtual int GetRenderingMode();
 
   using BaseProperty::operator=;
 
  protected:
 
   /** Sets rendering type to default (VTK_RAY_CAST_COMPOSITE_FUNCTION).
    */
   RenderingModeProperty( );
 
   /**
    * Constructor. Sets rendering type to the given value.
    */
   RenderingModeProperty( const IdType& value );
 
   /**
    * Constructor. Sets rendering type to the given value.
    */
   RenderingModeProperty( const std::string& value );
 
   /**
    * this function is overridden as protected, so that the user may not add
    * additional invalid rendering types.
    */
   virtual bool AddEnum( const std::string& name, const IdType& id );
 
   /**
    * Adds the default enumeration types.
    */
   virtual void AddRenderingModes();
 
 private:
 
   // purposely not implemented
   RenderingModeProperty& operator=(const RenderingModeProperty&);
 
   virtual itk::LightObject::Pointer InternalClone() const;
 };
 
 #ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
 } // end of namespace mitk
 
 #endif
diff --git a/Core/Code/Testing/mitkLevelWindowManagerTest.cpp b/Core/Code/Testing/mitkLevelWindowManagerTest.cpp
index e6f788d659..4ebff0b80d 100644
--- a/Core/Code/Testing/mitkLevelWindowManagerTest.cpp
+++ b/Core/Code/Testing/mitkLevelWindowManagerTest.cpp
@@ -1,162 +1,235 @@
 /*===================================================================
 
 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 "mitkLevelWindowManager.h"
 #include "mitkStandaloneDataStorage.h"
 #include <mitkTestingMacros.h>
 #include <mitkIOUtil.h>
+#include <itkMersenneTwisterRandomVariateGenerator.h>
+#include "mitkRenderingModeProperty.h"
 
 class mitkLevelWindowManagerTestClass
 {
 public:
 
   static void TestInstantiation()
   {
   mitk::LevelWindowManager::Pointer manager;
   manager = mitk::LevelWindowManager::New();
   MITK_TEST_CONDITION_REQUIRED(manager.IsNotNull(),"Testing mitk::LevelWindowManager::New()");
   }
 
   static void TestSetGetDataStorage()
   {
   mitk::LevelWindowManager::Pointer manager;
   manager = mitk::LevelWindowManager::New();
   MITK_TEST_OUTPUT(<< "Creating DataStorage: ");
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
 
   bool success = true;
   try
     {
     manager->SetDataStorage(ds);
     }
   catch(std::exception e)
     {
     success = false;
     MITK_ERROR << "Exception: " << e.what();
     }
   MITK_TEST_CONDITION_REQUIRED(success,"Testing mitk::LevelWindowManager SetDataStorage() ");
   MITK_TEST_CONDITION_REQUIRED(ds == manager->GetDataStorage(),"Testing mitk::LevelWindowManager GetDataStorage ");
 
   }
 
   static void TestMethodsWithInvalidParameters()
   {
   mitk::LevelWindowManager::Pointer manager;
   manager = mitk::LevelWindowManager::New();
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
   manager->SetDataStorage(ds);
 
   bool success = false;
   mitk::LevelWindowProperty::Pointer levelWindowProperty = mitk::LevelWindowProperty::New();
   try
     {
     manager->SetLevelWindowProperty(levelWindowProperty);
     }
   catch(mitk::Exception e)
     {
     success = true;
     }
   MITK_TEST_CONDITION(success,"Testing mitk::LevelWindowManager SetLevelWindowProperty with invalid parameter");
   }
 
   static void TestOtherMethods()
   {
   mitk::LevelWindowManager::Pointer manager;
   manager = mitk::LevelWindowManager::New();
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
   manager->SetDataStorage(ds);
 
   MITK_TEST_CONDITION(manager->isAutoTopMost(),"Testing mitk::LevelWindowManager isAutoTopMost");
 
   // It is not clear what the following code is supposed to test. The expression in
   // the catch(...) block does have no effect, so success is always true.
   // Related bugs are 13894 and 13889
   /*
   bool success = true;
   try
   {
     mitk::LevelWindow levelWindow = manager->GetLevelWindow();
     manager->SetLevelWindow(levelWindow);
   }
   catch (...)
   {
     success == false;
   }
   MITK_TEST_CONDITION(success,"Testing mitk::LevelWindowManager GetLevelWindow() and SetLevelWindow()");
   */
 
   manager->SetAutoTopMostImage(true);
   MITK_TEST_CONDITION(manager->isAutoTopMost(),"Testing mitk::LevelWindowManager isAutoTopMost()");
   }
 
   static void TestRemoveObserver(std::string testImageFile)
   {
   mitk::LevelWindowManager::Pointer manager;
   manager = mitk::LevelWindowManager::New();
   mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
   manager->SetDataStorage(ds);
 
   //add multiple objects to the data storage => multiple observers should be created
   mitk::Image::Pointer image1 = mitk::IOUtil::LoadImage(testImageFile);
   mitk::DataNode::Pointer node1 = mitk::DataNode::New();
   node1->SetData(image1);
   mitk::Image::Pointer image2 = mitk::IOUtil::LoadImage(testImageFile);
   mitk::DataNode::Pointer node2 = mitk::DataNode::New();
   node2->SetData(image2);
   ds->Add(node1);
   ds->Add(node2);
 
   MITK_TEST_CONDITION_REQUIRED(manager->GetRelevantNodes()->size() == 2, "Test if nodes have been added");
   MITK_TEST_CONDITION_REQUIRED(static_cast<int>(manager->GetRelevantNodes()->size()) == manager->GetNumberOfObservers(), "Test if number of nodes is similar to number of observers");
 
   mitk::Image::Pointer image3 = mitk::IOUtil::LoadImage(testImageFile);
   mitk::DataNode::Pointer node3 = mitk::DataNode::New();
   node3->SetData(image3);
   ds->Add(node3);
   MITK_TEST_CONDITION_REQUIRED(manager->GetRelevantNodes()->size() == 3, "Test if another node have been added");
   MITK_TEST_CONDITION_REQUIRED(static_cast<int>(manager->GetRelevantNodes()->size()) == manager->GetNumberOfObservers(), "Test if number of nodes is similar to number of observers");
 
   ds->Remove(node1);
   MITK_TEST_CONDITION_REQUIRED(manager->GetRelevantNodes()->size() == 2, "Deleted node 1 (test GetRelevantNodes())");
   MITK_TEST_CONDITION_REQUIRED(manager->GetNumberOfObservers() == 2, "Deleted node 1 (test GetNumberOfObservers())");
 
   ds->Remove(node2);
   MITK_TEST_CONDITION_REQUIRED(manager->GetRelevantNodes()->size() == 1, "Deleted node 2 (test GetRelevantNodes())");
   MITK_TEST_CONDITION_REQUIRED(manager->GetNumberOfObservers() == 1, "Deleted node 2 (test GetNumberOfObservers())");
 
   ds->Remove(node3);
   MITK_TEST_CONDITION_REQUIRED(manager->GetRelevantNodes()->size() == 0, "Deleted node 3 (test GetRelevantNodes())");
   MITK_TEST_CONDITION_REQUIRED(manager->GetNumberOfObservers() == 0, "Deleted node 3 (test GetNumberOfObservers())");
 
   }
 
+  static bool VerifyRenderingModes()
+  {
+    bool ok = false;
+
+    ok = ( mitk::RenderingModeProperty::LEVELWINDOW_COLOR == 0 ) &&
+    (mitk::RenderingModeProperty::LOOKUPTABLE_LEVELWINDOW_COLOR == 1 ) &&
+    (mitk::RenderingModeProperty::COLORTRANSFERFUNCTION_LEVELWINDOW_COLOR == 2 ) &&
+    (mitk::RenderingModeProperty::LOOKUPTABLE_COLOR == 3 ) &&
+    (mitk::RenderingModeProperty::COLORTRANSFERFUNCTION_COLOR == 4 );
+
+    return ok;
+  }
+
+  static void TestLevelWindowSliderVisibility(std::string testImageFile)
+  {
+    bool renderingModesValid = mitkLevelWindowManagerTestClass::VerifyRenderingModes();
+    if ( !renderingModesValid )
+    {
+      MITK_ERROR << "Exception: Image Rendering.Mode property value types inconsistent.";
+    }
+
+    mitk::LevelWindowManager::Pointer manager;
+    manager = mitk::LevelWindowManager::New();
+    mitk::StandaloneDataStorage::Pointer ds = mitk::StandaloneDataStorage::New();
+    manager->SetDataStorage(ds);
+
+    //add multiple objects to the data storage => multiple observers should be created
+    mitk::Image::Pointer image1 = mitk::IOUtil::LoadImage(testImageFile);
+    mitk::DataNode::Pointer node1 = mitk::DataNode::New();
+    node1->SetData(image1);
+    //mitk::DataNode::Pointer node1 = mitk::IOUtil::LoadDataNode( testImageFile );
+    mitk::DataNode::Pointer node2 = mitk::IOUtil::LoadDataNode( testImageFile );
+    mitk::DataNode::Pointer node3 = mitk::IOUtil::LoadDataNode( testImageFile );
+    std::vector< mitk::DataNode::Pointer > nodeVec;
+    //nodeVec.resize( 3 );
+    nodeVec.push_back( node1 );
+    nodeVec.push_back( node2 );
+    nodeVec.push_back( node3 );
+
+    ds->Add(node1);
+    ds->Add(node2);
+    ds->Add(node3);
+
+    typedef itk::Statistics::MersenneTwisterRandomVariateGenerator RandomGeneratorType;
+    RandomGeneratorType::Pointer rnd = RandomGeneratorType::New();
+    rnd->Initialize();
+
+    for( unsigned int i=0; i<8; ++i )
+    {
+      unsigned int parity = i;
+
+      for( unsigned int img = 0; img < 3; ++img )
+      {
+        if ( parity & 1 )
+        {
+          int mode = rnd->GetIntegerVariate() % 3;
+          nodeVec[img]->SetProperty( "Image Rendering.Mode", mitk::RenderingModeProperty::New( mode ) );
+        }
+        else
+        {
+          int mode = rnd->GetIntegerVariate() % 2;
+          nodeVec[img]->SetProperty( "Image Rendering.Mode", mitk::RenderingModeProperty::New( 3 + mode ) );
+        }
+        parity >>= 1;
+      }
+
+      MITK_TEST_CONDITION( renderingModesValid && ( !manager->GetLevelWindowProperty() && !i || manager->GetLevelWindowProperty() && i ), "Testing level window property member according to rendering mode");
+    }
+  }
+
 };
 
 int mitkLevelWindowManagerTest(int argc, char* args[])
 {
   MITK_TEST_BEGIN("mitkLevelWindowManager");
 
   MITK_TEST_CONDITION_REQUIRED( argc >= 2, "Testing if test file is given.");
   std::string testImage = args[1];
 
   mitkLevelWindowManagerTestClass::TestInstantiation();
   mitkLevelWindowManagerTestClass::TestSetGetDataStorage();
   mitkLevelWindowManagerTestClass::TestMethodsWithInvalidParameters();
   mitkLevelWindowManagerTestClass::TestOtherMethods();
   mitkLevelWindowManagerTestClass::TestRemoveObserver(testImage);
+  mitkLevelWindowManagerTestClass::TestLevelWindowSliderVisibility(testImage);
 
   MITK_TEST_END();
 }