diff --git a/MeshLib/ElementCoordinatesMappingLocal.h b/MeshLib/ElementCoordinatesMappingLocal.h
index 71f08362c43ef3b516ea598550b469df2cd942e9..def36698f1e1840c2f98aa8c29becaeb4482ae2a 100644
--- a/MeshLib/ElementCoordinatesMappingLocal.h
+++ b/MeshLib/ElementCoordinatesMappingLocal.h
@@ -10,13 +10,9 @@
 #define ELEMENTCOORDINATESMAPPINGLOCAL_H_
 
 #include <vector>
-
 #include <Eigen/Eigen>
-
 #include "MathLib/Point3d.h"
 
-#include "MeshLib/CoordinateSystem.h"
-
 namespace MeshLib
 {
     class Element;
@@ -34,12 +30,12 @@ class ElementCoordinatesMappingLocal final
 public:
     /**
      * Constructor
-     * \param e                     Mesh element whose node coordinates are mapped
-     * \param global_coord_system   Global coordinate system
+     * \param e          Mesh element whose node coordinates are mapped
+     * \param global_dim Global dimension
      */
     ElementCoordinatesMappingLocal(const Element &e, const unsigned global_dim);
 
-    /// return the global coordinate system
+    /// return the global dimension
     unsigned getGlobalDimension() const { return _global_dim; }
 
     /// return mapped coordinates of the node
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
index e025ba6b85a10af8e806af8577828948da7e6bd5..011a6eac1aab0b9854f1a89d5e997c8bf9ed74c4 100644
--- a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
+++ b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.cpp
@@ -10,14 +10,10 @@
 #include "NaturalCoordinatesMapping.h"
 
 #include <cassert>
-
 #include <logog/include/logog.hpp>
 
 #include "MeshLib/ElementCoordinatesMappingLocal.h"
-#include "MeshLib/CoordinateSystem.h"
-
 #include "MeshLib/Elements/TemplateElement.h"
-
 #include "MeshLib/Elements/HexRule20.h"
 #include "MeshLib/Elements/HexRule8.h"
 #include "MeshLib/Elements/LineRule2.h"
@@ -51,9 +47,9 @@
 #include "NumLib/Fem/ShapeFunction/ShapePrism15.h"
 #include "NumLib/Fem/ShapeFunction/ShapePyra5.h"
 #include "NumLib/Fem/ShapeFunction/ShapePyra13.h"
+#include "NumLib/Fem/ShapeMatrixPolicy.h"
 
 #include "ShapeMatrices.h"
-#include "NumLib/Fem/ShapeMatrixPolicy.h"
 
 namespace NumLib
 {
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
index 22fbac0459fa1c4f617f6dc3c2fa7539e2c2d59d..debc65b6ba8558bdc9e1eab024fb5fe5e829ddf0 100644
--- a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
+++ b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
@@ -52,6 +52,7 @@ struct NaturalCoordinatesMapping
      * @param ele               Mesh element object
      * @param natural_pt        Location in natural coordinates (r,s,t)
      * @param shapemat          Shape matrix data where calculated shape functions are stored
+     * @param global_dim        Global dimension
      */
     static void computeShapeMatrices(const T_MESH_ELEMENT& ele,
                                      const double* natural_pt,
@@ -70,6 +71,7 @@ struct NaturalCoordinatesMapping
      * @param natural_pt            Location in natural coordinates (r,s,t)
      * @param shapemat              Shape matrix data where calculated shape
      * functions are stored
+     * @param global_dim            Global dimension
      */
     template <ShapeMatrixType T_SHAPE_MATRIX_TYPE>
     static void computeShapeMatrices(const T_MESH_ELEMENT& ele,
diff --git a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
index 0ec829ad1230dcc02acb028f7ea28c15580411a9..df6de49cb2875e8765645f5cf622482f8ba346cd 100644
--- a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
+++ b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
@@ -82,6 +82,7 @@ public:
      *
      * @param natural_pt    position in natural coordinates
      * @param shape         evaluated shape function matrices
+     * @param global_dim    global dimension
      */
     void computeShapeFunctions(const double* natural_pt, ShapeMatrices& shape,
                                const unsigned global_dim) const
@@ -96,6 +97,7 @@ public:
      * @tparam T_SHAPE_MATRIX_TYPE  shape matrix types to be calculated
      * @param natural_pt            position in natural coordinates
      * @param shape                 evaluated shape function matrices
+     * @param global_dim            global dimension
      */
     template <ShapeMatrixType T_SHAPE_MATRIX_TYPE>
     void computeShapeFunctions(const double* natural_pt, ShapeMatrices& shape,
diff --git a/Tests/MeshLib/TestCoordinatesMappingLocal.cpp b/Tests/MeshLib/TestCoordinatesMappingLocal.cpp
index 45b8573b53683a3c6d40a8bda81847733711b6a6..e06bf5e14f7d138186bb7840a5b2870a39d152c6 100644
--- a/Tests/MeshLib/TestCoordinatesMappingLocal.cpp
+++ b/Tests/MeshLib/TestCoordinatesMappingLocal.cpp
@@ -19,13 +19,14 @@
 #include "GeoLib/AnalyticalGeometry.h"
 #include "MathLib/LinAlg/Dense/DenseMatrix.h"
 
+#include "MeshLib/CoordinateSystem.h"
 #include "MeshLib/Node.h"
 #include "MeshLib/Elements/Element.h"
 #include "MeshLib/Elements/Line.h"
 #include "MeshLib/Elements/Quad.h"
 #include "MeshLib/ElementCoordinatesMappingLocal.h"
 
-#include "../TestTools.h"
+#include "Tests/TestTools.h"
 
 
 namespace