Index: src/unittests/AnalysisCorrelationToPointUnitTest.cpp
===================================================================
--- src/unittests/AnalysisCorrelationToPointUnitTest.cpp	(revision 2aeefd42484e1e703a9a9d84d548ce716faed02b)
+++ src/unittests/AnalysisCorrelationToPointUnitTest.cpp	(revision a5551b36831494b1f744d79223d87e97b7be6f5c)
@@ -33,4 +33,5 @@
 
   // init private all pointers to zero
+  TestList = NULL;
   TestMolecule = NULL;
   hydrogen = NULL;
@@ -73,9 +74,13 @@
   CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
 
+  TestList = new MoleculeListClass;
+  TestMolecule->ActiveFlag = true;
+  TestList->insert(TestMolecule);
+
   // init point
   point = new Vector(1.,1.,1.);
 
   // init maps
-  pointmap = CorrelationToPoint( (ofstream *)&cout, (const molecule * const)TestMolecule, (const element * const)hydrogen, (const Vector *)point );
+  pointmap = CorrelationToPoint( (ofstream *)&cout, (MoleculeListClass * const)TestList, (const element * const)hydrogen, (const Vector *)point );
   binmap = NULL;
 
@@ -91,5 +96,5 @@
 
   // remove
-  delete(TestMolecule);
+  delete(TestList);
   // note that all the atoms are cleaned by TestMolecule
   delete(point);
Index: src/unittests/AnalysisCorrelationToPointUnitTest.hpp
===================================================================
--- src/unittests/AnalysisCorrelationToPointUnitTest.hpp	(revision 2aeefd42484e1e703a9a9d84d548ce716faed02b)
+++ src/unittests/AnalysisCorrelationToPointUnitTest.hpp	(revision a5551b36831494b1f744d79223d87e97b7be6f5c)
@@ -12,6 +12,7 @@
 
 class element;
+class LinkedCell;
 class molecule;
-class LinkedCell;
+class MoleculeListClass;
 class periodentafel;
 class Tesselation;
@@ -37,4 +38,5 @@
 private:
 
+      MoleculeListClass *TestList;
       molecule *TestMolecule;
       element *hydrogen;
Index: src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
===================================================================
--- src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp	(revision 2aeefd42484e1e703a9a9d84d548ce716faed02b)
+++ src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp	(revision a5551b36831494b1f744d79223d87e97b7be6f5c)
@@ -33,4 +33,5 @@
 
   // init private all pointers to zero
+  TestList = NULL;
   TestMolecule = NULL;
   hydrogen = NULL;
@@ -40,5 +41,4 @@
   Surface = NULL;
   LC = NULL;
-
 
   // construct element
@@ -79,4 +79,8 @@
   CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
 
+  TestList = new MoleculeListClass;
+  TestMolecule->ActiveFlag = true;
+  TestList->insert(TestMolecule);
+
   // init tesselation and linked cell
   Surface = new Tesselation;
@@ -121,5 +125,5 @@
 
   // remove
-  delete(TestMolecule);
+  delete(TestList);
   delete(Surface);
   // note that all the atoms are cleaned by TestMolecule
@@ -133,5 +137,5 @@
 {
   // do the pair correlation
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestMolecule, hydrogen, Surface, LC );
+  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, hydrogen, Surface, LC );
   CPPUNIT_ASSERT( surfacemap != NULL );
   CPPUNIT_ASSERT_EQUAL( (size_t)4, surfacemap->size() );
@@ -141,5 +145,5 @@
 {
   BinPairMap::iterator tester;
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestMolecule, hydrogen, Surface, LC );
+  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, hydrogen, Surface, LC );
   // put pair correlation into bins and check with no range
   binmap = BinData( (ofstream *)&cout, surfacemap, 0.5, 0., 0. );
@@ -155,5 +159,5 @@
 {
   BinPairMap::iterator tester;
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestMolecule, hydrogen, Surface, LC );
+  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, hydrogen, Surface, LC );
   // ... and check with [0., 2.] range
   binmap = BinData( (ofstream *)&cout, surfacemap, 0.5, 0., 2. );
@@ -172,5 +176,5 @@
 {
   BinPairMap::iterator tester;
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestMolecule, carbon, Surface, LC );
+  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, carbon, Surface, LC );
   // put pair correlation into bins and check with no range
   binmap = BinData( (ofstream *)&cout, surfacemap, 0.5, 0., 0. );
@@ -190,5 +194,5 @@
 {
   BinPairMap::iterator tester;
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestMolecule, carbon, Surface, LC );
+  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, carbon, Surface, LC );
   // ... and check with [0., 2.] range
   binmap = BinData( (ofstream *)&cout, surfacemap, 0.5, -2., 4. );
Index: src/unittests/AnalysisCorrelationToSurfaceUnitTest.hpp
===================================================================
--- src/unittests/AnalysisCorrelationToSurfaceUnitTest.hpp	(revision 2aeefd42484e1e703a9a9d84d548ce716faed02b)
+++ src/unittests/AnalysisCorrelationToSurfaceUnitTest.hpp	(revision a5551b36831494b1f744d79223d87e97b7be6f5c)
@@ -12,6 +12,7 @@
 
 class element;
+class LinkedCell;
 class molecule;
-class LinkedCell;
+class MoleculeListClass;
 class periodentafel;
 class Tesselation;
@@ -40,4 +41,5 @@
 private:
 
+      MoleculeListClass *TestList;
       molecule *TestMolecule;
       element *hydrogen;
Index: src/unittests/AnalysisPairCorrelationUnitTest.cpp
===================================================================
--- src/unittests/AnalysisPairCorrelationUnitTest.cpp	(revision 2aeefd42484e1e703a9a9d84d548ce716faed02b)
+++ src/unittests/AnalysisPairCorrelationUnitTest.cpp	(revision a5551b36831494b1f744d79223d87e97b7be6f5c)
@@ -34,4 +34,5 @@
 
   // init private all pointers to zero
+  TestList = NULL;
   TestMolecule = NULL;
   hydrogen = NULL;
@@ -72,6 +73,10 @@
   CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
 
+  TestList = new MoleculeListClass;
+  TestMolecule->ActiveFlag = true;
+  TestList->insert(TestMolecule);
+
   // init maps
-  correlationmap = PairCorrelation( (ofstream *)&cout, TestMolecule, hydrogen, hydrogen );
+  correlationmap = PairCorrelation( (ofstream *)&cout, TestList, hydrogen, hydrogen );
   binmap = NULL;
 
@@ -87,5 +92,5 @@
 
   // remove
-  delete(TestMolecule);
+  delete(TestList);
   // note that all the atoms are cleaned by TestMolecule
   delete(tafel);
Index: src/unittests/AnalysisPairCorrelationUnitTest.hpp
===================================================================
--- src/unittests/AnalysisPairCorrelationUnitTest.hpp	(revision 2aeefd42484e1e703a9a9d84d548ce716faed02b)
+++ src/unittests/AnalysisPairCorrelationUnitTest.hpp	(revision a5551b36831494b1f744d79223d87e97b7be6f5c)
@@ -12,6 +12,7 @@
 
 class element;
+class LinkedCell;
 class molecule;
-class LinkedCell;
+class MoleculeListClass;
 class periodentafel;
 class Tesselation;
@@ -37,4 +38,5 @@
 private:
 
+      MoleculeListClass *TestList;
       molecule *TestMolecule;
       element *hydrogen;
