diff --git a/Core/Code/Testing/mitkPointSetOnEmptyTest.cpp b/Core/Code/Testing/mitkPointSetOnEmptyTest.cpp
index e12e9fc405..4377d9544f 100644
--- a/Core/Code/Testing/mitkPointSetOnEmptyTest.cpp
+++ b/Core/Code/Testing/mitkPointSetOnEmptyTest.cpp
@@ -1,110 +1,244 @@
 /*
  * mitkPointSetTestOnEmpty.cpp
  *
  *  Created on: Apr 23, 2014
  *      Author: wirkert
  */
 /**
  * TestSuite for PointSet which tests properties on an empty PointSet
  */
 
 #include "mitkTestingMacros.h"
 #include "mitkTestFixture.h"
 
 
 #include <mitkPointSet.h>
 #include <mitkVector.h>
 #include <mitkPointOperation.h>
 #include <mitkInteractionConst.h>
 
 #include <fstream>
 
 class mitkPointSetOnEmptyTestSuite : public mitk::TestFixture
 {
 
   CPPUNIT_TEST_SUITE(mitkPointSetOnEmptyTestSuite);
 
   MITK_TEST(TestInstantiation);
   MITK_TEST(TestIsEmpty);
   MITK_TEST(TestGetITKPointSet);
   MITK_TEST(TestGetSizeIsZero);
   MITK_TEST(TestAddPointDirectly);
+  MITK_TEST(TestPointSetClone);
+  MITK_TEST(TestPointDataContainerCorrectAfterPointSetManipulation);
 
   CPPUNIT_TEST_SUITE_END();
 
 private:
 
   mitk::PointSet::Pointer pointSet;
 
+  void TestPointContainerPointDataContainer(mitk::PointSet* ps)
+  {
+    mitk::PointSet::PointsContainer* pc = ps->GetPointSet()->GetPoints();
+    mitk::PointSet::PointDataContainer* pd = ps->GetPointSet()->GetPointData();
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("PointContainer and PointDataContainer have same size",
+        true, pc->Size() == pd->Size());
+    mitk::PointSet::PointsContainer::ConstIterator pIt = pc->Begin();
+    mitk::PointSet::PointDataContainer::ConstIterator dIt = pd->Begin();
+    bool failed = false;
+    for (; pIt != pc->End(); ++pIt, ++dIt)
+      if (pIt->Index() != dIt->Index())
+      {
+        failed = true;
+        break;
+      }
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Indices in PointContainer and PointDataContainer are equal",
+        false, failed);
+  }
+
 public:
 
   void setUp()
   {
     //Create PointSet
     pointSet = mitk::PointSet::New();
   }
 
   void tearDown()
   {
     pointSet = NULL;
   }
 
   void TestInstantiation()
   {
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Testing instantiation",
         true, pointSet.IsNotNull());
   }
 
   void TestGetITKPointSet()
   {
     //try to get the itkPointSet
     mitk::PointSet::DataType::Pointer itkdata = NULL;
     itkdata = pointSet->GetPointSet();
     CPPUNIT_ASSERT_EQUAL_MESSAGE("try to get the itkPointSet from a newly created PointSet",
         true,  itkdata.IsNotNull());
   }
 
   void TestGetSizeIsZero()
   {
     //fresh PointSet has to be empty!
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check if the PointSet size is 0 ",
         true, pointSet->GetSize() == 0);
   }
 
   void TestIsEmpty()
   {
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check if the PointSet is empty",
         true, pointSet->IsEmptyTimeStep(0));
   }
 
   void TestAddPointDirectly()
   {
     //add a point directly
     int id=0;
     mitk::Point3D point;
     mitk::FillVector3D(point, 1.0, 2.0, 3.0);
     ++id;
     pointSet->GetPointSet()->GetPoints()->InsertElement(id, point);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check if added points exists",
         true, pointSet->GetSize()==1 ||pointSet->IndexExists(id));
 
     mitk::Point3D tempPoint;
 
     tempPoint.Fill(0);
     tempPoint = pointSet->GetPoint(id);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check if added point contains real value",
         true, point == tempPoint);
   }
 
+  void TestPointSetClone(void)
+  {
+    pointSet->Expand(3);
+    mitk::Point3D new0, new1, new2;
+    new0.Fill(0);
+    new1.Fill(1);
+    new2.Fill(2);
+    pointSet->InsertPoint(5,new0, mitk::PTCORNER,0);
+    pointSet->InsertPoint(112,new1,0);
+    pointSet->InsertPoint(2,new2,0);
+    pointSet->InsertPoint(2,new0,1);
+    pointSet->InsertPoint(1,new1,1);
+    pointSet->InsertPoint(0,new2,1);
+    pointSet->InsertPoint(0,new0,2);
+    pointSet->InsertPoint(2,new1,2);
+    pointSet->InsertPoint(1,new2,2);
+
+    MITK_TEST_OUTPUT( << "... pointset ts: " << pointSet->GetTimeSteps() )
+    mitk::PointSet::Pointer clonePS = pointSet->Clone();
+    MITK_TEST_OUTPUT( << "... clone pointset ts: " << clonePS->GetTimeSteps() )
+
+    for (unsigned int t=0; t< pointSet->GetTimeSteps(); t++)
+      {
+        MITK_TEST_OUTPUT( << "testing timestep: " << t )
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Clone has same size",
+            true, pointSet->GetSize(t) == clonePS->GetSize(t));
+
+          // test for equal point coordinates
+          for (mitk::PointSet::PointsConstIterator i = pointSet->Begin(), j = clonePS->Begin();
+              i != pointSet->End() && j != clonePS->End(); ++i, ++j)
+            {
+              CPPUNIT_ASSERT_EQUAL_MESSAGE("Cloned PS and PS have same points",
+                  true, i.Index() == j.Index() && mitk::Equal(i.Value(),j.Value()));
+            }
+
+        // test for equal point data
+        mitk::PointSet::PointDataContainer* pointDataCont = pointSet->GetPointSet(t)->GetPointData();
+        mitk::PointSet::PointDataContainer* clonePointDataCont = clonePS->GetPointSet(t)->GetPointData();
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Valid point data container",
+            true, pointDataCont && clonePointDataCont);
+        CPPUNIT_ASSERT_EQUAL_MESSAGE("Cloned point data container has same size",
+            true, pointDataCont->Size() == clonePointDataCont->Size());
+        for (mitk::PointSet::PointDataConstIterator i = pointDataCont->Begin(), j = clonePointDataCont->Begin();
+            i != pointDataCont->End() && j != clonePointDataCont->End(); ++i, ++j)
+          {
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("Cloned PS and PS have same point data",
+                true, i.Index() == j.Index() && i.Value() == j.Value());
+          }
+      }
+
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("check if the PointSet is not empty",
+        false, clonePS->IsEmptyTimeStep(0));
+
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Testing cloned point set's size!",
+        true, clonePS->GetPointSetSeriesSize() == pointSet->GetPointSetSeriesSize());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Testing that the clone is not the source PS!",
+        true, clonePS.GetPointer() != pointSet.GetPointer());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE( "Testing if the geometry is cloned correctly!",
+        true, clonePS->GetGeometry()->GetCenter() == pointSet->GetGeometry()->GetCenter());
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Testing if the property list is cloned correctly!",
+        true, clonePS->GetPropertyList()->GetMap()->size() == pointSet->GetPropertyList()->GetMap()->size());
+    // Also testing, that clone is independent from original
+    mitk::Point3D p, p2;
+    p.Fill(42);
+    p2.Fill(84);
+    clonePS->InsertPoint(0,p);
+    pointSet->InsertPoint(0,p2);
+    p = clonePS->GetPoint(0);
+    p2 = pointSet->GetPoint(0);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Testing that the clone is independent from source!",
+        true, p != p2);
+
+  }
+
+
+  void TestPointDataContainerCorrectAfterPointSetManipulation(void)
+  {
+    /* call everything that might modify PointContainer and PointDataContainer */
+    MITK_TEST_OUTPUT(<< "Test InsertPoint(), SetPoint() and SwapPointPosition()");
+    mitk::PointSet::PointType point;
+    mitk::FillVector3D(point, 2.2, 3.3, -4.4);
+    pointSet->InsertPoint(17, point);
+    pointSet->SetPoint(4, point);
+    pointSet->SetPoint(7, point);
+    pointSet->SetPoint(2, point);
+    pointSet->SwapPointPosition(7, true);
+    pointSet->SwapPointPosition(3, true);
+    pointSet->SwapPointPosition(2, false);
+    TestPointContainerPointDataContainer(pointSet);
+
+    MITK_TEST_OUTPUT(<< "Test OpREMOVE");
+    mitk::PointOperation op1(mitk::OpREMOVE, mitk::Point3D(), 2); // existing index
+    pointSet->ExecuteOperation(&op1);
+    mitk::PointOperation op1b(mitk::OpREMOVE, mitk::Point3D(), 112); // non existing index
+    pointSet->ExecuteOperation(&op1b);
+    TestPointContainerPointDataContainer(pointSet);
+
+    MITK_TEST_OUTPUT(<< "Test OpMove");
+    mitk::PointOperation op2(mitk::OpMOVE, mitk::Point3D(), 4);  // existing index
+    pointSet->ExecuteOperation(&op2);
+    mitk::PointOperation op3(mitk::OpMOVE, mitk::Point3D(), 34);  // non existing index
+    pointSet->ExecuteOperation(&op3);
+    TestPointContainerPointDataContainer(pointSet);
+
+    MITK_TEST_OUTPUT(<< "Test OpINSERT");
+    mitk::PointOperation op4(mitk::OpINSERT, mitk::Point3D(), 38);  // non existing index
+    pointSet->ExecuteOperation(&op4);
+    mitk::PointOperation op5(mitk::OpINSERT, mitk::Point3D(), 17);  // existing index
+    pointSet->ExecuteOperation(&op5);
+    TestPointContainerPointDataContainer(pointSet);
+  }
+
+
 
 
 };
 
 MITK_TEST_SUITE_REGISTRATION(mitkPointSetOnEmpty)
 
 
 
 
 
diff --git a/Core/Code/Testing/mitkPointSetTest.cpp b/Core/Code/Testing/mitkPointSetTest.cpp
index 3ec4620212..2aabf27e7b 100644
--- a/Core/Code/Testing/mitkPointSetTest.cpp
+++ b/Core/Code/Testing/mitkPointSetTest.cpp
@@ -1,539 +1,359 @@
 /*===================================================================
 
 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 "mitkTestingMacros.h"
 #include "mitkTestFixture.h"
 
 
 #include <mitkPointSet.h>
 #include <mitkVector.h>
 #include <mitkPointOperation.h>
 #include <mitkInteractionConst.h>
 
 #include <fstream>
 
 
 
 /**
  * TestSuite for PointSet stuff not only operating on an empty PointSet
  */
 class mitkPointSetTestSuite : public mitk::TestFixture
 {
   CPPUNIT_TEST_SUITE(mitkPointSetTestSuite);
 
   MITK_TEST(TestIsNotEmpty);
   MITK_TEST(TestSetSelectInfo);
   MITK_TEST(TestGetNumberOfSelected);
   MITK_TEST(TestSearchSelectedPoint);
   MITK_TEST(TestGetPointIfExists);
   MITK_TEST(TestSwapPointPositionUpwards);
   MITK_TEST(TestSwapPointPositionUpwardsNotPossible);
   MITK_TEST(TestSwapPointPositionDownwards);
   MITK_TEST(TestSwapPointPositionDownwardsNotPossible);
   MITK_TEST(TestCreateHoleInThePointIDs);
   MITK_TEST(TestInsertPointWithPointSpecification);
 
   CPPUNIT_TEST_SUITE_END();
 
 private:
 
   mitk::PointSet::Pointer pointSet;
   static const mitk::PointSet::PointIdentifier selectedPointId = 2;
 
 public:
 
   void setUp()
   {
     //Create PointSet
     pointSet = mitk::PointSet::New();
 
     // add some points
     mitk::Point3D point2, point3, point4;
     point2.Fill(3);
     point3.Fill(4);
     point4.Fill(5);
     pointSet->InsertPoint(2,point2);
     pointSet->InsertPoint(3,point3);
     pointSet->InsertPoint(4,point4);
 
     mitk::Point3D point1;
     mitk::FillVector3D(point1, 1.0, 2.0, 3.0);
     pointSet->InsertPoint(1, point1);
 
     mitk::Point3D point0;
     point0.Fill(1);
     pointSet->InsertPoint(0, point0);
 
     // select point with id 2
     pointSet->SetSelectInfo(2, true);
   }
 
 
   void tearDown()
   {
     pointSet = NULL;
   }
 
   void TestIsNotEmpty()
   {
     //PointSet can not be empty!
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "check if the PointSet is not empty ",
         true, !pointSet->IsEmptyTimeStep(0) );
 
         /*
     std::cout << "check if the PointSet is not empty ";
     if (pointSet->IsEmpty(0))
     {
     std::cout<<"[FAILED]"<<std::endl;
     return EXIT_FAILURE;
     }
     std::cout<<"[PASSED]"<<std::endl;
          */
   }
 
   void TestSetSelectInfo()
   {
     //check SetSelectInfo
     pointSet->SetSelectInfo(4, true);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check SetSelectInfo",
         true, pointSet->GetSelectInfo(4));
     /*
       if (!pointSet->GetSelectInfo(2))
       {
       std::cout<<"[FAILED]"<<std::endl;
       return EXIT_FAILURE;
       }
       delete doOp;
       std::cout<<"[PASSED]"<<std::endl;
      */
   }
 
   void TestSearchSelectedPoint()
   {
     // check SearchSelectedPoint
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check SearchSelectedPoint ",
         true, pointSet->SearchSelectedPoint() == (int) selectedPointId);
 
           /*
       if( pointSet->SearchSelectedPoint() != 4)
       {
       std::cout<<"[FAILED]"<<std::endl;
       return EXIT_FAILURE;
       }
       std::cout<<"[PASSED]"<<std::endl;
            */
   }
 
   void TestGetNumberOfSelected()
   {
 
     // check GetNumeberOfSelected
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check GetNumeberOfSelected ",
         true, pointSet->GetNumberOfSelected() == 1);
 
           /*
       if(pointSet->GetNumberOfSelected() != 1)
       {
       std::cout<<"[FAILED]"<<std::endl;
       return EXIT_FAILURE;
       }
       std::cout<<"[PASSED]"<<std::endl;
            */
   }
 
   void TestGetPointIfExists()
   {
     //check GetPointIfExists
     mitk::Point3D point4;
     mitk::Point3D tempPoint;
     point4.Fill(5);
     mitk::PointSet::PointType tmpPoint;
 
     pointSet->GetPointIfExists(4, &tmpPoint);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check GetPointIfExists: ",
         true, tmpPoint == point4);
     /*
       if (tmpPoint != point5)
       {
       std::cout<<"[FAILED]"<<std::endl;
       return EXIT_FAILURE;
       }
       std::cout<<"[PASSED]"<<std::endl;
      */
   }
 
   void TestSwapPointPositionUpwards()
   {
     //Check SwapPointPosition upwards
     mitk::Point3D point;
     mitk::Point3D tempPoint;
     point = pointSet->GetPoint(1);
     pointSet->SwapPointPosition(1, true);
     tempPoint = pointSet->GetPoint(0);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check SwapPointPosition upwards",
         true, point == tempPoint);
 
     /*
       if(point != tempPoint)
       {
       std::cout<<"[FAILED]"<<std::endl;
       return EXIT_FAILURE;
       }
       std::cout<<"[PASSED]"<<std::endl;
      */
   }
 
 
   void TestSwapPointPositionUpwardsNotPossible()
   {
     //Check SwapPointPosition upwards not possible
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check SwapPointPosition upwards not possible",
         false, pointSet->SwapPointPosition(0, true));
 
     /*
 if(pointSet->SwapPointPosition(0, true))
 {
 std::cout<<"[FAILED]"<<std::endl;
 return EXIT_FAILURE;
 }
 std::cout<<"[PASSED]"<<std::endl;
      */
   }
 
   void TestSwapPointPositionDownwards()
   {
     //Check SwapPointPosition downwards
     mitk::Point3D point;
     mitk::Point3D tempPoint;
     point = pointSet->GetPoint(0);
     pointSet->SwapPointPosition(0, false);
     tempPoint = pointSet->GetPoint(1);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check SwapPointPosition down",
         true, point == tempPoint);
 
     /*
 if(point != tempPoint)
 {
 std::cout<<"[FAILED]"<<std::endl;
 return EXIT_FAILURE;
 }
 std::cout<<"[PASSED]"<<std::endl;
      */
   }
 
   void TestSwapPointPositionDownwardsNotPossible()
   {
     mitk::PointSet::Pointer pointSet2 = mitk::PointSet::New();
 
     int id = 0;
     mitk::Point3D point;
     point.Fill(1);
     pointSet2->SetPoint(id, point);
 
 
     //Check SwapPointPosition downwards not possible
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check SwapPointPosition downwards not possible",
         false, pointSet2->SwapPointPosition(id, false));
 
     /*
 if(pointSet->SwapPointPosition(1, false))
 {
 std::cout<<"[FAILED]"<<std::endl;
 return EXIT_FAILURE;
 }
 std::cout<<"[PASSED]"<<std::endl;
      */
   }
 
 
   void TestCreateHoleInThePointIDs()
   {
     // create a hole in the point IDs
     mitk::Point3D point;
     mitk::PointSet::PointType p10, p11, p12;
     p10.Fill(10.0);
     p11.Fill(11.0);
     p12.Fill(12.0);
     pointSet->InsertPoint(10, p10);
     pointSet->InsertPoint(11, p11);
     pointSet->InsertPoint(12, p12);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("add points with id 10, 11, 12: ",
         true, (pointSet->IndexExists(10) == true) || (pointSet->IndexExists(11) == true) || (pointSet->IndexExists(12) == true));
 
     //check OpREMOVE  ExecuteOperation
     int id = 11;
     mitk::PointOperation* doOp = new mitk::PointOperation(mitk::OpREMOVE, point, id);
     pointSet->ExecuteOperation(doOp);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "remove point id 11: ",
         false, pointSet->IndexExists(id));
 
     /*
       if(pointSet->IndexExists(id))
       {
       std::cout<<"[FAILED]"<<std::endl;
       return EXIT_FAILURE;
       }
       delete doOp;
       std::cout<<"[PASSED]"<<std::endl;
      */
 
     //mitk::PointOperation* doOp = new mitk::PointOperation(mitk::OpMOVEPOINTUP, p12, 12);
     //pointSet->ExecuteOperation(doOp);
     delete doOp;
 
     //check OpMOVEPOINTUP  ExecuteOperation
     doOp = new mitk::PointOperation(mitk::OpMOVEPOINTUP, p12, 12);
     pointSet->ExecuteOperation(doOp);
     delete doOp;
 
     mitk::PointSet::PointType newP10 = pointSet->GetPoint(10);
     mitk::PointSet::PointType newP12 = pointSet->GetPoint(12);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check PointOperation OpMOVEPOINTUP for point id 12:",
         true, ((newP10 == p12) && (newP12 == p10)));
 
     //check OpMOVEPOINTDOWN  ExecuteOperation
     doOp = new mitk::PointOperation(mitk::OpMOVEPOINTDOWN, p10, 10);
     pointSet->ExecuteOperation(doOp);
     delete doOp;
     newP10 = pointSet->GetPoint(10);
     newP12 = pointSet->GetPoint(12);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check PointOperation OpMOVEPOINTDOWN for point id 10: ",
         true, ((newP10 == p10) && (newP12 == p12)));
   }
 
 
   void TestInsertPointWithPointSpecification()
   {
     //check InsertPoint with PointSpecification
     mitk::Point3D point5;
     mitk::Point3D tempPoint;
     point5.Fill(7);
 
     pointSet->SetPoint(5, point5, mitk::PTEDGE );
     tempPoint = pointSet->GetPoint(5);
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE("check InsertPoint with PointSpecification" ,
         true, tempPoint == point5);
     /*
       if (tempPoint != point5)
       {
       std::cout<<"[FAILED]"<<std::endl;
       return EXIT_FAILURE;
       }
       std::cout<<"[PASSED]"<<std::endl;
      */
   }
 
-
 };
 
 
 MITK_TEST_SUITE_REGISTRATION(mitkPointSet)
 
 
 
 
 
-// TODO: MOVE THIS TO CPPUNIT:
-//
-//
-//int mitkPointSetTest(int /*argc*/, char* /*argv*/[])
-//{
-//
-//
-//
-//
-//  MITK_TEST_OUTPUT(<< "Test InsertPoint(), SetPoint() and SwapPointPosition()");
-//  mitk::PointSet::PointType point;
-//  mitk::FillVector3D(point, 2.2, 3.3, -4.4);
-//  /* call everything that might modify PointContainer and PointDataContainer */
-//  pointSet->InsertPoint(17, point);
-//  pointSet->SetPoint(4, point);
-//  pointSet->SetPoint(7, point);
-//  pointSet->SetPoint(2, point);
-//  pointSet->SwapPointPosition(7, true);
-//  pointSet->SwapPointPosition(3, true);
-//  pointSet->SwapPointPosition(2, false);
-//  mitkPointSetTestClass::TestPointContainerPointDataContainer(pointSet);
-//
-//  MITK_TEST_OUTPUT(<< "Test OpREMOVE");
-//  mitk::PointOperation op1(mitk::OpREMOVE, mitk::Point3D(), 2); // existing index
-//  pointSet->ExecuteOperation(&op1);
-//  mitk::PointOperation op1b(mitk::OpREMOVE, mitk::Point3D(), 112); // non existing index
-//  pointSet->ExecuteOperation(&op1b);
-//  mitkPointSetTestClass::TestPointContainerPointDataContainer(pointSet);
-//
-//  MITK_TEST_OUTPUT(<< "Test OpMove");
-//  mitk::PointOperation op2(mitk::OpMOVE, mitk::Point3D(), 4);  // existing index
-//  pointSet->ExecuteOperation(&op2);
-//  mitk::PointOperation op3(mitk::OpMOVE, mitk::Point3D(), 34);  // non existing index
-//  pointSet->ExecuteOperation(&op3);
-//  mitkPointSetTestClass::TestPointContainerPointDataContainer(pointSet);
-//
-//  MITK_TEST_OUTPUT(<< "Test OpINSERT");
-//  mitk::PointOperation op4(mitk::OpINSERT, mitk::Point3D(), 38);  // non existing index
-//  pointSet->ExecuteOperation(&op4);
-//  mitk::PointOperation op5(mitk::OpINSERT, mitk::Point3D(), 17);  // existing index
-//  pointSet->ExecuteOperation(&op5);
-//  mitkPointSetTestClass::TestPointContainerPointDataContainer(pointSet);
-//
-//
-//
-//  pointSet = mitk::PointSet::New();
-//  pointSet->Expand(3);
-//  mitk::Point3D new0, new1, new2;
-//  new0.Fill(0);
-//  new1.Fill(1);
-//  new2.Fill(2);
-//  pointSet->InsertPoint(5,new0, mitk::PTCORNER,0);
-//  pointSet->InsertPoint(112,new1,0);
-//  pointSet->InsertPoint(2,new2,0);
-//  pointSet->InsertPoint(2,new0,1);
-//  pointSet->InsertPoint(1,new1,1);
-//  pointSet->InsertPoint(0,new2,1);
-//  pointSet->InsertPoint(0,new0,2);
-//  pointSet->InsertPoint(2,new1,2);
-//  pointSet->InsertPoint(1,new2,2);
-//
-//  MITK_TEST_OUTPUT( << "... pointset ts: " << pointSet->GetTimeSteps() )
-//  mitk::PointSet::Pointer clonePS = pointSet->Clone();
-//  MITK_TEST_OUTPUT( << "... clone pointset ts: " << clonePS->GetTimeSteps() )
-//
-//  for (unsigned int t=0; t< pointSet->GetTimeSteps(); t++)
-//  {
-//    MITK_TEST_OUTPUT( << "testing timestep: " << t )
-//    MITK_TEST_CONDITION_REQUIRED(pointSet->GetSize(t) == clonePS->GetSize(t), "Clone has same size")
-//
-//    // test for equal point coordinates
-//    for (mitk::PointSet::PointsConstIterator i = pointSet->Begin(), j = clonePS->Begin();
-//        i != pointSet->End() && j != clonePS->End(); ++i, ++j)
-//    {
-//      MITK_TEST_CONDITION_REQUIRED(i.Index() == j.Index() && mitk::Equal(i.Value(),j.Value()), "Cloned PS and PS have same points")
-//    }
-//
-//    // test for equal point data
-//    mitk::PointSet::PointDataContainer* pointDataCont = pointSet->GetPointSet(t)->GetPointData();
-//    mitk::PointSet::PointDataContainer* clonePointDataCont = clonePS->GetPointSet(t)->GetPointData();
-//    MITK_TEST_CONDITION_REQUIRED(pointDataCont && clonePointDataCont, "Valid point data container")
-//    MITK_TEST_CONDITION_REQUIRED(pointDataCont->Size() == clonePointDataCont->Size(), "Cloned point data container has same size")
-//    for (mitk::PointSet::PointDataConstIterator i = pointDataCont->Begin(), j = clonePointDataCont->Begin();
-//        i != pointDataCont->End() && j != clonePointDataCont->End(); ++i, ++j)
-//    {
-//      MITK_TEST_CONDITION_REQUIRED(i.Index() == j.Index() && i.Value() == j.Value(), "Cloned PS and PS have same point data")
-//    }
-//  }
-//
-//
-//  mitkPointSetTestClass::TestIsNotEmpty(clonePS);
-//  MITK_TEST_CONDITION_REQUIRED(clonePS->GetPointSetSeriesSize() == pointSet->GetPointSetSeriesSize(), "Testing cloned point set's size!");
-//  MITK_TEST_CONDITION_REQUIRED(clonePS.GetPointer() != pointSet.GetPointer(), "Testing that the clone is not the source PS!");
-//  MITK_TEST_CONDITION_REQUIRED(clonePS->GetGeometry()->GetCenter() == pointSet->GetGeometry()->GetCenter() , "Testing if the geometry is cloned correctly!");
-//  MITK_TEST_CONDITION_REQUIRED(clonePS->GetPropertyList()->GetMap()->size() == pointSet->GetPropertyList()->GetMap()->size() , "Testing if the property list is cloned correctly!");
-//  // Also testing, that clone is independent from original
-//  mitk::Point3D p, p2;
-//  p.Fill(42);
-//  p2.Fill(84);
-//  clonePS->InsertPoint(0,p);
-//  pointSet->InsertPoint(0,p2);
-//  p = clonePS->GetPoint(0);
-//  p2 = pointSet->GetPoint(0);
-//  MITK_TEST_CONDITION_REQUIRED(p != p2, "Testing that the clone is independent from source!");
-//
-//
-//  MITK_TEST_END();
-//}
-//
-//
-//class mitkPointSetTestClass { public:
-//
-//static void TestGetITKPointSet(mitk::PointSet *pointSet)
-//{
-//  //try to get the itkPointSet
-//  mitk::PointSet::DataType::Pointer itkdata = NULL;
-//  itkdata = pointSet->GetPointSet();
-//  MITK_TEST_CONDITION( itkdata.IsNotNull(), "try to get the itkPointSet from a newly created PointSet" )
-//}
-//
-//static void TestGetSizeIsZero(mitk::PointSet *pointSet)
-//{
-//  //fresh PointSet has to be empty!
-//  MITK_TEST_CONDITION( pointSet->GetSize() == 0, "check if the PointSet size is 0 " )
-//}
-//
-//static void TestIsEmpty(mitk::PointSet *pointSet)
-//{
-//  MITK_TEST_CONDITION(pointSet->IsEmptyTimeStep(0), "check if the PointSet is empty" )
-//}
-//
-//static void TestCreateOperationAndAddPoint(mitk::PointSet *pointSet)
-//{
-//  int id = 0;
-//  mitk::Point3D point;
-//  point.Fill(1);
-//
-//  mitk::PointOperation* doOp = new mitk::PointOperation(mitk::OpINSERT, point, id);
-//  pointSet->ExecuteOperation(doOp);
-//  MITK_TEST_CONDITION( pointSet->GetSize()==1 && pointSet->IndexExists(id), "check if added points exists" )
-//
-//    delete doOp;
-//
-//  mitk::Point3D tempPoint;
-//  tempPoint.Fill(0);
-//
-//  tempPoint = pointSet->GetPoint(id);
-//
-//  MITK_TEST_CONDITION( point == tempPoint, "check if added point contains real value" )
-//}
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//static void TestPointContainerPointDataContainer(mitk::PointSet* ps)
-//{
-//  mitk::PointSet::PointsContainer* pc = ps->GetPointSet()->GetPoints();
-//  mitk::PointSet::PointDataContainer* pd = ps->GetPointSet()->GetPointData();
-//  MITK_TEST_CONDITION_REQUIRED(pc->Size() == pd->Size(), "PointContainer and PointDataContainer have same size");
-//  mitk::PointSet::PointsContainer::ConstIterator pIt = pc->Begin();
-//  mitk::PointSet::PointDataContainer::ConstIterator dIt = pd->Begin();
-//  bool failed = false;
-//  for (; pIt != pc->End(); ++pIt, ++dIt)
-//    if (pIt->Index() != dIt->Index())
-//    {
-//      failed = true;
-//      break;
-//    }
-//  MITK_TEST_CONDITION(failed == false, "Indices in PointContainer and PointDataContainer are equal");
-//}
-//};
-
-
-