diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index 53cbc1db08dfea452538911778c6d3b01dbb5320..40a1cc1d4ea30bb064f77974a9d64056bfaef880 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -15,15 +15,13 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
- * \file combustionproblem1c.hh
- *
+ * \file
+ * \ingroup MPNCTests
  * \brief Problem where hot, pure liquid water is injected from the left hand side into a initially
  *        isotherm domain. The water is fully evaporated by a strong heat source.
  *        A local thermal non-equilibrium model is used: i.e. two different (fluid, solid)
  *        temperatures are primary variables.
  *
- * \ingroup MpNcBoxproblems
- *
  * \author Philipp Nuske
  */
 #ifndef DUMUX_COMBUSTION_PROBLEM_ONE_COMPONENT_HH
@@ -106,8 +104,7 @@ SET_INT_PROP(CombustionProblemOneComponent, NumEqBalance, GET_PROP_VALUE(TypeTag
 
 }
 /*!
- * \ingroup MpNcBoxproblems
- *
+ * \ingroup MPNCTests
  * \brief Problem where water is injected from the left hand side into a porous media filled domain,
  *        which is supplied with energy from the right hand side to evaporate the water.
  */
diff --git a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
index 5ce605f8bd889c7a8f3d7703c6b645fecf723c12..dd0bb1e7430a8b4a4496150ce8142087a1937db7 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
@@ -17,8 +17,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
- * \file combustionspatialparams.hh
- *
+ * \file
+ * \ingroup MPNCTests
  * \brief Spatialparameters for the combustionproblem1c. Parameters for the actual simulation domain and an outflow region are provided.
  */
 #ifndef DUMUX_COMBUSTION_SPATIALPARAMS_HH
@@ -34,7 +34,10 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup MPNCTests
+ * \brief Spatialparameters for the combustionproblem1c. Parameters for the actual simulation domain and an outflow region are provided.
+ */
 //forward declaration
 template<class TypeTag>
 class CombustionSpatialParams;
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
index de1fc1aced7ec6fb5f87bb2da490bbc5b9f5e830..6ad18d94b7381a6b3ab8ffd414f7fe6a659ee4d6 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
@@ -17,8 +17,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
- * \file evaporationatmosphereproblem.hh
- * \ingroup MpNcBoxproblems
+ * \file
+ * \ingroup MPNCTests
  *
  * \brief Problem showcasing the capabilities of the kinetic model.
  *
@@ -28,10 +28,6 @@
  *
  *        The porous domain is bypassed with dry air. This way the equilibration process on top of the porous domain can be studied.
  *
- *        The Problem is written, such that the kinetic consideration for mass and energy can
- *        be switched of by merely setting kinetic, kineticenergy respectivly to false.
- *        Boundary and initial conditions are specified for all cases.
- *
  * \author Philipp Nuske
  */
 #ifndef DUMUX_EVAPORATION_ATMOSPHERE_PROBLEM_HH
@@ -58,7 +54,11 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup MPNCTests
+ *
+ * \brief Problem showcasing the capabilities of the kinetic model.
+ */
 template <class TypeTag>
 class EvaporationAtmosphereProblem;
 
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index a74ca409f9b98166fffc5a60bacb6b77f2afdf09..5c4f688a42c981bf45646854493e463afe189fdb 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -17,7 +17,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
- * \file evaporationatmospherespatialparams.hh
+ * \file
+ * \ingroup MPNCTests
  * \brief spatialparameters for the kinetic test-case of the mpnc model. "Poor-mans" coupling of free-flow and porous medium.
  *
  */
@@ -45,7 +46,11 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup MPNCTests
+ * \brief spatialparameters for the kinetic test-case of the mpnc model. "Poor-mans" coupling of free-flow and porous medium.
+ *
+ */
 //forward declaration
 template<class TypeTag>
 class EvaporationAtmosphereSpatialParams;
diff --git a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
index 561f42979c2b7d9ba8b912e5a847e83860ccd084..88c5a5fdabbdc0256e7e909665c0e2cba5e3609c 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
@@ -16,8 +16,9 @@
  *   You should have received a copy of the GNU General Public License       *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
-/**
+/*!
  * \file
+ * \ingroup MPNCTests
  * \brief Problem where liquid water is injected -- by means of a
  *        Dirichlet condition on the lower right of the domain -- which has to go
  *        around an obstacle with \f$10^3\f$ lower permeability.
@@ -41,7 +42,12 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup MPNCTests
+ * \brief Problem where liquid water is injected -- by means of a
+ *        Dirichlet condition on the lower right of the domain -- which has to go
+ *        around an obstacle with \f$10^3\f$ lower permeability.
+ */
 template <class TypeTag>
 class ObstacleProblem;
 
diff --git a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
index 16bb62b5b52c47e1157336a773bbba4d87256f73..4b6037caeaa439b00ee161d63d6ac461ae8f0b17 100644
--- a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
@@ -16,9 +16,9 @@
  *   You should have received a copy of the GNU General Public License       *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
-/**
+/*!
  * \file
- *
+ * \ingroup MPNCTests
  * \brief The spatial parameters for the ObstacleProblem
  */
 
@@ -34,7 +34,10 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup MPNCTests
+ * \brief The spatial parameters for the ObstacleProblem
+ */
 //forward declaration
 template<class TypeTag>
 class ObstacleSpatialParams;