diff --git a/exercises/exercise-basic/injection2pniproblem.hh b/exercises/exercise-basic/injection2pniproblem.hh
index c6ee453a0d1f4299a08824ff32c53b0db748488d..7642c96a53db03c2eb80ba88f526f50fed8890ed 100644
--- a/exercises/exercise-basic/injection2pniproblem.hh
+++ b/exercises/exercise-basic/injection2pniproblem.hh
@@ -73,7 +73,11 @@ public:
 
 // Set fluid configuration
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag> { using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>; };
+struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag>
+{
+    using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>,
+                                     FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true>>;
+};
 } // end namespace Properties
 
 /*!
diff --git a/exercises/exercise-fluidsystem/2p2cproblem.hh b/exercises/exercise-fluidsystem/2p2cproblem.hh
index 1a395ad9f76b329e9ccb5e4e9e2a179442b04a7a..0c3082ca1650f529e3a8f3c796f7325208f36bd8 100644
--- a/exercises/exercise-fluidsystem/2p2cproblem.hh
+++ b/exercises/exercise-fluidsystem/2p2cproblem.hh
@@ -50,7 +50,7 @@ namespace Properties {
 // Create a new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<BoxModel, TwoPTwoC>; };
+struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<TwoPTwoC, BoxModel>; };
 } // end namespace TTag
 
 // Set the "Problem" property
diff --git a/exercises/exercise-fluidsystem/2pproblem.hh b/exercises/exercise-fluidsystem/2pproblem.hh
index 2787caccd351d34cb32d6ad7fd2f58adb55a3326..1acfb0ff916b27b4089c92608c6676ebfed3d56a 100644
--- a/exercises/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/exercise-fluidsystem/2pproblem.hh
@@ -64,7 +64,7 @@ namespace Properties {
 // Create a new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; };
+struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
 } // end namespace TTag
 
 // Set the "Problem" property
diff --git a/exercises/exercise-fluidsystem/README.md b/exercises/exercise-fluidsystem/README.md
index 8ab0cb8e0e339e9c335bb83c9981d24dab86ca35..124002bb0337a047122c477cc096ae14791ad329 100644
--- a/exercises/exercise-fluidsystem/README.md
+++ b/exercises/exercise-fluidsystem/README.md
@@ -41,7 +41,7 @@ the `TwoP` _TypeTag_ (immiscible two-phase model properties) and the `BoxModel`
 ```c++
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; };
+struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
 } // end namespace TTag
 ```
 
@@ -185,7 +185,7 @@ two-component model properties:
 
 ```c++
 // Create a new type tag for the problem
-struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<BoxModel, TwoPTwoC>; };
+struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<TwoPTwoC, BoxModel>; };
 } // end namespace TTag
 ```
 
diff --git a/exercises/exercise-fractures/fractureproblem.hh b/exercises/exercise-fractures/fractureproblem.hh
index 38caa0cd591ac0786ddb84a21102dbd9428d0feb..5088241cc9f6c900899ce79e70db7c990f274892 100644
--- a/exercises/exercise-fractures/fractureproblem.hh
+++ b/exercises/exercise-fractures/fractureproblem.hh
@@ -51,7 +51,7 @@ namespace Properties {
 
 // Create new type tag node
 namespace TTag {
-struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
+struct FractureProblem { using InheritsFrom = std::tuple<TwoP, CCTpfaModel>; };
 } // end namespace TTag
 
 // Set the grid type
diff --git a/exercises/solution/exercise-basic/injection2pniproblem.hh b/exercises/solution/exercise-basic/injection2pniproblem.hh
index 1a668c7a839a3008ea3a7401a616772de443b6e6..8d971152777ecdd89e5b7d1b531bb6578e5e72c2 100644
--- a/exercises/solution/exercise-basic/injection2pniproblem.hh
+++ b/exercises/solution/exercise-basic/injection2pniproblem.hh
@@ -66,19 +66,13 @@ public:
     using type = InjectionSpatialParams<FVGridGeometry, Scalar>;
 };
 
-// the fluid system for incompressible tests
+// Set fluid configuration
 template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag>
 {
-private:
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-public:
-    using type = FluidSystems::OnePLiquid<Scalar, Components::SimpleH2O<Scalar> >;
+    using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>,
+                                     FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true>>;
 };
-
-// Set fluid configuration
-template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::Injection2pNITypeTag> { using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>; };
 } // end namespace Properties
 
 /*!
diff --git a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
index 0f0602f1fcd6e5435211f9e5ab1e9b19be3a24a5..25ae5d6c9939ea9e2509f2ecf07d7455944a8ce1 100644
--- a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
+++ b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
@@ -50,7 +50,7 @@ namespace Properties {
 // Create a new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<BoxModel, TwoPTwoC>; };
+struct ExerciseFluidsystemTwoPTwoC { using InheritsFrom = std::tuple<TwoPTwoC, BoxModel>; };
 } // end namespace TTag
 
 // Set the "Problem" property
diff --git a/exercises/solution/exercise-fluidsystem/2pproblem.hh b/exercises/solution/exercise-fluidsystem/2pproblem.hh
index b292a43df9d096c3f6720ebc82668483455b0b29..fa461792f0ae45a1262d4add2c6c52bcc287db20 100644
--- a/exercises/solution/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/solution/exercise-fluidsystem/2pproblem.hh
@@ -64,7 +64,7 @@ namespace Properties {
 // Create a new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<BoxModel, TwoP>; };
+struct ExerciseFluidsystemTwoP { using InheritsFrom = std::tuple<TwoP, BoxModel>; };
 } // end namespace TTag
 
 // Set the "Problem" property
diff --git a/exercises/solution/exercise-fractures/fractureproblem.hh b/exercises/solution/exercise-fractures/fractureproblem.hh
index 2fc8aaa92e269b3add24b5ff7beb81b445a55812..1f74f6c656009c41c7fc3d8f65f3d34dbc4f975e 100644
--- a/exercises/solution/exercise-fractures/fractureproblem.hh
+++ b/exercises/solution/exercise-fractures/fractureproblem.hh
@@ -51,7 +51,7 @@ namespace Properties {
 
 // Create new type tag node
 namespace TTag {
-struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
+struct FractureProblem { using InheritsFrom = std::tuple<TwoP, CCTpfaModel>; };
 } // end namespace TTag
 
 // Set the grid type