diff --git a/MaterialLib/SolidModels/Ehlers-impl.h b/MaterialLib/SolidModels/Ehlers-impl.h
index e7a7d2fa5dc3d6d4ad0dca68ab25f89491cfbd5f..f6963af572719ec01a5ca41b078f65f7bfcec91d 100644
--- a/MaterialLib/SolidModels/Ehlers-impl.h
+++ b/MaterialLib/SolidModels/Ehlers-impl.h
@@ -40,69 +40,6 @@ namespace Solids
 {
 namespace Ehlers
 {
-/// Evaluated MaterialPropertiesParameters container, see its documentation for
-/// details.
-struct MaterialProperties final
-{
-    MaterialProperties(double const t, ProcessLib::SpatialPosition const& x,
-                       MaterialPropertiesParameters const& mp)
-        : G(mp.G(t, x)[0]),
-          K(mp.K(t, x)[0]),
-          alpha(mp.alpha(t, x)[0]),
-          beta(mp.beta(t, x)[0]),
-          gamma(mp.gamma(t, x)[0]),
-          delta(mp.delta(t, x)[0]),
-          epsilon(mp.epsilon(t, x)[0]),
-          m(mp.m(t, x)[0]),
-          alpha_p(mp.alpha_p(t, x)[0]),
-          beta_p(mp.beta_p(t, x)[0]),
-          gamma_p(mp.gamma_p(t, x)[0]),
-          delta_p(mp.delta_p(t, x)[0]),
-          epsilon_p(mp.epsilon_p(t, x)[0]),
-          m_p(mp.m_p(t, x)[0]),
-          kappa(mp.kappa(t, x)[0]),
-          hardening_coefficient(mp.hardening_coefficient(t, x)[0])
-    {
-    }
-    double const G;
-    double const K;
-
-    double const alpha;
-    double const beta;
-    double const gamma;
-    double const delta;
-    double const epsilon;
-    double const m;
-
-    double const alpha_p;
-    double const beta_p;
-    double const gamma_p;
-    double const delta_p;
-    double const epsilon_p;
-    double const m_p;
-
-    double const kappa;
-    double const hardening_coefficient;
-};
-
-/// Evaluated DamagePropertiesParameters container, see its documentation for
-/// details.
-struct DamageProperties
-{
-    DamageProperties(double const t,
-                     ProcessLib::SpatialPosition const& x,
-                     DamagePropertiesParameters const& dp)
-        : alpha_d(dp.alpha_d(t, x)[0]),
-          beta_d(dp.beta_d(t, x)[0]),
-          h_d(dp.h_d(t, x)[0])
-    {
-    }
-    double const alpha_d;
-    double const beta_d;
-    double const h_d;
-};
-
-
 /// Special product of \c v with itself: \f$v \odot v\f$.
 /// The tensor \c v is given in Kelvin mapping.
 /// \note Implementation only for 2 and 3 dimensions.
@@ -456,38 +393,6 @@ typename SolidEhlers<DisplacementDim>::JacobianMatrix calculatePlasticJacobian(
     return jacobian;
 }
 
-/// Computes the damage internal material variable explicitly based on the
-/// results obtained from the local stress return algorithm.
-inline Damage calculateDamage(double const eps_p_V_diff,
-                              double const eps_p_eff_diff,
-                              double kappa_d,
-                              DamageProperties const& dp)
-{
-    // Default case of the rate problem. Updated below if volumetric plastic
-    // strain rate is positive (dilatancy).
-
-    // Compute damage current step
-    if (eps_p_V_diff > 0)
-    {
-        double const r_s = eps_p_eff_diff / eps_p_V_diff;
-
-        // Brittleness decrease with confinement for the nonlinear flow rule.
-        // ATTENTION: For linear flow rule -> constant brittleness.
-        double x_s = 0;
-        if (r_s < 1)
-        {
-            x_s = 1 + dp.h_d * r_s * r_s;
-        }
-        else
-        {
-            x_s = 1 - 3 * dp.h_d + 4 * dp.h_d * std::sqrt(r_s);
-        }
-        kappa_d += eps_p_eff_diff / x_s;
-    }
-
-    return {kappa_d, (1 - dp.beta_d) * (1 - std::exp(-kappa_d / dp.alpha_d))};
-}
-
 /// Calculates the derivative of the residuals with respect to total
 /// strain. Implementation fully implicit only.
 template <int DisplacementDim>
@@ -589,27 +494,19 @@ SolidEhlers<DisplacementDim>::integrateStress(
     // do the evaluation once per function call.
     MaterialProperties const mp(t, x, _mp);
 
-    KelvinVector sigma_eff_prev = sigma_prev;  // In case without damage the
-                                               // effective value is same as the
-                                               // previous one.
-    if (_damage_properties)
-    {
-        // Compute sigma_eff from damage total stress sigma, which is given by
-        // sigma_eff=sigma_prev / (1-damage)
-        sigma_eff_prev = sigma_prev / (1 - state.damage_prev.value());
-    }
-    KelvinVector sigma = predict_sigma<DisplacementDim>(
-        mp.G, mp.K, sigma_eff_prev, eps, eps_prev, eps_V);
+    KelvinVector sigma = predict_sigma<DisplacementDim>(mp.G, mp.K, sigma_prev,
+                                                        eps, eps_prev, eps_V);
 
     KelvinMatrix tangentStiffness;
 
     PhysicalStressWithInvariants<DisplacementDim> s{mp.G * sigma};
     // Quit early if sigma is zero (nothing to do) or if we are still in elastic
     // zone.
-    if (sigma.squaredNorm() == 0 ||
-        yieldFunction(mp, s, calculateIsotropicHardening(
-                                 mp.kappa, mp.hardening_coefficient,
-                                 state.eps_p.eff)) < 0)
+    if ((sigma.squaredNorm() == 0 ||
+         yieldFunction(
+             mp, s,
+             calculateIsotropicHardening(mp.kappa, mp.hardening_coefficient,
+                                         state.eps_p.eff)) < 0))
     {
         tangentStiffness.setZero();
         tangentStiffness.template topLeftCorner<3, 3>().setConstant(
@@ -704,16 +601,6 @@ SolidEhlers<DisplacementDim>::integrateStress(
                 splitSolutionVector<ResidualVectorType, KelvinVector>(solution);
         }
 
-        if (_damage_properties)
-        {
-            DamageProperties damage_properties(t, x, *_damage_properties);
-            state.damage =
-                calculateDamage(state.eps_p.V - state.eps_p_prev.V,
-                                state.eps_p.eff - state.eps_p_prev.eff,
-                                state.damage.kappa_d(), damage_properties);
-        }
-
-
         // Calculate residual derivative w.r.t. strain
         Eigen::Matrix<double, JacobianResidualSize, KelvinVectorSize,
                       Eigen::RowMajor>
@@ -730,8 +617,6 @@ SolidEhlers<DisplacementDim>::integrateStress(
     }
 
     KelvinVector sigma_final = mp.G * sigma;
-    if (_damage_properties)
-        sigma_final *= 1 - state.damage.value();
 
     return {std::make_tuple(
         sigma_final,
diff --git a/MaterialLib/SolidModels/Ehlers.h b/MaterialLib/SolidModels/Ehlers.h
index 95ed157619be705a5bb34e433c33a47804aef10e..b277dd2bc289181a02b08a2742a74a0e7fbb13df 100644
--- a/MaterialLib/SolidModels/Ehlers.h
+++ b/MaterialLib/SolidModels/Ehlers.h
@@ -99,6 +99,68 @@ struct DamagePropertiesParameters
     P const& h_d;
 };
 
+/// Evaluated MaterialPropertiesParameters container, see its documentation for
+/// details.
+struct MaterialProperties final
+{
+    MaterialProperties(double const t, ProcessLib::SpatialPosition const& x,
+                       MaterialPropertiesParameters const& mp)
+        : G(mp.G(t, x)[0]),
+          K(mp.K(t, x)[0]),
+          alpha(mp.alpha(t, x)[0]),
+          beta(mp.beta(t, x)[0]),
+          gamma(mp.gamma(t, x)[0]),
+          delta(mp.delta(t, x)[0]),
+          epsilon(mp.epsilon(t, x)[0]),
+          m(mp.m(t, x)[0]),
+          alpha_p(mp.alpha_p(t, x)[0]),
+          beta_p(mp.beta_p(t, x)[0]),
+          gamma_p(mp.gamma_p(t, x)[0]),
+          delta_p(mp.delta_p(t, x)[0]),
+          epsilon_p(mp.epsilon_p(t, x)[0]),
+          m_p(mp.m_p(t, x)[0]),
+          kappa(mp.kappa(t, x)[0]),
+          hardening_coefficient(mp.hardening_coefficient(t, x)[0])
+    {
+    }
+    double const G;
+    double const K;
+
+    double const alpha;
+    double const beta;
+    double const gamma;
+    double const delta;
+    double const epsilon;
+    double const m;
+
+    double const alpha_p;
+    double const beta_p;
+    double const gamma_p;
+    double const delta_p;
+    double const epsilon_p;
+    double const m_p;
+
+    double const kappa;
+    double const hardening_coefficient;
+};
+
+/// Evaluated DamagePropertiesParameters container, see its documentation for
+/// details.
+struct DamageProperties
+{
+    DamageProperties(double const t,
+                     ProcessLib::SpatialPosition const& x,
+                     DamagePropertiesParameters const& dp)
+        : alpha_d(dp.alpha_d(t, x)[0]),
+          beta_d(dp.beta_d(t, x)[0]),
+          h_d(dp.h_d(t, x)[0])
+    {
+    }
+    double const alpha_d;
+    double const beta_d;
+    double const h_d;
+};
+
 template <typename KelvinVector>
 struct PlasticStrain final
 {
@@ -262,6 +324,18 @@ public:
     std::vector<typename MechanicsBase<DisplacementDim>::InternalVariable>
     getInternalVariables() const override;
 
+    MaterialProperties evaluatedMaterialProperties(
+        double const t, ProcessLib::SpatialPosition const& x) const
+    {
+        return MaterialProperties(t, x, _mp);
+    }
+
+    DamageProperties evaluatedDamageProperties(
+        double const t, ProcessLib::SpatialPosition const& x) const
+    {
+        return DamageProperties(t, x, *_damage_properties);
+    }
+
 private:
     NumLib::NewtonRaphsonSolverParameters const _nonlinear_solver_parameters;
 
diff --git a/ProcessLib/SmallDeformation/Tests.cmake b/ProcessLib/SmallDeformation/Tests.cmake
index c4b68154b9a821472dea8cefbac983e62073ed48..b2849c3d7442e7e33177f8dfca7bb35236e76e21 100644
--- a/ProcessLib/SmallDeformation/Tests.cmake
+++ b/ProcessLib/SmallDeformation/Tests.cmake
@@ -208,57 +208,6 @@ AddTest(
     ring_plane_strain_1e4_solution.vtu ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu sigma sigma 6e-4 0
 )
 
-# Mechanics; Small deformations, Ehlers-damage Uniaxial Tension (SDED)
-AddTest(
-    NAME Mechanics_PlasticModel_SDED_Ehlers_Damage_UniaxialTension
-    PATH Mechanics/EhlersDamage/UniaxialTension
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS data.prj
-    TESTER vtkdiff
-    REQUIREMENTS NOT OGS_USE_MPI
-    DIFF_DATA
-    uc_01_pcs_0_ts_3276_t_3.276000.vtu uc_01_pcs_0_ts_3276_t_3.276000.vtu displacement displacement 5e-13 0
-    uc_01_pcs_0_ts_3276_t_3.276000.vtu uc_01_pcs_0_ts_3276_t_3.276000.vtu sigma sigma 5e-13 0
-    uc_01_pcs_0_ts_3276_t_3.276000.vtu uc_01_pcs_0_ts_3276_t_3.276000.vtu epsilon epsilon 5e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu displacement displacement 5e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu sigma sigma 5e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu epsilon epsilon 5e-13 0
-)
-
-# Mechanics; Small deformations, Ehlers-damage Uniaxial Compression (SDED)
-AddTest(
-    NAME Mechanics_PlasticModel_SDED_Ehlers_Damage_UniaxialCompression
-    PATH Mechanics/EhlersDamage/UniaxialCompression
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS data.prj
-    TESTER vtkdiff
-    REQUIREMENTS NOT OGS_USE_MPI
-    DIFF_DATA
-    uc_01_pcs_0_ts_3543_t_3.543000.vtu uc_01_pcs_0_ts_3543_t_3.543000.vtu displacement displacement 1e-13 0
-    uc_01_pcs_0_ts_3543_t_3.543000.vtu uc_01_pcs_0_ts_3543_t_3.543000.vtu sigma sigma 1e-13 0
-    uc_01_pcs_0_ts_3543_t_3.543000.vtu uc_01_pcs_0_ts_3543_t_3.543000.vtu epsilon epsilon 1e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu displacement displacement 1e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu sigma sigma 1e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu epsilon epsilon 1e-13 0
-)
-
-# Mechanics; Small deformations, Ehlers-damage Triaxial Compression (SDED)
-AddTest(
-    NAME Mechanics_PlasticModel_SDED_Ehlers_Damage_TriaxialCompression
-    PATH Mechanics/EhlersDamage/TriaxialCompression
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS data.prj
-    TESTER vtkdiff
-    REQUIREMENTS NOT OGS_USE_MPI
-    DIFF_DATA
-    uc_01_pcs_0_ts_2823_t_2.823000.vtu uc_01_pcs_0_ts_2823_t_2.823000.vtu displacement displacement 1e-13 0
-    uc_01_pcs_0_ts_2823_t_2.823000.vtu uc_01_pcs_0_ts_2823_t_2.823000.vtu sigma sigma 1e-13 0
-    uc_01_pcs_0_ts_2823_t_2.823000.vtu uc_01_pcs_0_ts_2823_t_2.823000.vtu epsilon epsilon 1e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu displacement displacement 1e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu sigma sigma 1e-13 0
-    uc_01_pcs_0_ts_5000_t_5.000000.vtu uc_01_pcs_0_ts_5000_t_5.000000.vtu epsilon epsilon 1e-13 0
-)
-
 #With PETSc
 AddTest(
     NAME Parallel_Mechanics_SDL_disc_with_hole
diff --git a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/cube_1x1x1.gml b/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/cube_1x1x1.gml
deleted file mode 100644
index d7c9b920ac153fd4444d7b959cde404cbe78582f..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/cube_1x1x1.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0db3fefd2e8e5f07be9410fc6db8df089673955c969d25ebfdd36e3c5f94cac8
-size 1617
diff --git a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/cube_1x1x1_hex_1e0.vtu b/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/cube_1x1x1_hex_1e0.vtu
deleted file mode 100644
index 7e182287a44b78741a25cbcfabc2e0109d918d54..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/cube_1x1x1_hex_1e0.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baa51eea253d1fe35591bc41b3723e19f1102bb6812ecef5d6aaa5766a53cdc7
-size 1437
diff --git a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/data.prj b/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/data.prj
deleted file mode 100755
index 645cce5d28894f17d640c933d05db2910b793054..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/data.prj
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<OpenGeoSysProject>
-    <mesh>cube_1x1x1_hex_1e0.vtu</mesh>
-    <geometry>cube_1x1x1.gml</geometry>
-    <processes>
-        <process>
-            <name>SD</name>
-            <type>SMALL_DEFORMATION</type>
-            <integration_order>2</integration_order>
-            <constitutive_relation>
-                <type>Ehlers</type>
-                <shear_modulus>G</shear_modulus>
-                <bulk_modulus>K</bulk_modulus>
-                <kappa>kappa</kappa>
-                <beta>beta</beta>
-                <gamma>gamma</gamma>
-                <hardening_modulus>hard</hardening_modulus>
-                <alpha>alpha</alpha>
-                <delta>delta</delta>
-                <eps>epsilon</eps>
-                <m>m</m>
-                <alphap>alphap</alphap>
-                <deltap>deltap</deltap>
-                <epsp>epsilonp</epsp>
-                <mp>mp</mp>
-                <betap>betap</betap>
-                <gammap>gammap</gammap>
-                <damage_properties>
-                    <alpha_d>alphad</alpha_d>
-                    <beta_d>betad</beta_d>
-                    <h_d>hd</h_d>
-                </damage_properties>
-                <nonlinear_solver>
-                    <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-14</error_tolerance>
-                </nonlinear_solver>
-            </constitutive_relation>
-            <solid_density>rho_sr</solid_density>
-            <specific_body_force>0 0 0</specific_body_force>
-            <process_variables>
-                <process_variable>displacement</process_variable>
-            </process_variables>
-            <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-            </secondary_variables>
-        </process>
-    </processes>
-    <time_loop>
-        <processes>
-            <process ref="SD">
-                <nonlinear_solver>basic_newton</nonlinear_solver>
-                <convergence_criterion>
-                    <type>DeltaX</type>
-                    <norm_type>NORM2</norm_type>
-                    <abstol>1e-14</abstol>
-                </convergence_criterion>
-                <time_discretization>
-                    <type>BackwardEuler</type>
-                </time_discretization>
-                <output>
-                    <variables>
-                        <variable>displacement</variable>
-                        <variable>sigma</variable>
-                        <variable>epsilon</variable>
-                    </variables>
-                </output>
-                <time_stepping>
-                    <type>FixedTimeStepping</type>
-                    <t_initial>0</t_initial>
-                    <t_end>5.</t_end>
-                    <timesteps>
-                        <pair>
-                            <repeat>1</repeat>
-                            <delta_t>0.001</delta_t>
-                        </pair>
-                        <pair>
-                            <repeat>1000</repeat>
-                            <delta_t>0.001</delta_t>
-                        </pair>
-                    </timesteps>
-                </time_stepping>
-            </process>
-        </processes>
-        <output>
-            <type>VTK</type>
-            <prefix>uc_01</prefix>
-            <timesteps>
-                <pair>
-                    <repeat>1</repeat>
-                    <each_steps>2823</each_steps>
-                </pair>
-                <pair>
-                    <repeat>1</repeat>
-                    <each_steps>5000</each_steps>
-                </pair>
-            </timesteps>
-        </output>
-    </time_loop>
-    <parameters>
-        <parameter>
-            <name>G</name>
-            <type>Constant</type>
-            <value>5000.</value>
-        </parameter>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>8000.</value>
-        </parameter>
-        <parameter>
-            <name>kappa</name>
-            <type>Constant</type>
-            <value>5.1</value>
-        </parameter>
-        <parameter>
-            <name>beta</name>
-            <type>Constant</type>
-            <value>0.167</value>
-        </parameter>
-        <parameter>
-            <name>gamma</name>
-            <type>Constant</type>
-            <value>1.</value>
-        </parameter>
-        <parameter>
-            <name>hard</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>alpha</name>
-            <type>Constant</type>
-            <value>0.1</value>
-        </parameter>
-        <parameter>
-            <name>delta</name>
-            <type>Constant</type>
-            <value>0.0</value>
-        </parameter>
-        <parameter>
-            <name>epsilon</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>m</name>
-            <type>Constant</type>
-            <value>0.54</value>
-        </parameter>
-        <parameter>
-            <name>alphap</name>
-            <type>Constant</type>
-            <value>0.1</value>
-        </parameter>
-        <parameter>
-            <name>deltap</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>epsilonp</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>mp</name>
-            <type>Constant</type>
-            <value>0.54</value>
-        </parameter>
-        <parameter>
-            <name>betap</name>
-            <type>Constant</type>
-            <value>0.167</value>
-        </parameter>
-        <parameter>
-            <name>gammap</name>
-            <type>Constant</type>
-            <value>1.</value>
-        </parameter>
-        <parameter>
-            <name>alphad</name>
-            <type>Constant</type>
-            <value>0.00001</value>
-        </parameter>
-        <parameter>
-            <name>betad</name>
-            <type>Constant</type>
-            <value>0.05</value>
-        </parameter>
-        <parameter>
-            <name>hd</name>
-            <type>Constant</type>
-            <value>15.0</value>
-        </parameter>
-        <parameter>
-            <name>rho_sr</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>displacement0</name>
-            <type>Constant</type>
-            <values>0 0 0</values>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_left</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_bottom</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_front</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_top_spatial</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>Neumann_spatial</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_top</name>
-            <type>CurveScaled</type>
-            <curve>Dirichlet_top_temporal</curve>
-            <parameter>Dirichlet_top_spatial</parameter>
-        </parameter>
-        <parameter>
-            <name>Neumann_force_right</name>
-            <type>CurveScaled</type>
-            <curve>Neumann_temporal_right</curve>
-            <parameter>Neumann_spatial</parameter>
-        </parameter>
-        <parameter>
-            <name>Neumann_force_top</name>
-            <type>CurveScaled</type>
-            <curve>Neumann_temporal_top</curve>
-            <parameter>Neumann_spatial</parameter>
-        </parameter>
-    </parameters>
-    <curves>
-        <curve>
-            <name>Dirichlet_top_temporal</name>
-            <coords>0. 5.</coords>
-            <values>0. -0.0025</values>
-        </curve>
-        <curve>
-            <name>Neumann_temporal_right</name>
-            <coords>0. 0.1 5.</coords>
-            <values>0. -5. -5.</values>
-        </curve>
-        <curve>
-            <name>Neumann_temporal_top</name>
-            <coords>0. 0.1 5.</coords>
-            <values>0. -5. -5.</values>
-        </curve>
-    </curves>
-    <process_variables>
-        <process_variable>
-            <name>displacement</name>
-            <components>3</components>
-            <order>1</order>
-            <initial_condition>displacement0</initial_condition>
-            <boundary_conditions>
-                <!-- fixed boundaries -->
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
-                    <type>Dirichlet</type>
-                    <component>0</component>
-                    <parameter>Dirichlet_left</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>front</geometry>
-                    <type>Dirichlet</type>
-                    <component>1</component>
-                    <parameter>Dirichlet_front</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>bottom</geometry>
-                    <type>Dirichlet</type>
-                    <component>2</component>
-                    <parameter>Dirichlet_bottom</parameter>
-                </boundary_condition>
-                <!-- force -->
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
-                    <type>Neumann</type>
-                    <component>0</component>
-                    <parameter>Neumann_force_right</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>back</geometry>
-                    <type>Dirichlet</type>
-                    <component>1</component>
-                    <parameter>Dirichlet_top</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>top</geometry>
-                    <type>Neumann</type>
-                    <component>2</component>
-                    <parameter>Neumann_force_top</parameter>
-                </boundary_condition>
-            </boundary_conditions>
-        </process_variable>
-    </process_variables>
-    <nonlinear_solvers>
-        <nonlinear_solver>
-            <name>basic_newton</name>
-            <type>Newton</type>
-            <max_iter>50</max_iter>
-            <linear_solver>general_linear_solver</linear_solver>
-        </nonlinear_solver>
-    </nonlinear_solvers>
-    <linear_solvers>
-        <linear_solver>
-            <name>general_linear_solver</name>
-            <lis>-i BiCGSTAB -p jacobi -tol 1e-16 -maxiter 10000</lis>
-            <eigen>
-                <solver_type>BiCGSTAB</solver_type>
-                <precon_type>DIAGONAL</precon_type>
-                <max_iteration_step>10000</max_iteration_step>
-                <error_tolerance>1e-16</error_tolerance>
-            </eigen>
-            <petsc>
-                <prefix>sd</prefix>
-                <parameters>-sd_ksp_type cg -sd_pc_type bjacobi -sd_ksp_rtol 1e-16 -sd_ksp_max_it 10000</parameters>
-            </petsc>
-        </linear_solver>
-    </linear_solvers>
-</OpenGeoSysProject>
diff --git a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_1999_t_5.000000.vtu b/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_1999_t_5.000000.vtu
deleted file mode 100644
index d00bbde31ccb91b25d826e431688cece60c5cbfe..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_1999_t_5.000000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4ec531bdd09fc11b04633f0194d6e4dc62ccea2061a2f28d2115c7ad1a4b9b1
-size 3544
diff --git a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_2823_t_2.823000.vtu b/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_2823_t_2.823000.vtu
deleted file mode 100644
index 7a097574982ff85a0ef76b56dc5bc5bca07b70ac..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_2823_t_2.823000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba991db2a1c474dd44205374dfec83c04f54581e01050d33fa1f85fd2575c601
-size 2932
diff --git a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_5000_t_5.000000.vtu b/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_5000_t_5.000000.vtu
deleted file mode 100644
index cb82836ba0dc0d7597ee0abb27054709497e24e8..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_5000_t_5.000000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e75ee0db25f7530a0f3c75a81229f455c464276ec80f0a3dcc98b9cf848f51f0
-size 2912
diff --git a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_882_t_0.882000.vtu b/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_882_t_0.882000.vtu
deleted file mode 100644
index 4fab5b87be87f3b5de46d74db0844e289bec3f3b..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/TriaxialCompression/uc_01_pcs_0_ts_882_t_0.882000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d33fe87a22c98ceacb198138e9f29ab159457ad076e6ef3121bf48668df45d21
-size 3590
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/cube_1x1x1.gml b/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/cube_1x1x1.gml
deleted file mode 100644
index d7c9b920ac153fd4444d7b959cde404cbe78582f..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/cube_1x1x1.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0db3fefd2e8e5f07be9410fc6db8df089673955c969d25ebfdd36e3c5f94cac8
-size 1617
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/cube_1x1x1_hex_1e0.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/cube_1x1x1_hex_1e0.vtu
deleted file mode 100644
index 7e182287a44b78741a25cbcfabc2e0109d918d54..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/cube_1x1x1_hex_1e0.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baa51eea253d1fe35591bc41b3723e19f1102bb6812ecef5d6aaa5766a53cdc7
-size 1437
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/data.prj b/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/data.prj
deleted file mode 100755
index 8cca20d8e7ca050cd7895371e4261ca0bd963862..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/data.prj
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<OpenGeoSysProject>
-    <mesh>cube_1x1x1_hex_1e0.vtu</mesh>
-    <geometry>cube_1x1x1.gml</geometry>
-    <processes>
-        <process>
-            <name>SD</name>
-            <type>SMALL_DEFORMATION</type>
-            <integration_order>2</integration_order>
-            <constitutive_relation>
-                <type>Ehlers</type>
-                <shear_modulus>G</shear_modulus>
-                <bulk_modulus>K</bulk_modulus>
-                <kappa>kappa</kappa>
-                <beta>beta</beta>
-                <gamma>gamma</gamma>
-                <hardening_modulus>hard</hardening_modulus>
-                <alpha>alpha</alpha>
-                <delta>delta</delta>
-                <eps>epsilon</eps>
-                <m>m</m>
-                <alphap>alphap</alphap>
-                <deltap>deltap</deltap>
-                <epsp>epsilonp</epsp>
-                <mp>mp</mp>
-                <betap>betap</betap>
-                <gammap>gammap</gammap>
-                <damage_properties>
-                    <alpha_d>alphad</alpha_d>
-                    <beta_d>betad</beta_d>
-                    <h_d>hd</h_d>
-                </damage_properties>
-                <nonlinear_solver>
-                    <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-14</error_tolerance>
-                </nonlinear_solver>
-            </constitutive_relation>
-            <solid_density>rho_sr</solid_density>
-            <specific_body_force>0 0 0</specific_body_force>
-            <process_variables>
-                <process_variable>displacement</process_variable>
-            </process_variables>
-            <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-            </secondary_variables>
-        </process>
-    </processes>
-    <time_loop>
-        <processes>
-            <process ref="SD">
-                <nonlinear_solver>basic_newton</nonlinear_solver>
-                <convergence_criterion>
-                    <type>DeltaX</type>
-                    <norm_type>NORM2</norm_type>
-                    <abstol>1e-14</abstol>
-                </convergence_criterion>
-                <time_discretization>
-                    <type>BackwardEuler</type>
-                </time_discretization>
-                <output>
-                    <variables>
-                        <variable>displacement</variable>
-                        <variable>sigma</variable>
-                        <variable>epsilon</variable>
-                    </variables>
-                </output>
-                <time_stepping>
-                    <type>FixedTimeStepping</type>
-                    <t_initial>0</t_initial>
-                    <t_end>5.</t_end>
-                    <timesteps>
-                        <pair>
-                            <repeat>1</repeat>
-                            <delta_t>0.001</delta_t>
-                        </pair>
-                        <pair>
-                            <repeat>1000</repeat>
-                            <delta_t>0.001</delta_t>
-                        </pair>
-                    </timesteps>
-                </time_stepping>
-            </process>
-        </processes>
-        <output>
-            <type>VTK</type>
-            <prefix>uc_01</prefix>
-            <timesteps>
-                <pair>
-                    <repeat>1</repeat>
-                    <each_steps>3543</each_steps>
-                </pair>
-                <pair>
-                    <repeat>1</repeat>
-                    <each_steps>5000</each_steps>
-                </pair>
-            </timesteps>
-        </output>
-    </time_loop>
-    <parameters>
-        <parameter>
-            <name>G</name>
-            <type>Constant</type>
-            <value>5000.</value>
-        </parameter>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>8000.</value>
-        </parameter>
-        <parameter>
-            <name>kappa</name>
-            <type>Constant</type>
-            <value>5.1</value>
-        </parameter>
-        <parameter>
-            <name>beta</name>
-            <type>Constant</type>
-            <value>0.167</value>
-        </parameter>
-        <parameter>
-            <name>gamma</name>
-            <type>Constant</type>
-            <value>1.</value>
-        </parameter>
-        <parameter>
-            <name>hard</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>alpha</name>
-            <type>Constant</type>
-            <value>0.1</value>
-        </parameter>
-        <parameter>
-            <name>delta</name>
-            <type>Constant</type>
-            <value>0.0</value>
-        </parameter>
-        <parameter>
-            <name>epsilon</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>m</name>
-            <type>Constant</type>
-            <value>0.54</value>
-        </parameter>
-        <parameter>
-            <name>alphap</name>
-            <type>Constant</type>
-            <value>0.1</value>
-        </parameter>
-        <parameter>
-            <name>deltap</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>epsilonp</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>mp</name>
-            <type>Constant</type>
-            <value>0.54</value>
-        </parameter>
-        <parameter>
-            <name>betap</name>
-            <type>Constant</type>
-            <value>0.167</value>
-        </parameter>
-        <parameter>
-            <name>gammap</name>
-            <type>Constant</type>
-            <value>1.</value>
-        </parameter>
-        <parameter>
-            <name>alphad</name>
-            <type>Constant</type>
-            <value>0.00001</value>
-        </parameter>
-        <parameter>
-            <name>betad</name>
-            <type>Constant</type>
-            <value>0.05</value>
-        </parameter>
-        <parameter>
-            <name>hd</name>
-            <type>Constant</type>
-            <value>15.0</value>
-        </parameter>
-        <parameter>
-            <name>rho_sr</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>displacement0</name>
-            <type>Constant</type>
-            <values>0 0 0</values>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_left</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_bottom</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_front</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_top_spatial</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>Neumann_spatial</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_top</name>
-            <type>CurveScaled</type>
-            <curve>Dirichlet_top_temporal</curve>
-            <parameter>Dirichlet_top_spatial</parameter>
-        </parameter>
-        <parameter>
-            <name>Neumann_force_right</name>
-            <type>CurveScaled</type>
-            <curve>Neumann_temporal_right</curve>
-            <parameter>Neumann_spatial</parameter>
-        </parameter>
-        <parameter>
-            <name>Neumann_force_top</name>
-            <type>CurveScaled</type>
-            <curve>Neumann_temporal_top</curve>
-            <parameter>Neumann_spatial</parameter>
-        </parameter>
-    </parameters>
-    <curves>
-        <curve>
-            <name>Dirichlet_top_temporal</name>
-            <coords>0. 5.</coords>
-            <values>0. -0.0015</values>
-        </curve>
-        <curve>
-            <name>Neumann_temporal_right</name>
-            <coords>0. 5.</coords>
-            <values>0. 0.</values>
-        </curve>
-        <curve>
-            <name>Neumann_temporal_top</name>
-            <coords>0. 5.</coords>
-            <values>0. 0.</values>
-        </curve>
-    </curves>
-    <process_variables>
-        <process_variable>
-            <name>displacement</name>
-            <components>3</components>
-            <order>1</order>
-            <initial_condition>displacement0</initial_condition>
-            <boundary_conditions>
-                <!-- fixed boundaries -->
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
-                    <type>Dirichlet</type>
-                    <component>0</component>
-                    <parameter>Dirichlet_left</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>front</geometry>
-                    <type>Dirichlet</type>
-                    <component>1</component>
-                    <parameter>Dirichlet_front</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>bottom</geometry>
-                    <type>Dirichlet</type>
-                    <component>2</component>
-                    <parameter>Dirichlet_bottom</parameter>
-                </boundary_condition>
-                <!-- force -->
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
-                    <type>Neumann</type>
-                    <component>0</component>
-                    <parameter>Neumann_force_right</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>back</geometry>
-                    <type>Dirichlet</type>
-                    <component>1</component>
-                    <parameter>Dirichlet_top</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>top</geometry>
-                    <type>Neumann</type>
-                    <component>2</component>
-                    <parameter>Neumann_force_top</parameter>
-                </boundary_condition>
-            </boundary_conditions>
-        </process_variable>
-    </process_variables>
-    <nonlinear_solvers>
-        <nonlinear_solver>
-            <name>basic_newton</name>
-            <type>Newton</type>
-            <max_iter>50</max_iter>
-            <linear_solver>general_linear_solver</linear_solver>
-        </nonlinear_solver>
-    </nonlinear_solvers>
-    <linear_solvers>
-        <linear_solver>
-            <name>general_linear_solver</name>
-            <lis>-i BiCGSTAB -p jacobi -tol 1e-16 -maxiter 10000</lis>
-            <eigen>
-                <solver_type>BiCGSTAB</solver_type>
-                <precon_type>DIAGONAL</precon_type>
-                <max_iteration_step>10000</max_iteration_step>
-                <error_tolerance>1e-16</error_tolerance>
-            </eigen>
-            <petsc>
-                <prefix>sd</prefix>
-                <parameters>-sd_ksp_type cg -sd_pc_type bjacobi -sd_ksp_rtol 1e-16 -sd_ksp_max_it 10000</parameters>
-            </petsc>
-        </linear_solver>
-    </linear_solvers>
-</OpenGeoSysProject>
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_1062_t_2.657500.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_1062_t_2.657500.vtu
deleted file mode 100644
index 95c3252aefc5392525e30219905fd1fa6d1ea8d5..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_1062_t_2.657500.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf76826a5c7e7d1ba2c82f8192f9d912763d6e31d5dcaf08e5aa5bfb7579c523
-size 3710
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_3543_t_3.543000.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_3543_t_3.543000.vtu
deleted file mode 100644
index a3f24de24527471e65f9accc3ce9020ccc5f92e4..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_3543_t_3.543000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db2d891f58438dec69fe84dd9fdf2f3d21aae86523e9e5293335c63543c323d1
-size 3028
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_3823_t_3.823000.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_3823_t_3.823000.vtu
deleted file mode 100644
index c191de6678195baff08ea7c1d9fd1fb43eb88bb6..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_3823_t_3.823000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0709c9789fb7305fb18cb9cc12e1a70146e4fbcc4d67abd05cfb3b3f53f7cbbf
-size 3720
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_5000_t_5.000000.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_5000_t_5.000000.vtu
deleted file mode 100644
index 485d28b459b1180a11fd3426ec4de3a33621d2c6..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialCompression/uc_01_pcs_0_ts_5000_t_5.000000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:573ebb7aabc0542289e580fb617903b3927f92c7a4265c623c67a5e426a6640c
-size 2992
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/cube_1x1x1.gml b/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/cube_1x1x1.gml
deleted file mode 100644
index d7c9b920ac153fd4444d7b959cde404cbe78582f..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/cube_1x1x1.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0db3fefd2e8e5f07be9410fc6db8df089673955c969d25ebfdd36e3c5f94cac8
-size 1617
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/cube_1x1x1_hex_1e0.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/cube_1x1x1_hex_1e0.vtu
deleted file mode 100644
index 7e182287a44b78741a25cbcfabc2e0109d918d54..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/cube_1x1x1_hex_1e0.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:baa51eea253d1fe35591bc41b3723e19f1102bb6812ecef5d6aaa5766a53cdc7
-size 1437
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/data.prj b/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/data.prj
deleted file mode 100755
index f6f7eee3c653ba374f098ad08c50d8b5fdcf45f1..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/data.prj
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<OpenGeoSysProject>
-    <mesh>cube_1x1x1_hex_1e0.vtu</mesh>
-    <geometry>cube_1x1x1.gml</geometry>
-    <processes>
-        <process>
-            <name>SD</name>
-            <type>SMALL_DEFORMATION</type>
-            <integration_order>2</integration_order>
-            <constitutive_relation>
-                <type>Ehlers</type>
-                <shear_modulus>G</shear_modulus>
-                <bulk_modulus>K</bulk_modulus>
-                <kappa>kappa</kappa>
-                <beta>beta</beta>
-                <gamma>gamma</gamma>
-                <hardening_modulus>hard</hardening_modulus>
-                <alpha>alpha</alpha>
-                <delta>delta</delta>
-                <eps>epsilon</eps>
-                <m>m</m>
-                <alphap>alphap</alphap>
-                <deltap>deltap</deltap>
-                <epsp>epsilonp</epsp>
-                <mp>mp</mp>
-                <betap>betap</betap>
-                <gammap>gammap</gammap>
-                <damage_properties>
-                    <alpha_d>alphad</alpha_d>
-                    <beta_d>betad</beta_d>
-                    <h_d>hd</h_d>
-                </damage_properties>
-                <nonlinear_solver>
-                    <maximum_iterations>100</maximum_iterations>
-                    <error_tolerance>1e-14</error_tolerance>
-                </nonlinear_solver>
-            </constitutive_relation>
-            <solid_density>rho_sr</solid_density>
-            <specific_body_force>0 0 0</specific_body_force>
-            <process_variables>
-                <process_variable>displacement</process_variable>
-            </process_variables>
-            <secondary_variables>
-                <secondary_variable type="static" internal_name="sigma" output_name="sigma"/>
-                <secondary_variable type="static" internal_name="epsilon" output_name="epsilon"/>
-
-                <secondary_variable type="static" internal_name="damage.value" output_name="damage_value"/>
-                <secondary_variable type="static" internal_name="damage.kappa_d" output_name="damage_kappa_d"/>
-                <secondary_variable type="static" internal_name="eps_p.D" output_name="eps_p_D"/>
-                <secondary_variable type="static" internal_name="eps_p.V" output_name="eps_p_V"/>
-                <secondary_variable type="static" internal_name="eps_p.eff" output_name="eps_p_eff"/>
-            </secondary_variables>
-        </process>
-    </processes>
-    <time_loop>
-        <processes>
-            <process ref="SD">
-                <nonlinear_solver>basic_newton</nonlinear_solver>
-                <convergence_criterion>
-                    <type>DeltaX</type>
-                    <norm_type>NORM2</norm_type>
-                    <abstol>1e-16</abstol>
-                </convergence_criterion>
-                <time_discretization>
-                    <type>BackwardEuler</type>
-                </time_discretization>
-                <output>
-                    <variables>
-                        <variable>displacement</variable>
-
-                        <variable>sigma</variable>
-                        <variable>epsilon</variable>
-
-                        <variable>damage_value</variable>
-                        <variable>damage_kappa_d</variable>
-                        <variable>eps_p_D</variable>
-                        <variable>eps_p_V</variable>
-                        <variable>eps_p_eff</variable>
-                    </variables>
-                </output>
-                <time_stepping>
-                    <type>FixedTimeStepping</type>
-                    <t_initial>0</t_initial>
-                    <t_end>5.</t_end>
-                    <timesteps>
-                        <pair>
-                            <repeat>1</repeat>
-                            <delta_t>0.001</delta_t>
-                        </pair>
-                        <pair>
-                            <repeat>1000</repeat>
-                            <delta_t>0.001</delta_t>
-                        </pair>
-                    </timesteps>
-                </time_stepping>
-            </process>
-        </processes>
-        <output>
-            <type>VTK</type>
-            <prefix>uc_01</prefix>
-            <timesteps>
-                <pair>
-                    <repeat>1</repeat>
-                    <each_steps>3276</each_steps>
-                </pair>
-                <pair>
-                    <repeat>1</repeat>
-                    <each_steps>10000</each_steps>
-                </pair>
-            </timesteps>
-        </output>
-    </time_loop>
-    <parameters>
-        <parameter>
-            <name>G</name>
-            <type>Constant</type>
-            <value>5000.</value>
-        </parameter>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>8000.</value>
-        </parameter>
-        <parameter>
-            <name>kappa</name>
-            <type>Constant</type>
-            <value>5.1</value>
-        </parameter>
-        <parameter>
-            <name>beta</name>
-            <type>Constant</type>
-            <value>0.167</value>
-        </parameter>
-        <parameter>
-            <name>gamma</name>
-            <type>Constant</type>
-            <value>1.</value>
-        </parameter>
-        <parameter>
-            <name>hard</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>alpha</name>
-            <type>Constant</type>
-            <value>0.1</value>
-        </parameter>
-        <parameter>
-            <name>delta</name>
-            <type>Constant</type>
-            <value>0.0</value>
-        </parameter>
-        <parameter>
-            <name>epsilon</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>m</name>
-            <type>Constant</type>
-            <value>0.54</value>
-        </parameter>
-        <parameter>
-            <name>alphap</name>
-            <type>Constant</type>
-            <value>0.1</value>
-        </parameter>
-        <parameter>
-            <name>deltap</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>epsilonp</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>mp</name>
-            <type>Constant</type>
-            <value>0.54</value>
-        </parameter>
-        <parameter>
-            <name>betap</name>
-            <type>Constant</type>
-            <value>0.167</value>
-        </parameter>
-        <parameter>
-            <name>gammap</name>
-            <type>Constant</type>
-            <value>1.</value>
-        </parameter>
-        <parameter>
-            <name>alphad</name>
-            <type>Constant</type>
-            <value>0.00001</value>
-        </parameter>
-        <parameter>
-            <name>betad</name>
-            <type>Constant</type>
-            <value>0.05</value>
-        </parameter>
-        <parameter>
-            <name>hd</name>
-            <type>Constant</type>
-            <value>15.0</value>
-        </parameter>
-        <parameter>
-            <name>rho_sr</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>displacement0</name>
-            <type>Constant</type>
-            <values>0 0 0</values>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_left</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_bottom</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_front</name>
-            <type>Constant</type>
-            <value>0.</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_top_spatial</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>Neumann_spatial</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>Dirichlet_top</name>
-            <type>CurveScaled</type>
-            <curve>Dirichlet_top_temporal</curve>
-            <parameter>Dirichlet_top_spatial</parameter>
-        </parameter>
-        <parameter>
-            <name>Neumann_force_right</name>
-            <type>CurveScaled</type>
-            <curve>Neumann_temporal_right</curve>
-            <parameter>Neumann_spatial</parameter>
-        </parameter>
-        <parameter>
-            <name>Neumann_force_top</name>
-            <type>CurveScaled</type>
-            <curve>Neumann_temporal_top</curve>
-            <parameter>Neumann_spatial</parameter>
-        </parameter>
-    </parameters>
-    <curves>
-        <curve>
-            <name>Dirichlet_top_temporal</name>
-            <coords>0. 4. 4.1 4.8 4.9 5.</coords>
-            <values>0. 0.0006 0.00015 0.00065 0.0002 0.00066</values>
-        </curve>
-        <curve>
-            <name>Neumann_temporal_right</name>
-            <coords>0. 5.</coords>
-            <values>0. 0.</values>
-        </curve>
-        <curve>
-            <name>Neumann_temporal_top</name>
-            <coords>0. 5.</coords>
-            <values>0. 0.</values>
-        </curve>
-    </curves>
-    <process_variables>
-        <process_variable>
-            <name>displacement</name>
-            <components>3</components>
-            <order>1</order>
-            <initial_condition>displacement0</initial_condition>
-            <boundary_conditions>
-                <!-- fixed boundaries -->
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
-                    <type>Dirichlet</type>
-                    <component>0</component>
-                    <parameter>Dirichlet_left</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>front</geometry>
-                    <type>Dirichlet</type>
-                    <component>1</component>
-                    <parameter>Dirichlet_front</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>bottom</geometry>
-                    <type>Dirichlet</type>
-                    <component>2</component>
-                    <parameter>Dirichlet_bottom</parameter>
-                </boundary_condition>
-                <!-- force -->
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
-                    <type>Neumann</type>
-                    <component>0</component>
-                    <parameter>Neumann_force_right</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>back</geometry>
-                    <type>Dirichlet</type>
-                    <component>1</component>
-                    <parameter>Dirichlet_top</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>top</geometry>
-                    <type>Neumann</type>
-                    <component>2</component>
-                    <parameter>Neumann_force_top</parameter>
-                </boundary_condition>
-            </boundary_conditions>
-        </process_variable>
-    </process_variables>
-    <nonlinear_solvers>
-        <nonlinear_solver>
-            <name>basic_newton</name>
-            <type>Newton</type>
-            <max_iter>50</max_iter>
-            <linear_solver>general_linear_solver</linear_solver>
-        </nonlinear_solver>
-    </nonlinear_solvers>
-    <linear_solvers>
-        <linear_solver>
-            <name>general_linear_solver</name>
-            <lis>-i BiCGSTAB -p jacobi -tol 1e-16 -maxiter 10000</lis>
-            <eigen>
-                <solver_type>BiCGSTAB</solver_type>
-                <precon_type>DIAGONAL</precon_type>
-                <max_iteration_step>10000</max_iteration_step>
-                <error_tolerance>1e-16</error_tolerance>
-            </eigen>
-            <petsc>
-                <prefix>sd</prefix>
-                <parameters>-sd_ksp_type cg -sd_pc_type bjacobi -sd_ksp_rtol 1e-16 -sd_ksp_max_it 10000</parameters>
-            </petsc>
-        </linear_solver>
-    </linear_solvers>
-</OpenGeoSysProject>
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_3276_t_3.276000.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_3276_t_3.276000.vtu
deleted file mode 100644
index 90914afd00af23c3e4a81d56804b0d2fb64e918b..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_3276_t_3.276000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7678eeaf913ccd5a5b3c90cc776d9e59f08bef1d932f82c7fe8b5c594263cb0d
-size 3044
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_4100_t_4.100000.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_4100_t_4.100000.vtu
deleted file mode 100644
index 24323c7c8fa0373ecc967dafe64891126992e618..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_4100_t_4.100000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2b7508834a973601f21a4f96a3f41e3ee6072e3cc5e905445e1a824edd25b6b
-size 3746
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_4958_t_4.958000.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_4958_t_4.958000.vtu
deleted file mode 100644
index a887b00155b9d047656cda10d3d080658ceacfd6..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_4958_t_4.958000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63603fe063191d017feca2b72683afdc2f5f31fe59e3a1259c7cd26bdc029cc6
-size 3722
diff --git a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_5000_t_5.000000.vtu b/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_5000_t_5.000000.vtu
deleted file mode 100644
index 1d62730f4d26a677f844a05b62401983924d2132..0000000000000000000000000000000000000000
--- a/Tests/Data/Mechanics/EhlersDamage/UniaxialTension/uc_01_pcs_0_ts_5000_t_5.000000.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5df540d12a3b67f3aa417917a22d05007f82a793dd1ba1b97b31740f12757cf7
-size 2976