Index: src/unittests/AtomDescriptorTest.hpp
===================================================================
--- src/unittests/AtomDescriptorTest.hpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/AtomDescriptorTest.hpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -13,5 +13,6 @@
 #include "types.hpp"
 
-#define ATOM_COUNT (10)
+// we prefer enum over define
+enum { ATOM_COUNT = 10 };
 
 class atom;
Index: src/unittests/MoleculeDescriptorTest.hpp
===================================================================
--- src/unittests/MoleculeDescriptorTest.hpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/MoleculeDescriptorTest.hpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -13,5 +13,6 @@
 #include "types.hpp"
 
-#define MOLECULE_COUNT (10)
+// we prefer enum over define
+enum { MOLECULE_COUNT = 10 };
 
 class molecule;
Index: src/unittests/atomsCalculationTest.hpp
===================================================================
--- src/unittests/atomsCalculationTest.hpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/atomsCalculationTest.hpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -11,5 +11,6 @@
 #include <cppunit/extensions/HelperMacros.h>
 
-#define ATOM_COUNT (10)
+// we prefer enum over define
+enum { ATOM_COUNT = 10 };
 
 #include "types.hpp"
Index: src/unittests/manipulateAtomsTest.hpp
===================================================================
--- src/unittests/manipulateAtomsTest.hpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/manipulateAtomsTest.hpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -11,5 +11,6 @@
 #include <cppunit/extensions/HelperMacros.h>
 
-#define ATOM_COUNT (10)
+// we prefer enum over define
+enum { ATOM_COUNT = 10 };
 
 class atom;
Index: src/unittests/tesselation_boundarytriangleunittest.cpp
===================================================================
--- src/unittests/tesselation_boundarytriangleunittest.cpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/tesselation_boundarytriangleunittest.cpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -27,5 +27,5 @@
 #endif /*HAVE_TESTRUNNER*/
 
-#define SPHERERADIUS 2.
+const double TesselationBoundaryTriangleTest::SPHERERADIUS=2.;
 
 /********************************************** Test classes **************************************/
Index: src/unittests/tesselation_boundarytriangleunittest.hpp
===================================================================
--- src/unittests/tesselation_boundarytriangleunittest.hpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/tesselation_boundarytriangleunittest.hpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -34,4 +34,6 @@
 
 private:
+      static const double SPHERERADIUS;
+
       class BoundaryTriangleSet *triangle;
       class BoundaryLineSet *lines[3];
Index: src/unittests/tesselation_insideoutsideunittest.cpp
===================================================================
--- src/unittests/tesselation_insideoutsideunittest.cpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/tesselation_insideoutsideunittest.cpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -27,5 +27,5 @@
 #endif /*HAVE_TESTRUNNER*/
 
-#define SPHERERADIUS 2.
+const double TesselationInOutsideTest::SPHERERADIUS=2.;
 
 /********************************************** Test classes **************************************/
Index: src/unittests/tesselation_insideoutsideunittest.hpp
===================================================================
--- src/unittests/tesselation_insideoutsideunittest.hpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/tesselation_insideoutsideunittest.hpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -30,4 +30,6 @@
 
 private:
+      static const double SPHERERADIUS;
+
       class Tesselation *TesselStruct;
       LinkedCell::LinkedNodes Corners;
Index: src/unittests/tesselationunittest.cpp
===================================================================
--- src/unittests/tesselationunittest.cpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/tesselationunittest.cpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -26,5 +26,5 @@
 #endif /*HAVE_TESTRUNNER*/
 
-#define SPHERERADIUS 2.
+const double TesselationTest::SPHERERADIUS=2.;
 
 /********************************************** Test classes **************************************/
Index: src/unittests/tesselationunittest.hpp
===================================================================
--- src/unittests/tesselationunittest.hpp	(revision 8f4df1ef77448922e1b977a3e138bcc2a4a4dad0)
+++ src/unittests/tesselationunittest.hpp	(revision 88b400a534a193491b7a14d803ade4432b9130f5)
@@ -33,4 +33,6 @@
 
 private:
+      static const double SPHERERADIUS;
+
       class Tesselation *TesselStruct;
       LinkedCell::LinkedNodes Corners;
