diff --git a/Tests/Data/LIE/Mechanics/coulomb_load_path.prj b/Tests/Data/LIE/Mechanics/coulomb_load_path.prj
index a52567c5c0e3b7713f58671c9885051eb099e97d..cfaeda08190b18aaf6f97629960c1702209f9fba 100644
--- a/Tests/Data/LIE/Mechanics/coulomb_load_path.prj
+++ b/Tests/Data/LIE/Mechanics/coulomb_load_path.prj
@@ -28,7 +28,8 @@
                 <tension_cutoff>1</tension_cutoff>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </fracture_model>
             <fracture_properties>
diff --git a/Tests/Data/LIE/Mechanics/mohr_coulomb_load_path_nu0p3.prj b/Tests/Data/LIE/Mechanics/mohr_coulomb_load_path_nu0p3.prj
index 8513f3e9c485d6a844d86eb4689729009152022a..7a6e2dca43ce39ad5dc47da245b213c263031257 100644
--- a/Tests/Data/LIE/Mechanics/mohr_coulomb_load_path_nu0p3.prj
+++ b/Tests/Data/LIE/Mechanics/mohr_coulomb_load_path_nu0p3.prj
@@ -28,7 +28,8 @@
                 <tension_cutoff>1</tension_cutoff>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </fracture_model>
             <fracture_properties>
diff --git a/Tests/Data/LIE/Mechanics/single_joint_displacement_controlled.prj b/Tests/Data/LIE/Mechanics/single_joint_displacement_controlled.prj
index 419d308a970296ab70bda8e7c69160e684b75d43..39b42df974319eb9e3fc9c39e99d381db0bee321 100644
--- a/Tests/Data/LIE/Mechanics/single_joint_displacement_controlled.prj
+++ b/Tests/Data/LIE/Mechanics/single_joint_displacement_controlled.prj
@@ -28,7 +28,8 @@
                 <tension_cutoff>1</tension_cutoff>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-12</error_tolerance>
+                    <residuum_tolerance>1e-12</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </fracture_model>
             <fracture_properties>
diff --git a/Tests/Data/Mechanics/Burgers/cube_1e0.prj b/Tests/Data/Mechanics/Burgers/cube_1e0.prj
index ac2f4cdd7a33fcf15fd397e67cf75575bdb124c7..bf6ea6a5938bfe75c2f0840c9c2df86df62f042c 100644
--- a/Tests/Data/Mechanics/Burgers/cube_1e0.prj
+++ b/Tests/Data/Mechanics/Burgers/cube_1e0.prj
@@ -19,7 +19,8 @@
                 <dependency_parameter_mvm>mvM</dependency_parameter_mvm>
                 <nonlinear_solver>
                     <maximum_iterations>20</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/Burgers/cube_1e3.prj b/Tests/Data/Mechanics/Burgers/cube_1e3.prj
index ef4b0d7cd8c229a798b721997ffa6a40b0527999..8c82fa665a4e221da645ba2ed88189d5371832f5 100644
--- a/Tests/Data/Mechanics/Burgers/cube_1e3.prj
+++ b/Tests/Data/Mechanics/Burgers/cube_1e3.prj
@@ -19,7 +19,8 @@
                 <dependency_parameter_mvm>mvM</dependency_parameter_mvm>
                 <nonlinear_solver>
                     <maximum_iterations>20</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj b/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
index d78de38a8da8d2c4ac1de1befc953c5823165350..6047988b3d0b166d014eb6ffc4f0682fae6c2ffa 100644
--- a/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
+++ b/Tests/Data/Mechanics/Ehlers/MFront/cube_1e0_dp.prj
@@ -40,7 +40,8 @@
                 <tangent_type>Plastic</tangent_type>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-14</error_tolerance>
+                    <residuum_tolerance>1e-14</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             -->
diff --git a/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj b/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
index 3a40bef47baa7fc7660f76beb5ed94f652a7df6d..d6593fc4ff31a33bcce716c61160f333f5f76c47 100644
--- a/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
+++ b/Tests/Data/Mechanics/Ehlers/axisymmetric_sphere_pl.prj
@@ -32,7 +32,8 @@
                 <tangent_type>Plastic</tangent_type>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e0.prj b/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
index 6aa588a3457e1c796bc03a2737b3f401eaf7d1bd..a9ff16e23f9559b3f430abffb55c5b68e66ab869 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e0.prj
@@ -28,7 +28,8 @@
                 <tangent_type>Plastic</tangent_type>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-14</error_tolerance>
+                    <residuum_tolerance>1e-14</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj b/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
index 9ad2d237e2828e162a6e05a77b29e7feaa4c8a24..46b682e09e8ab00f56c53bb6673834a1f35f846c 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e0_dp.prj
@@ -28,7 +28,8 @@
                 <tangent_type>Plastic</tangent_type>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-14</error_tolerance>
+                    <residuum_tolerance>1e-14</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e1.prj b/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
index 96a5b367cb456486d8e071cc5bc53cbc0ebc17ba..be5fb1027db9c4bfb46cc9ea9e57e6e4ec2efcec 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e1.prj
@@ -28,7 +28,8 @@
                 <tangent_type>Plastic</tangent_type>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-14</error_tolerance>
+                    <residuum_tolerance>1e-14</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/Ehlers/cube_1e3.prj b/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
index d02bca8e3a159793aaa57bc61abbe2b3fa72ba2c..b7f4e99f2e718329a91caef3a2a1ad439fac0024 100644
--- a/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
+++ b/Tests/Data/Mechanics/Ehlers/cube_1e3.prj
@@ -28,7 +28,8 @@
                 <tangent_type>Plastic</tangent_type>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-14</error_tolerance>
+                    <residuum_tolerance>1e-14</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
index 2adc4b1e0d0fb86bfdd53a8e8eb27feb56b60a59..c93cc51d61c2a9ac2da1457618488fb4c3ccb334 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/CrackedSolid/griffith.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
index 5ff1bbe32dbbc08cec9bfa217b2bb639009d4f92..da2d5470a9a9e0e1dd68629930bf02ed19bf342b 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>10000</maximum_iterations>
-                    <error_tolerance>1e-15</error_tolerance>
+                    <residuum_tolerance>1e-15</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj
index 2ce4f6e10ff603bc60d94ea29a2283fe4d3700c3..d7c6123eae5c1192708126e6589618d6a51e42ac 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/coarse_elastic_tangent/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>10000</maximum_iterations>
-                    <error_tolerance>1e-15</error_tolerance>
+                    <residuum_tolerance>1e-15</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
index 52a2e2ff848d0d599f9b6919b9346822630d5dbf..2190cae6987033434cf6f805e498f1448d5ca31a 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/fine/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
index 94dc2602a41500b76d6c4e8fc1f8e0d42989aab9..6319d33226b0c3ecc50fa265a5f811f04e2220e2 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
index 61c101d510981cd7aa7921508e4dd0f53f7dca7b..b9f939a9b98597af35b90b91af6108744d95bc23 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p1/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
index cec6d4db3ea54238533a40f67d714a26dcff1bc7..81b9b4ed899892ebe71bc52223127e8449bbcdfa 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p2/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
index 2ffbafde19985dce56091e357d7b1e05cf20fdf8..0d093634c759f046c0355b12667afc00e2ce09f9 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/p3/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
index aa12be4ecc98719590c86d094f712bbb0d46aa7b..48a136e8ffc2db870d10c917122eef51994f1513 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t1/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
index 6f17c0464a9ff54e348c2756585fd750d8649c57..e2d671c4f4f040f7490655e061d72abc761df79f 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/t2/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
index 4f50df665fff748deff68a45aeaacf745afa8a4c..673b73938a799bef194471bc04b56debf6453b97 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/veryfine/bar.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
index 9fef4c156f1ca42bd7bb0c8db4dad3f707d907e2..834af10359a22b270dd7301dc6bcacf84c6923b8 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_hexa/beam.prj
@@ -33,7 +33,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
index e51ab74cab1011977092b748e8e4fa02fe407475..f73c83a17ca470a67ea6ccd2dd25a12662057fb7 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/3D_tetr/beam.prj
@@ -33,7 +33,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
index 57ded5d63235d7c4f7a431e4af58bbc6fd44a2c4..27f995e67adcf2e7a94386a78dc44e7498a08e80 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse/beam.prj
@@ -33,7 +33,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
index 8c7609cbc943934e8e136aa23ebaa68b39497ead..a1150ba213abcb7d4c0e5a3c1ce4b9522b9d71ea 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_quad/beam.prj
@@ -33,7 +33,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
index fa0310c9279266f2410e9b2dfdb4c2976127551c..102041251c94930f23e51696fc588c53ac568296 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/coarse_tria/beam.prj
@@ -33,7 +33,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj
index 3f8c2b73fd5218d4d592be0f6a4130d5dce00787..26138526f53fda849a1f2fe77009ac6c30cebee5 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/fine/beam.prj
@@ -33,7 +33,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
index fb3697154cef879fd88e639dd959c00882fcfd8c..fee519f2b2294b1ed7e19a32e10f58e8b55cc90b 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/beam/medium/beam.prj
@@ -33,7 +33,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
index 65f99710d9a152349b545152e38f1a16ac2ba664..5b6a7de95ef16325457d1b69dd57ed885fcd080e 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/holed_beam/holed_beam.prj
@@ -38,7 +38,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
index de959e2c9926cf04f06dc97986070d8c69374cce..39a2b4996e8871aeeeff7974730d8f6edc40b5bf 100644
--- a/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
+++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/notched_beam/smallbeam_3D.prj
@@ -37,7 +37,8 @@
                 </damage_properties>
                 <nonlinear_solver>
                     <maximum_iterations>10000</maximum_iterations>
-                    <error_tolerance>1e-10</error_tolerance>
+                    <residuum_tolerance>1e-10</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
index 6e9dccf835d3772ed353b2cd5cfc99c835cc1ee3..932aeff22c64d5cf135ad94c8d87745c626e90f7 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
@@ -26,7 +26,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>2e-8</error_tolerance>
+                    <residuum_tolerance>2e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
index bec567b5e715ba02c52f3343b2e1056f48c63eee..f6d5e637f42b6761ae22ec2ecf99cab1b55948f6 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-15</error_tolerance>
+                    <residuum_tolerance>1e-15</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
index e2f29ee6634d189c88676a371cb7d8aa00023ebf..d496eeefc90b941d62d4c4972f2d256fff245257 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-15</error_tolerance>
+                    <residuum_tolerance>1e-15</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
index ae2f50b8c58829934a2fef1237c99a355d1e721a..1a094276f118255a9e70a8bcec747c9686eaa632 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
index 12cfbe6475aee8f0e77cb4f208190fe15a85c33a..0385a56bdd15ee52815b7b2b018c86a5971bf065 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
index 59eaebb5d450db4bbb934f26b6734c945f8677e1..69568e8e8f0e2cd8bb6c3db1faba799d6d726616 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
index 011295ff2fddddee8758dc8d2ed60cd830b6cab5..39b6ff83b230a42211ffad47180ae79087a00949 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
index c08061eb38c164c9e464a03fd80f75f44f285526..a6387e0b65ef5af65d0fd36be6a7bd0d21d1b49a 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
index 0f757465577f963b0561a5a31dd5e15fba16b69e..1e14d44c9bef7522c6fe40920efe6db82d4f9447 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
index 98319179148c8d22e2405891a31bbb68555ead45..1dbbe6ff920023d1b479ee58ea2a0580a409820b 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
index be04fbc19f43dbc94c3bfe18ac60b74efb79e5a5..489714fff5d89e1270fa377b0f88375f1a61ee9a 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <solid_density>rho_sr</solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
index 98ab36269548659ba84613e96be86a9f80035e46..7404a7806877a7a9aa0ccb000be37a7b8dba7422 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
index 2be5b39d5d22a1b56b64592c13cc0cdfa0a5441c..51188d65f146e20f6f871a676230bcf724eac631 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
index b350ff602f43efb3a279f20ba7c6543dee2dff71..8529dfec089eca51cc69174d0e37cbfa410e51fd 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
@@ -17,7 +17,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>1e-8</error_tolerance>
+                    <residuum_tolerance>1e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>
diff --git a/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj b/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
index 5ddac5facc8e032eacd045bd4e434aef600953a2..355030a4af5a57b6f7a0f7f7a4df82befe73255d 100644
--- a/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
+++ b/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
@@ -27,7 +27,8 @@
                 <q>Q</q>
                 <nonlinear_solver>
                     <maximum_iterations>1000</maximum_iterations>
-                    <error_tolerance>2e-8</error_tolerance>
+                    <residuum_tolerance>2e-8</residuum_tolerance>
+                    <increment_tolerance>0</increment_tolerance>
                 </nonlinear_solver>
             </constitutive_relation>
             <reference_solid_density>rho_sr</reference_solid_density>