From 1c0614a8920bc625ca5f3eb37e06c3d2000c5f99 Mon Sep 17 00:00:00 2001
From: Thomas Helfer <thomas.helfer@cea.fr>
Date: Sat, 21 Dec 2024 15:03:37 +0100
Subject: [PATCH 1/3] Reduce file path associated with tests on bricks

---
 cmake/modules/tfel.cmake                      |   2 +-
 mfront-query/tests/CMakeLists.txt             |   2 +-
 mfront/tests/behaviours/CMakeLists.txt        |   8 +-
 .../{bricks => }/DDIF2/CMakeLists.txt         |   0
 .../{bricks => }/DDIF2/DDIF2.mfront           |   0
 .../{bricks => }/DDIF2/DDIF2_2.mfront         |   0
 .../{bricks => }/DDIF2/DDIF2_3.mfront         |   0
 .../{bricks => }/DDIF2/DDIF2_4.mfront         |   0
 .../{bricks => }/DDIF2/DDIF2_5.mfront         |   0
 .../{bricks => }/DDIF2/DDIF2_6.mfront         |   0
 .../{bricks => }/DDIF2/castem/CMakeLists.txt  |   0
 .../{bricks => }/DDIF2/castem/ddif2.mtest     |   0
 .../{bricks => }/DDIF2/castem/ddif2_2.mtest   |   0
 .../{bricks => }/DDIF2/castem/ddif2_3.mtest   |   0
 .../{bricks => }/DDIF2/castem/ddif2_4.mtest   |   0
 .../{bricks => }/DDIF2/castem/ddif2_5.mtest   |   0
 .../{bricks => }/DDIF2/castem/ddif2_6.mtest   |   0
 .../FiniteStrainSingleCrystal/CMakeLists.txt  |   0
 .../FiniteStrainSingleCrystal.mfront          |   0
 ...rainSingleCrystal_NumericalJacobian.mfront |   0
 .../aster/CMakeLists.txt                      |   0
 .../aster/finitestrainsinglecrystal-012.mtest |   0
 .../aster/finitestrainsinglecrystal-159.mtest |   0
 .../castem/CMakeLists.txt                     |   0
 .../StandardElasticity/CMakeLists.txt         |   0
 .../IsotropicJ2Plasticity.mfront              |   0
 .../IsotropicStandardElasticity.mfront        |   0
 .../IsotropicStandardElasticity10.mfront      |   0
 .../IsotropicStandardElasticity11.mfront      |   0
 .../IsotropicStandardElasticity12.mfront      |   0
 .../IsotropicStandardElasticity13.mfront      |   0
 .../IsotropicStandardElasticity2.mfront       |   0
 .../IsotropicStandardElasticity3.mfront       |   0
 .../IsotropicStandardElasticity4.mfront       |   0
 .../IsotropicStandardElasticity5.mfront       |   0
 .../IsotropicStandardElasticity6.mfront       |   0
 .../IsotropicStandardElasticity7.mfront       |   0
 .../IsotropicStandardElasticity8.mfront       |   0
 .../IsotropicStandardElasticity9.mfront       |   0
 .../OrthotropicStandardElasticity.mfront      |   0
 .../OrthotropicStandardElasticity2.mfront     |   0
 .../OrthotropicStandardElasticity3.mfront     |   0
 .../SingleCrystal_DD_FCC.mfront               |   0
 .../TestComputeElasticPrediction.mfront       |   0
 .../TestComputeElasticPrediction2.mfront      |   0
 .../StandardElasticity/aster/CMakeLists.txt   |   4 +-
 .../aster/singlecrystal_dd_cfc.mtest          |   0
 .../StandardElasticity/castem/CMakeLists.txt  |   0
 .../castem/isotropicj2plasticity.mtest        |   0
 .../castem/isotropicstandardelasticity.mtest  |   0
 .../castem/isotropicstandardelasticity2.mtest |   0
 .../castem/isotropicstandardelasticity3.mtest |   0
 .../castem/isotropicstandardelasticity4.mtest |   0
 .../castem/isotropicstandardelasticity5.mtest |   0
 .../castem/isotropicstandardelasticity6.mtest |   0
 .../castem/isotropicstandardelasticity7.mtest |   0
 .../orthotropicstandardelasticity.mtest       |   0
 .../castem/testcomputeelasticprediction.mtest |   0
 .../testcomputeelasticprediction2.mtest       |   0
 .../testcomputeelasticprediction3.mtest       |   0
 .../testcomputeelasticprediction4.mtest       |   0
 .../StandardElasticity/cyrano/CMakeLists.txt  |   0
 .../cyrano/isotropicstandardelasticity.mtest  |   0
 .../cyrano/testcomputeelasticprediction.mtest |   0
 .../testcomputeelasticprediction2.mtest       |   0
 .../testcomputeelasticprediction3.mtest       |   0
 .../testcomputeelasticprediction4.mtest       |   0
 .../CMakeLists.txt                            | 210 ++++++++
 ...n1980StrainBasedNucleationModelTest.mfront |   0
 ...n1980StressBasedNucleationModelTest.mfront |   0
 ...ElasticContributionToPorosityGrowth.mfront |   0
 .../GursonTvergaardNeedleman1982.mfront       |   0
 ...mOfNortonHoffViscoplasticFlowsTest.mfront} |   2 +-
 ...OfNortonHoffViscoplasticFlowsTest2.mfront} |   2 +-
 ...ortonHoffViscoplasticFlowsTest2_nj.mfront} |   2 +-
 ...NortonHoffViscoplasticFlowsTest_nj.mfront} |   2 +-
 .../HyperbolicSineTest.mfront}                |   2 +-
 .../HyperbolicSineTest2.mfront}               |   2 +-
 .../HyperbolicSineTest2_nj.mfront}            |   2 +-
 .../HyperbolicSineTest_nj.mfront}             |   2 +-
 .../IsotropicDamageHookeLaw.mfront}           |   2 +-
 .../IsotropicDamageHookeLaw2.mfront}          |   2 +-
 .../IsotropicDamageHookeLaw2_nj.mfront}       |   2 +-
 .../IsotropicDamageHookeLaw_nj.mfront}        |   2 +-
 .../NortonTest.mfront}                        |   2 +-
 .../NortonTest2.mfront}                       |   2 +-
 .../NortonTest2_nj.mfront}                    |   2 +-
 .../NortonTest3.mfront}                       |   2 +-
 .../NortonTest3_nj.mfront}                    |   2 +-
 .../NortonTest4.mfront}                       |   2 +-
 .../NortonTest4_nj.mfront}                    |   2 +-
 .../NortonTest5.mfront}                       |   2 +-
 .../NortonTest5_nj.mfront}                    |   2 +-
 .../NortonTest6.mfront}                       |   2 +-
 .../NortonTest6_nj.mfront}                    |   2 +-
 .../NortonTest7.mfront}                       |   2 +-
 .../NortonTest7_nj.mfront}                    |   2 +-
 .../NortonTest8.mfront}                       |   2 +-
 .../NortonTest8_nj.mfront}                    |   2 +-
 .../NortonTest9.mfront}                       |   2 +-
 .../NortonTest9_nj.mfront}                    |   2 +-
 .../NortonTest_nj.mfront}                     |   2 +-
 .../OrthotropicNortonTest.mfront}             |   2 +-
 .../OrthotropicNortonTest_na.mfront}          |   2 +-
 .../OrthotropicNortonTest_nanj.mfront}        |   2 +-
 .../OrthotropicNortonTest_nj.mfront}          |   2 +-
 .../PlasticityTest.mfront}                    |   2 +-
 .../PlasticityTest10.mfront}                  |   2 +-
 .../PlasticityTest10_na.mfront}               |   2 +-
 .../PlasticityTest10_nanj.mfront}             |   2 +-
 .../PlasticityTest10_nj.mfront}               |   2 +-
 .../PlasticityTest11.mfront}                  |   2 +-
 .../PlasticityTest11_na.mfront}               |   2 +-
 .../PlasticityTest11_nanj.mfront}             |   2 +-
 .../PlasticityTest11_nj.mfront}               |   2 +-
 .../PlasticityTest12.mfront}                  |   2 +-
 .../PlasticityTest12_na.mfront}               |   2 +-
 .../PlasticityTest12_nanj.mfront}             |   2 +-
 .../PlasticityTest12_nj.mfront}               |   2 +-
 .../PlasticityTest13.mfront}                  |   2 +-
 .../PlasticityTest13_na.mfront}               |   2 +-
 .../PlasticityTest13_nanj.mfront}             |   2 +-
 .../PlasticityTest13_nj.mfront}               |   2 +-
 .../PlasticityTest14.mfront}                  |   2 +-
 .../PlasticityTest14_na.mfront}               |   2 +-
 .../PlasticityTest14_nanj.mfront}             |   2 +-
 .../PlasticityTest14_nj.mfront}               |   2 +-
 .../PlasticityTest15.mfront}                  |   2 +-
 .../PlasticityTest15_na.mfront}               |   2 +-
 .../PlasticityTest15_nanj.mfront}             |   2 +-
 .../PlasticityTest15_nj.mfront}               |   2 +-
 .../PlasticityTest16.mfront}                  |   2 +-
 .../PlasticityTest16_nj.mfront}               |   2 +-
 .../PlasticityTest17.mfront}                  |   2 +-
 .../PlasticityTest17_nj.mfront}               |   2 +-
 .../PlasticityTest18.mfront}                  |   2 +-
 .../PlasticityTest18_nj.mfront}               |   2 +-
 .../PlasticityTest18_qt.mfront}               |   2 +-
 .../PlasticityTest18_qt_nj.mfront}            |   2 +-
 .../PlasticityTest19.mfront}                  |   2 +-
 .../PlasticityTest19_nj.mfront}               |   2 +-
 .../PlasticityTest19_qt.mfront}               |   2 +-
 .../PlasticityTest19_qt_nj.mfront}            |   2 +-
 .../PlasticityTest2.mfront}                   |   2 +-
 .../PlasticityTest20.mfront}                  |   2 +-
 .../PlasticityTest20_nj.mfront}               |   2 +-
 .../PlasticityTest20_qt.mfront}               |   2 +-
 .../PlasticityTest20_qt_nj.mfront}            |   2 +-
 .../PlasticityTest21.mfront}                  |   2 +-
 .../PlasticityTest21_nj.mfront}               |   2 +-
 .../PlasticityTest21_qt.mfront}               |   2 +-
 .../PlasticityTest21_qt_nj.mfront}            |   2 +-
 .../PlasticityTest22.mfront}                  |   2 +-
 .../PlasticityTest22_nj.mfront}               |   2 +-
 .../PlasticityTest22_qt.mfront}               |   2 +-
 .../PlasticityTest22_qt_nj.mfront}            |   2 +-
 .../PlasticityTest23.mfront}                  |   2 +-
 .../PlasticityTest23_nj.mfront}               |   2 +-
 .../PlasticityTest23_qt.mfront}               |   2 +-
 .../PlasticityTest23_qt_nj.mfront}            |   2 +-
 .../PlasticityTest24.mfront}                  |   2 +-
 .../PlasticityTest24_nj.mfront}               |   2 +-
 .../PlasticityTest24_qt.mfront}               |   2 +-
 .../PlasticityTest24_qt_nj.mfront}            |   2 +-
 .../PlasticityTest2_nj.mfront}                |   2 +-
 .../PlasticityTest3.mfront}                   |   2 +-
 .../PlasticityTest3_nj.mfront}                |   2 +-
 .../PlasticityTest4.mfront}                   |   2 +-
 .../PlasticityTest4_nj.mfront}                |   2 +-
 .../PlasticityTest5.mfront}                   |   2 +-
 .../PlasticityTest5_nj.mfront}                |   2 +-
 .../PlasticityTest6.mfront}                   |   2 +-
 .../PlasticityTest6_nj.mfront}                |   2 +-
 .../PlasticityTest7.mfront}                   |   2 +-
 .../PlasticityTest7_nj.mfront}                |   2 +-
 .../PlasticityTest8.mfront}                   |   2 +-
 .../PlasticityTest8_nj.mfront}                |   2 +-
 .../PlasticityTest9.mfront}                   |   2 +-
 .../PlasticityTest9_na.mfront}                |   2 +-
 .../PlasticityTest9_nanj.mfront}              |   2 +-
 .../PlasticityTest9_nj.mfront}                |   2 +-
 .../PlasticityTest_na.mfront}                 |   2 +-
 .../PlasticityTest_nanj.mfront}               |   2 +-
 .../PlasticityTest_nj.mfront}                 |   2 +-
 ...erLawStrainBasedNucleationModelTest.mfront |   0
 ...erLawStressBasedNucleationModelTest.mfront |   0
 .../RousselierTanguyBesson2002.mfront         |   0
 .../Test1.mfront}                             |   2 +-
 .../Test2.mfront}                             |   2 +-
 .../Test3.mfront}                             |   2 +-
 .../Test4.mfront}                             |   2 +-
 .../Test5.mfront}                             |   2 +-
 .../Test6.mfront}                             |   2 +-
 .../UserDefinedViscoplasticityTest.mfront     |   0
 .../UserDefinedViscoplasticityTest2.mfront    |   0
 .../UserDefinedViscoplasticityTest2_nj.mfront |   0
 .../UserDefinedViscoplasticityTest3.mfront    |   0
 .../UserDefinedViscoplasticityTest3_nj.mfront |   0
 .../UserDefinedViscoplasticityTest_nj.mfront  |   0
 .../castem/CMakeLists.txt                     | 509 +++++++++++++++++
 .../castem/hyperbolicsinetest.mtest}          |   0
 .../castem/hyperbolicsinetest2.mtest}         |   0
 .../castem/isotropicdamagehookelaw.mtest}     |   0
 .../castem/isotropicdamagehookelaw2.mtest}    |   0
 .../castem/nortontest.mtest}                  |   0
 .../castem/nortontest2.mtest}                 |   0
 .../castem/nortontest3.mtest}                 |   0
 .../castem/nortontest4.mtest}                 |   0
 .../castem/nortontest5.mtest}                 |   0
 .../castem/nortontest6-1.mtest}               |   0
 .../castem/nortontest6-2.mtest}               |   0
 .../castem/nortontest7.mtest}                 |   0
 .../castem/nortontest8-cyclic_E.mtest}        |   0
 .../castem/nortontest8-cyclic_S.mtest}        |   0
 .../castem/nortontest8_E.mtest}               |   0
 .../castem/nortontest8_S.mtest}               |   0
 .../castem/nortontest9-cyclic_E.mtest}        |   0
 .../castem/nortontest9-cyclic_S.mtest}        |   0
 .../castem/nortontest9_E.mtest}               |   0
 .../castem/nortontest9_S.mtest}               |   0
 .../castem/orthotropicnortontest.mtest}       |   0
 .../castem/plasticitytest.mtest}              |   0
 .../castem/plasticitytest11-cyclic_E.mtest}   |   0
 .../castem/plasticitytest11-cyclic_S.mtest}   |   0
 .../castem/plasticitytest11_E.mtest}          |   0
 .../castem/plasticitytest11_S.mtest}          |   0
 .../castem/plasticitytest12.mtest}            |   0
 .../castem/plasticitytest13.mtest}            |   0
 .../castem/plasticitytest14.mtest}            |   0
 .../castem/plasticitytest16.mtest}            |   0
 .../castem/plasticitytest17.mtest}            |   0
 .../castem/plasticitytest2.mtest}             |   0
 .../castem/plasticitytest2_nj.mtest}          |   0
 .../castem/plasticitytest3.mtest}             |   0
 .../castem/plasticitytest3_nj.mtest}          |   0
 .../castem/plasticitytest4.mtest}             |   0
 .../castem/plasticitytest5.mtest}             |   0
 .../castem/plasticitytest5_nj.mtest}          |   0
 .../castem/plasticitytest6.mtest}             |   0
 .../castem/plasticitytest7-cyclic_E.mtest}    |   0
 .../castem/plasticitytest7-cyclic_S.mtest}    |   0
 .../castem/plasticitytest7_E.mtest}           |   0
 .../castem/plasticitytest7_S.mtest}           |   0
 .../castem/plasticitytest8.mtest}             |   0
 .../castem/plasticitytest8_nj.mtest}          |   0
 .../castem/plasticitytest_nj.mtest}           |   0
 .../generic/CMakeLists.txt                    | 266 ++++-----
 .../DataIsotropicHardeningRuleTest.mtest      |   0
 .../GursonTvergaardNeedleman1982-test1.mtest  |   0
 .../GursonTvergaardNeedleman1982-test2.mtest  |   0
 .../RateSensitivityFactorTest-0.05.mtest      |   0
 .../RateSensitivityFactorTest-0.5.mtest       |   0
 .../generic/RateSensitivityFactorTest-5.mtest |   0
 .../RateSensitivityFactorTest-50.mtest        |   0
 .../RateSensitivityFactorTest-500.mtest       |   0
 .../RateSensitivityFactorTest-5000.mtest      |   0
 ...SymondsRateSensitivityFactorTest-0.005.ref |   0
 ...rSymondsRateSensitivityFactorTest-0.05.ref |   0
 ...erSymondsRateSensitivityFactorTest-0.5.ref |   0
 ...wperSymondsRateSensitivityFactorTest-5.ref |   0
 ...perSymondsRateSensitivityFactorTest-50.ref |   0
 ...erSymondsRateSensitivityFactorTest-500.ref |   0
 ...rSymondsRateSensitivityFactorTest-5000.ref |   0
 .../DataIsotropicHardeningRuleTest-18.ref     |   0
 .../DataIsotropicHardeningRuleTest-19.ref     |   0
 .../DataIsotropicHardeningRuleTest-20.ref     |   0
 .../DataIsotropicHardeningRuleTest-21.ref     |   0
 .../GursonTvergaardNeedleman1982-test1.ref    |   0
 .../GursonTvergaardNeedleman1982-test2.ref    |   0
 ...sonCookRateSensitivityFactorTest-0.005.ref |   0
 ...nsonCookRateSensitivityFactorTest-0.05.ref |   0
 ...hnsonCookRateSensitivityFactorTest-0.5.ref |   0
 ...JohnsonCookRateSensitivityFactorTest-5.ref |   0
 ...ohnsonCookRateSensitivityFactorTest-50.ref |   0
 ...hnsonCookRateSensitivityFactorTest-500.ref |   0
 ...nsonCookRateSensitivityFactorTest-5000.ref |   0
 ...andardelastoviscoplasticitynortontest7.ref |   0
 ...stoviscoplasticitynortontest8-cyclic_E.ref |   0
 ...stoviscoplasticitynortontest8-cyclic_S.ref |   0
 ...dardelastoviscoplasticitynortontest8_E.ref |   0
 ...dardelastoviscoplasticitynortontest8_S.ref |   0
 ...stoviscoplasticitynortontest9-cyclic_E.ref |   0
 ...stoviscoplasticitynortontest9-cyclic_S.ref |   0
 ...dardelastoviscoplasticitynortontest9_E.ref |   0
 ...dardelastoviscoplasticitynortontest9_S.ref |   0
 ...scoplasticityplasticitytest11-cyclic_E.ref |   0
 ...scoplasticityplasticitytest11-cyclic_S.ref |   0
 ...lastoviscoplasticityplasticitytest11_E.ref |   0
 ...lastoviscoplasticityplasticitytest11_S.ref |   0
 ...delastoviscoplasticityplasticitytest16.ref |   0
 ...delastoviscoplasticityplasticitytest17.ref |   0
 ...rdelastoviscoplasticityplasticitytest4.ref |   0
 ...rdelastoviscoplasticityplasticitytest6.ref |   0
 ...iscoplasticityplasticitytest7-cyclic_E.ref |   0
 ...iscoplasticityplasticitytest7-cyclic_S.ref |   0
 ...elastoviscoplasticityplasticitytest7_E.ref |   0
 ...elastoviscoplasticityplasticitytest7_S.ref |   0
 ...rdelastoviscoplasticityplasticitytest8.ref |   0
 ...lastoviscoplasticityplasticitytest8_nj.ref |   0
 mfront/tests/behaviours/bricks/CMakeLists.txt |   4 -
 .../CMakeLists.txt                            | 210 --------
 .../castem/CMakeLists.txt                     | 510 ------------------
 302 files changed, 981 insertions(+), 980 deletions(-)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/CMakeLists.txt (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/DDIF2.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/DDIF2_2.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/DDIF2_3.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/DDIF2_4.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/DDIF2_5.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/DDIF2_6.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/castem/CMakeLists.txt (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/castem/ddif2.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/castem/ddif2_2.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/castem/ddif2_3.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/castem/ddif2_4.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/castem/ddif2_5.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/DDIF2/castem/ddif2_6.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/FiniteStrainSingleCrystal/CMakeLists.txt (100%)
 rename mfront/tests/behaviours/{bricks => }/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal_NumericalJacobian.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/FiniteStrainSingleCrystal/aster/CMakeLists.txt (100%)
 rename mfront/tests/behaviours/{bricks => }/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-012.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-159.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/FiniteStrainSingleCrystal/castem/CMakeLists.txt (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/CMakeLists.txt (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicJ2Plasticity.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity10.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity11.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity12.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity13.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity2.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity3.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity4.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity5.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity6.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity7.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity8.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/IsotropicStandardElasticity9.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/OrthotropicStandardElasticity.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/OrthotropicStandardElasticity2.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/OrthotropicStandardElasticity3.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/SingleCrystal_DD_FCC.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/TestComputeElasticPrediction.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/TestComputeElasticPrediction2.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/aster/CMakeLists.txt (94%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/aster/singlecrystal_dd_cfc.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/CMakeLists.txt (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/isotropicj2plasticity.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/isotropicstandardelasticity.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/isotropicstandardelasticity2.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/isotropicstandardelasticity3.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/isotropicstandardelasticity4.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/isotropicstandardelasticity5.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/isotropicstandardelasticity6.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/isotropicstandardelasticity7.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/orthotropicstandardelasticity.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/testcomputeelasticprediction.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/testcomputeelasticprediction2.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/testcomputeelasticprediction3.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/castem/testcomputeelasticprediction4.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/cyrano/CMakeLists.txt (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/cyrano/isotropicstandardelasticity.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/cyrano/testcomputeelasticprediction.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/cyrano/testcomputeelasticprediction2.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/cyrano/testcomputeelasticprediction3.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElasticity/cyrano/testcomputeelasticprediction4.mtest (100%)
 create mode 100644 mfront/tests/behaviours/StandardElastoViscoPlasticity/CMakeLists.txt
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/ChuNeedleman1980StrainBasedNucleationModelTest.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/ChuNeedleman1980StressBasedNucleationModelTest.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/ElasticContributionToPorosityGrowth.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/GursonTvergaardNeedleman1982.mfront (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront => StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront} (80%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront => StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront} (81%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront => StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront} (83%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront => StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront} (82%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest.mfront => StandardElastoViscoPlasticity/HyperbolicSineTest.mfront} (83%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest2.mfront => StandardElastoViscoPlasticity/HyperbolicSineTest2.mfront} (84%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest2_nj.mfront => StandardElastoViscoPlasticity/HyperbolicSineTest2_nj.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest_nj.mfront => StandardElastoViscoPlasticity/HyperbolicSineTest_nj.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw.mfront => StandardElastoViscoPlasticity/IsotropicDamageHookeLaw.mfront} (83%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw2.mfront => StandardElastoViscoPlasticity/IsotropicDamageHookeLaw2.mfront} (85%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw2_nj.mfront => StandardElastoViscoPlasticity/IsotropicDamageHookeLaw2_nj.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw_nj.mfront => StandardElastoViscoPlasticity/IsotropicDamageHookeLaw_nj.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest.mfront => StandardElastoViscoPlasticity/NortonTest.mfront} (85%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest2.mfront => StandardElastoViscoPlasticity/NortonTest2.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest2_nj.mfront => StandardElastoViscoPlasticity/NortonTest2_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest3.mfront => StandardElastoViscoPlasticity/NortonTest3.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest3_nj.mfront => StandardElastoViscoPlasticity/NortonTest3_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest4.mfront => StandardElastoViscoPlasticity/NortonTest4.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest4_nj.mfront => StandardElastoViscoPlasticity/NortonTest4_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest5.mfront => StandardElastoViscoPlasticity/NortonTest5.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest5_nj.mfront => StandardElastoViscoPlasticity/NortonTest5_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest6.mfront => StandardElastoViscoPlasticity/NortonTest6.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest6_nj.mfront => StandardElastoViscoPlasticity/NortonTest6_nj.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest7.mfront => StandardElastoViscoPlasticity/NortonTest7.mfront} (93%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest7_nj.mfront => StandardElastoViscoPlasticity/NortonTest7_nj.mfront} (93%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest8.mfront => StandardElastoViscoPlasticity/NortonTest8.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest8_nj.mfront => StandardElastoViscoPlasticity/NortonTest8_nj.mfront} (91%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest9.mfront => StandardElastoViscoPlasticity/NortonTest9.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest9_nj.mfront => StandardElastoViscoPlasticity/NortonTest9_nj.mfront} (91%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest_nj.mfront => StandardElastoViscoPlasticity/NortonTest_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest.mfront => StandardElastoViscoPlasticity/OrthotropicNortonTest.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_na.mfront => StandardElastoViscoPlasticity/OrthotropicNortonTest_na.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_nanj.mfront => StandardElastoViscoPlasticity/OrthotropicNortonTest_nanj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_nj.mfront => StandardElastoViscoPlasticity/OrthotropicNortonTest_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest.mfront => StandardElastoViscoPlasticity/PlasticityTest.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10.mfront => StandardElastoViscoPlasticity/PlasticityTest10.mfront} (91%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_na.mfront => StandardElastoViscoPlasticity/PlasticityTest10_na.mfront} (93%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_nanj.mfront => StandardElastoViscoPlasticity/PlasticityTest10_nanj.mfront} (94%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest10_nj.mfront} (92%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11.mfront => StandardElastoViscoPlasticity/PlasticityTest11.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_na.mfront => StandardElastoViscoPlasticity/PlasticityTest11_na.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_nanj.mfront => StandardElastoViscoPlasticity/PlasticityTest11_nanj.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest11_nj.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12.mfront => StandardElastoViscoPlasticity/PlasticityTest12.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_na.mfront => StandardElastoViscoPlasticity/PlasticityTest12_na.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_nanj.mfront => StandardElastoViscoPlasticity/PlasticityTest12_nanj.mfront} (91%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest12_nj.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13.mfront => StandardElastoViscoPlasticity/PlasticityTest13.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_na.mfront => StandardElastoViscoPlasticity/PlasticityTest13_na.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_nanj.mfront => StandardElastoViscoPlasticity/PlasticityTest13_nanj.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest13_nj.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14.mfront => StandardElastoViscoPlasticity/PlasticityTest14.mfront} (91%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_na.mfront => StandardElastoViscoPlasticity/PlasticityTest14_na.mfront} (93%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_nanj.mfront => StandardElastoViscoPlasticity/PlasticityTest14_nanj.mfront} (93%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest14_nj.mfront} (92%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15.mfront => StandardElastoViscoPlasticity/PlasticityTest15.mfront} (91%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_na.mfront => StandardElastoViscoPlasticity/PlasticityTest15_na.mfront} (93%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_nanj.mfront => StandardElastoViscoPlasticity/PlasticityTest15_nanj.mfront} (93%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest15_nj.mfront} (92%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest16.mfront => StandardElastoViscoPlasticity/PlasticityTest16.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest16_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest16_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest17.mfront => StandardElastoViscoPlasticity/PlasticityTest17.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest17_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest17_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18.mfront => StandardElastoViscoPlasticity/PlasticityTest18.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest18_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_qt.mfront => StandardElastoViscoPlasticity/PlasticityTest18_qt.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_qt_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest18_qt_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19.mfront => StandardElastoViscoPlasticity/PlasticityTest19.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest19_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_qt.mfront => StandardElastoViscoPlasticity/PlasticityTest19_qt.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_qt_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest19_qt_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest2.mfront => StandardElastoViscoPlasticity/PlasticityTest2.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20.mfront => StandardElastoViscoPlasticity/PlasticityTest20.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest20_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_qt.mfront => StandardElastoViscoPlasticity/PlasticityTest20_qt.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_qt_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest20_qt_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21.mfront => StandardElastoViscoPlasticity/PlasticityTest21.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest21_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_qt.mfront => StandardElastoViscoPlasticity/PlasticityTest21_qt.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_qt_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest21_qt_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22.mfront => StandardElastoViscoPlasticity/PlasticityTest22.mfront} (96%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest22_nj.mfront} (96%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_qt.mfront => StandardElastoViscoPlasticity/PlasticityTest22_qt.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_qt_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest22_qt_nj.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23.mfront => StandardElastoViscoPlasticity/PlasticityTest23.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest23_nj.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_qt.mfront => StandardElastoViscoPlasticity/PlasticityTest23_qt.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_qt_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest23_qt_nj.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24.mfront => StandardElastoViscoPlasticity/PlasticityTest24.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest24_nj.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_qt.mfront => StandardElastoViscoPlasticity/PlasticityTest24_qt.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_qt_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest24_qt_nj.mfront} (95%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest2_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest2_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest3.mfront => StandardElastoViscoPlasticity/PlasticityTest3.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest3_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest3_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest4.mfront => StandardElastoViscoPlasticity/PlasticityTest4.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest4_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest4_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest5.mfront => StandardElastoViscoPlasticity/PlasticityTest5.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest5_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest5_nj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest6.mfront => StandardElastoViscoPlasticity/PlasticityTest6.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest6_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest6_nj.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest7.mfront => StandardElastoViscoPlasticity/PlasticityTest7.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest7_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest7_nj.mfront} (90%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest8.mfront => StandardElastoViscoPlasticity/PlasticityTest8.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest8_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest8_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9.mfront => StandardElastoViscoPlasticity/PlasticityTest9.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_na.mfront => StandardElastoViscoPlasticity/PlasticityTest9_na.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_nanj.mfront => StandardElastoViscoPlasticity/PlasticityTest9_nanj.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest9_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_na.mfront => StandardElastoViscoPlasticity/PlasticityTest_na.mfront} (86%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_nanj.mfront => StandardElastoViscoPlasticity/PlasticityTest_nanj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_nj.mfront => StandardElastoViscoPlasticity/PlasticityTest_nj.mfront} (88%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/PowerLawStrainBasedNucleationModelTest.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/PowerLawStressBasedNucleationModelTest.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/RousselierTanguyBesson2002.mfront (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest1.mfront => StandardElastoViscoPlasticity/Test1.mfront} (87%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest2.mfront => StandardElastoViscoPlasticity/Test2.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest3.mfront => StandardElastoViscoPlasticity/Test3.mfront} (89%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest4.mfront => StandardElastoViscoPlasticity/Test4.mfront} (92%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest5.mfront => StandardElastoViscoPlasticity/Test5.mfront} (93%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest6.mfront => StandardElastoViscoPlasticity/Test6.mfront} (93%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2_nj.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3_nj.mfront (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest_nj.mfront (100%)
 create mode 100644 mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/CMakeLists.txt
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityhyperbolicsinetest.mtest => StandardElastoViscoPlasticity/castem/hyperbolicsinetest.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityhyperbolicsinetest2.mtest => StandardElastoViscoPlasticity/castem/hyperbolicsinetest2.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityisotropicdamagehookelaw.mtest => StandardElastoViscoPlasticity/castem/isotropicdamagehookelaw.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityisotropicdamagehookelaw2.mtest => StandardElastoViscoPlasticity/castem/isotropicdamagehookelaw2.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest.mtest => StandardElastoViscoPlasticity/castem/nortontest.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest2.mtest => StandardElastoViscoPlasticity/castem/nortontest2.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest3.mtest => StandardElastoViscoPlasticity/castem/nortontest3.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest4.mtest => StandardElastoViscoPlasticity/castem/nortontest4.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest5.mtest => StandardElastoViscoPlasticity/castem/nortontest5.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest6-1.mtest => StandardElastoViscoPlasticity/castem/nortontest6-1.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest6-2.mtest => StandardElastoViscoPlasticity/castem/nortontest6-2.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest7.mtest => StandardElastoViscoPlasticity/castem/nortontest7.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8-cyclic_E.mtest => StandardElastoViscoPlasticity/castem/nortontest8-cyclic_E.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8-cyclic_S.mtest => StandardElastoViscoPlasticity/castem/nortontest8-cyclic_S.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8_E.mtest => StandardElastoViscoPlasticity/castem/nortontest8_E.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8_S.mtest => StandardElastoViscoPlasticity/castem/nortontest8_S.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9-cyclic_E.mtest => StandardElastoViscoPlasticity/castem/nortontest9-cyclic_E.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9-cyclic_S.mtest => StandardElastoViscoPlasticity/castem/nortontest9-cyclic_S.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9_E.mtest => StandardElastoViscoPlasticity/castem/nortontest9_E.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9_S.mtest => StandardElastoViscoPlasticity/castem/nortontest9_S.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityorthotropicnortontest.mtest => StandardElastoViscoPlasticity/castem/orthotropicnortontest.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest.mtest => StandardElastoViscoPlasticity/castem/plasticitytest.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11-cyclic_E.mtest => StandardElastoViscoPlasticity/castem/plasticitytest11-cyclic_E.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11-cyclic_S.mtest => StandardElastoViscoPlasticity/castem/plasticitytest11-cyclic_S.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11_E.mtest => StandardElastoViscoPlasticity/castem/plasticitytest11_E.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11_S.mtest => StandardElastoViscoPlasticity/castem/plasticitytest11_S.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest12.mtest => StandardElastoViscoPlasticity/castem/plasticitytest12.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest13.mtest => StandardElastoViscoPlasticity/castem/plasticitytest13.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest14.mtest => StandardElastoViscoPlasticity/castem/plasticitytest14.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest16.mtest => StandardElastoViscoPlasticity/castem/plasticitytest16.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest17.mtest => StandardElastoViscoPlasticity/castem/plasticitytest17.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest2.mtest => StandardElastoViscoPlasticity/castem/plasticitytest2.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest2_nj.mtest => StandardElastoViscoPlasticity/castem/plasticitytest2_nj.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest3.mtest => StandardElastoViscoPlasticity/castem/plasticitytest3.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest3_nj.mtest => StandardElastoViscoPlasticity/castem/plasticitytest3_nj.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest4.mtest => StandardElastoViscoPlasticity/castem/plasticitytest4.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest5.mtest => StandardElastoViscoPlasticity/castem/plasticitytest5.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest5_nj.mtest => StandardElastoViscoPlasticity/castem/plasticitytest5_nj.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest6.mtest => StandardElastoViscoPlasticity/castem/plasticitytest6.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7-cyclic_E.mtest => StandardElastoViscoPlasticity/castem/plasticitytest7-cyclic_E.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7-cyclic_S.mtest => StandardElastoViscoPlasticity/castem/plasticitytest7-cyclic_S.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7_E.mtest => StandardElastoViscoPlasticity/castem/plasticitytest7_E.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7_S.mtest => StandardElastoViscoPlasticity/castem/plasticitytest7_S.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest8.mtest => StandardElastoViscoPlasticity/castem/plasticitytest8.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest8_nj.mtest => StandardElastoViscoPlasticity/castem/plasticitytest8_nj.mtest} (100%)
 rename mfront/tests/behaviours/{bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest_nj.mtest => StandardElastoViscoPlasticity/castem/plasticitytest_nj.mtest} (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/CMakeLists.txt (53%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/DataIsotropicHardeningRuleTest.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test1.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test2.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.05.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.5.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-50.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-500.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5000.mtest (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.005.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.05.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.5.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-50.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-500.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5000.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-18.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-19.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-20.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-21.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test1.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test2.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.005.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.05.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.5.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-50.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-500.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5000.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest7.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_E.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_S.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_E.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_S.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_E.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_S.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_E.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_S.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_E.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_S.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_E.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_S.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest16.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest17.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest4.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest6.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_E.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_S.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_E.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_S.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8.ref (100%)
 rename mfront/tests/behaviours/{bricks => }/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8_nj.ref (100%)
 delete mode 100644 mfront/tests/behaviours/bricks/CMakeLists.txt
 delete mode 100644 mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/CMakeLists.txt
 delete mode 100644 mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/CMakeLists.txt

diff --git a/cmake/modules/tfel.cmake b/cmake/modules/tfel.cmake
index 72e7f4e71..443efc7e9 100644
--- a/cmake/modules/tfel.cmake
+++ b/cmake/modules/tfel.cmake
@@ -452,7 +452,7 @@ function(mfront_behaviour_check_library lib interface)
 endfunction(mfront_behaviour_check_library)
 
 function(mfront_behaviour_brick_check_library lib dir interface)
-  mfront_check_library_base(${lib} ${interface} "behaviours/bricks/${dir}" ON ${ARGN})
+  mfront_check_library_base(${lib} ${interface} "behaviours/${dir}" ON ${ARGN})
 endfunction(mfront_behaviour_brick_check_library)
 
 function(mfront_model_check_library lib interface)
diff --git a/mfront-query/tests/CMakeLists.txt b/mfront-query/tests/CMakeLists.txt
index 2393ef067..587f8a32b 100644
--- a/mfront-query/tests/CMakeLists.txt
+++ b/mfront-query/tests/CMakeLists.txt
@@ -52,7 +52,7 @@ endmacro(mfront_query_test)
 
 mfront_query_test("--material-properties" "Norton.mfront"
   "mfront-query-norton-material-properites.ref")
-mfront_query_test("--slip-systems-by-index" "bricks/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront"
+mfront_query_test("--slip-systems-by-index" "FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront"
   "mfront-query-finitestrainsinglecrystal.ref")
 # mfront_query_test("--state-variables" "Norton.mfront"
 #   "mfront-query-norton-material-properites.ref")
diff --git a/mfront/tests/behaviours/CMakeLists.txt b/mfront/tests/behaviours/CMakeLists.txt
index 34cc75540..b823bd015 100644
--- a/mfront/tests/behaviours/CMakeLists.txt
+++ b/mfront/tests/behaviours/CMakeLists.txt
@@ -1,5 +1,11 @@
 add_subdirectory(unit-tests)
-add_subdirectory(bricks)
+# bricks
+add_subdirectory(StandardElasticity)
+add_subdirectory(StandardElastoViscoPlasticity)
+add_subdirectory(FiniteStrainSingleCrystal)
+add_subdirectory(DDIF2)
+
+# tests related to specific interfaces or algorithms
 add_subdirectory(generic)
 if(HAVE_CASTEM)
   add_subdirectory(castem)
diff --git a/mfront/tests/behaviours/bricks/DDIF2/CMakeLists.txt b/mfront/tests/behaviours/DDIF2/CMakeLists.txt
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/CMakeLists.txt
rename to mfront/tests/behaviours/DDIF2/CMakeLists.txt
diff --git a/mfront/tests/behaviours/bricks/DDIF2/DDIF2.mfront b/mfront/tests/behaviours/DDIF2/DDIF2.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/DDIF2.mfront
rename to mfront/tests/behaviours/DDIF2/DDIF2.mfront
diff --git a/mfront/tests/behaviours/bricks/DDIF2/DDIF2_2.mfront b/mfront/tests/behaviours/DDIF2/DDIF2_2.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/DDIF2_2.mfront
rename to mfront/tests/behaviours/DDIF2/DDIF2_2.mfront
diff --git a/mfront/tests/behaviours/bricks/DDIF2/DDIF2_3.mfront b/mfront/tests/behaviours/DDIF2/DDIF2_3.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/DDIF2_3.mfront
rename to mfront/tests/behaviours/DDIF2/DDIF2_3.mfront
diff --git a/mfront/tests/behaviours/bricks/DDIF2/DDIF2_4.mfront b/mfront/tests/behaviours/DDIF2/DDIF2_4.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/DDIF2_4.mfront
rename to mfront/tests/behaviours/DDIF2/DDIF2_4.mfront
diff --git a/mfront/tests/behaviours/bricks/DDIF2/DDIF2_5.mfront b/mfront/tests/behaviours/DDIF2/DDIF2_5.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/DDIF2_5.mfront
rename to mfront/tests/behaviours/DDIF2/DDIF2_5.mfront
diff --git a/mfront/tests/behaviours/bricks/DDIF2/DDIF2_6.mfront b/mfront/tests/behaviours/DDIF2/DDIF2_6.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/DDIF2_6.mfront
rename to mfront/tests/behaviours/DDIF2/DDIF2_6.mfront
diff --git a/mfront/tests/behaviours/bricks/DDIF2/castem/CMakeLists.txt b/mfront/tests/behaviours/DDIF2/castem/CMakeLists.txt
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/castem/CMakeLists.txt
rename to mfront/tests/behaviours/DDIF2/castem/CMakeLists.txt
diff --git a/mfront/tests/behaviours/bricks/DDIF2/castem/ddif2.mtest b/mfront/tests/behaviours/DDIF2/castem/ddif2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/castem/ddif2.mtest
rename to mfront/tests/behaviours/DDIF2/castem/ddif2.mtest
diff --git a/mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_2.mtest b/mfront/tests/behaviours/DDIF2/castem/ddif2_2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_2.mtest
rename to mfront/tests/behaviours/DDIF2/castem/ddif2_2.mtest
diff --git a/mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_3.mtest b/mfront/tests/behaviours/DDIF2/castem/ddif2_3.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_3.mtest
rename to mfront/tests/behaviours/DDIF2/castem/ddif2_3.mtest
diff --git a/mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_4.mtest b/mfront/tests/behaviours/DDIF2/castem/ddif2_4.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_4.mtest
rename to mfront/tests/behaviours/DDIF2/castem/ddif2_4.mtest
diff --git a/mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_5.mtest b/mfront/tests/behaviours/DDIF2/castem/ddif2_5.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_5.mtest
rename to mfront/tests/behaviours/DDIF2/castem/ddif2_5.mtest
diff --git a/mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_6.mtest b/mfront/tests/behaviours/DDIF2/castem/ddif2_6.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/DDIF2/castem/ddif2_6.mtest
rename to mfront/tests/behaviours/DDIF2/castem/ddif2_6.mtest
diff --git a/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/CMakeLists.txt b/mfront/tests/behaviours/FiniteStrainSingleCrystal/CMakeLists.txt
similarity index 100%
rename from mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/CMakeLists.txt
rename to mfront/tests/behaviours/FiniteStrainSingleCrystal/CMakeLists.txt
diff --git a/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront b/mfront/tests/behaviours/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront
rename to mfront/tests/behaviours/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal.mfront
diff --git a/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal_NumericalJacobian.mfront b/mfront/tests/behaviours/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal_NumericalJacobian.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal_NumericalJacobian.mfront
rename to mfront/tests/behaviours/FiniteStrainSingleCrystal/FiniteStrainSingleCrystal_NumericalJacobian.mfront
diff --git a/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/CMakeLists.txt b/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/CMakeLists.txt
similarity index 100%
rename from mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/CMakeLists.txt
rename to mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/CMakeLists.txt
diff --git a/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-012.mtest b/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-012.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-012.mtest
rename to mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-012.mtest
diff --git a/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-159.mtest b/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-159.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-159.mtest
rename to mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/finitestrainsinglecrystal-159.mtest
diff --git a/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/castem/CMakeLists.txt b/mfront/tests/behaviours/FiniteStrainSingleCrystal/castem/CMakeLists.txt
similarity index 100%
rename from mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/castem/CMakeLists.txt
rename to mfront/tests/behaviours/FiniteStrainSingleCrystal/castem/CMakeLists.txt
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/CMakeLists.txt b/mfront/tests/behaviours/StandardElasticity/CMakeLists.txt
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/CMakeLists.txt
rename to mfront/tests/behaviours/StandardElasticity/CMakeLists.txt
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicJ2Plasticity.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicJ2Plasticity.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicJ2Plasticity.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicJ2Plasticity.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity10.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity10.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity10.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity10.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity11.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity11.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity11.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity11.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity12.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity12.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity12.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity12.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity13.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity13.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity13.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity13.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity2.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity2.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity2.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity2.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity3.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity3.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity3.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity3.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity4.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity4.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity4.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity4.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity5.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity5.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity5.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity5.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity6.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity6.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity6.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity6.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity7.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity7.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity7.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity7.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity8.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity8.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity8.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity8.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity9.mfront b/mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity9.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/IsotropicStandardElasticity9.mfront
rename to mfront/tests/behaviours/StandardElasticity/IsotropicStandardElasticity9.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/OrthotropicStandardElasticity.mfront b/mfront/tests/behaviours/StandardElasticity/OrthotropicStandardElasticity.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/OrthotropicStandardElasticity.mfront
rename to mfront/tests/behaviours/StandardElasticity/OrthotropicStandardElasticity.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/OrthotropicStandardElasticity2.mfront b/mfront/tests/behaviours/StandardElasticity/OrthotropicStandardElasticity2.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/OrthotropicStandardElasticity2.mfront
rename to mfront/tests/behaviours/StandardElasticity/OrthotropicStandardElasticity2.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/OrthotropicStandardElasticity3.mfront b/mfront/tests/behaviours/StandardElasticity/OrthotropicStandardElasticity3.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/OrthotropicStandardElasticity3.mfront
rename to mfront/tests/behaviours/StandardElasticity/OrthotropicStandardElasticity3.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/SingleCrystal_DD_FCC.mfront b/mfront/tests/behaviours/StandardElasticity/SingleCrystal_DD_FCC.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/SingleCrystal_DD_FCC.mfront
rename to mfront/tests/behaviours/StandardElasticity/SingleCrystal_DD_FCC.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/TestComputeElasticPrediction.mfront b/mfront/tests/behaviours/StandardElasticity/TestComputeElasticPrediction.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/TestComputeElasticPrediction.mfront
rename to mfront/tests/behaviours/StandardElasticity/TestComputeElasticPrediction.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/TestComputeElasticPrediction2.mfront b/mfront/tests/behaviours/StandardElasticity/TestComputeElasticPrediction2.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/TestComputeElasticPrediction2.mfront
rename to mfront/tests/behaviours/StandardElasticity/TestComputeElasticPrediction2.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/aster/CMakeLists.txt b/mfront/tests/behaviours/StandardElasticity/aster/CMakeLists.txt
similarity index 94%
rename from mfront/tests/behaviours/bricks/StandardElasticity/aster/CMakeLists.txt
rename to mfront/tests/behaviours/StandardElasticity/aster/CMakeLists.txt
index e68882874..09b34cf49 100644
--- a/mfront/tests/behaviours/bricks/StandardElasticity/aster/CMakeLists.txt
+++ b/mfront/tests/behaviours/StandardElasticity/aster/CMakeLists.txt
@@ -39,11 +39,11 @@ macro(astertest_standardelasticitybrick test_arg behaviour)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElasticity/aster"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/StandardElasticity/aster"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElasticity/aster"
+	DESTINATION "share/doc/mfront/tests/behaviours/StandardElasticity/aster"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_ASTER)
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/aster/singlecrystal_dd_cfc.mtest b/mfront/tests/behaviours/StandardElasticity/aster/singlecrystal_dd_cfc.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/aster/singlecrystal_dd_cfc.mtest
rename to mfront/tests/behaviours/StandardElasticity/aster/singlecrystal_dd_cfc.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/CMakeLists.txt b/mfront/tests/behaviours/StandardElasticity/castem/CMakeLists.txt
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/CMakeLists.txt
rename to mfront/tests/behaviours/StandardElasticity/castem/CMakeLists.txt
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicj2plasticity.mtest b/mfront/tests/behaviours/StandardElasticity/castem/isotropicj2plasticity.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicj2plasticity.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/isotropicj2plasticity.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity.mtest b/mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity2.mtest b/mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity2.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity3.mtest b/mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity3.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity3.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity3.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity4.mtest b/mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity4.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity4.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity4.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity5.mtest b/mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity5.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity5.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity5.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity6.mtest b/mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity6.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity6.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity6.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity7.mtest b/mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity7.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/isotropicstandardelasticity7.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/isotropicstandardelasticity7.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/orthotropicstandardelasticity.mtest b/mfront/tests/behaviours/StandardElasticity/castem/orthotropicstandardelasticity.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/orthotropicstandardelasticity.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/orthotropicstandardelasticity.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/testcomputeelasticprediction.mtest b/mfront/tests/behaviours/StandardElasticity/castem/testcomputeelasticprediction.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/testcomputeelasticprediction.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/testcomputeelasticprediction.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/testcomputeelasticprediction2.mtest b/mfront/tests/behaviours/StandardElasticity/castem/testcomputeelasticprediction2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/testcomputeelasticprediction2.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/testcomputeelasticprediction2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/testcomputeelasticprediction3.mtest b/mfront/tests/behaviours/StandardElasticity/castem/testcomputeelasticprediction3.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/testcomputeelasticprediction3.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/testcomputeelasticprediction3.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/castem/testcomputeelasticprediction4.mtest b/mfront/tests/behaviours/StandardElasticity/castem/testcomputeelasticprediction4.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/castem/testcomputeelasticprediction4.mtest
rename to mfront/tests/behaviours/StandardElasticity/castem/testcomputeelasticprediction4.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/cyrano/CMakeLists.txt b/mfront/tests/behaviours/StandardElasticity/cyrano/CMakeLists.txt
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/cyrano/CMakeLists.txt
rename to mfront/tests/behaviours/StandardElasticity/cyrano/CMakeLists.txt
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/cyrano/isotropicstandardelasticity.mtest b/mfront/tests/behaviours/StandardElasticity/cyrano/isotropicstandardelasticity.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/cyrano/isotropicstandardelasticity.mtest
rename to mfront/tests/behaviours/StandardElasticity/cyrano/isotropicstandardelasticity.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/cyrano/testcomputeelasticprediction.mtest b/mfront/tests/behaviours/StandardElasticity/cyrano/testcomputeelasticprediction.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/cyrano/testcomputeelasticprediction.mtest
rename to mfront/tests/behaviours/StandardElasticity/cyrano/testcomputeelasticprediction.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/cyrano/testcomputeelasticprediction2.mtest b/mfront/tests/behaviours/StandardElasticity/cyrano/testcomputeelasticprediction2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/cyrano/testcomputeelasticprediction2.mtest
rename to mfront/tests/behaviours/StandardElasticity/cyrano/testcomputeelasticprediction2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/cyrano/testcomputeelasticprediction3.mtest b/mfront/tests/behaviours/StandardElasticity/cyrano/testcomputeelasticprediction3.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/cyrano/testcomputeelasticprediction3.mtest
rename to mfront/tests/behaviours/StandardElasticity/cyrano/testcomputeelasticprediction3.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElasticity/cyrano/testcomputeelasticprediction4.mtest b/mfront/tests/behaviours/StandardElasticity/cyrano/testcomputeelasticprediction4.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElasticity/cyrano/testcomputeelasticprediction4.mtest
rename to mfront/tests/behaviours/StandardElasticity/cyrano/testcomputeelasticprediction4.mtest
diff --git a/mfront/tests/behaviours/StandardElastoViscoPlasticity/CMakeLists.txt b/mfront/tests/behaviours/StandardElastoViscoPlasticity/CMakeLists.txt
new file mode 100644
index 000000000..c9aae009d
--- /dev/null
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/CMakeLists.txt
@@ -0,0 +1,210 @@
+add_subdirectory(castem)
+add_subdirectory(generic)
+
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  Test1.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  Test2.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  Test3.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  Test4.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  Test5.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  Test6.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest2.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest2_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest3.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest3_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest4.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest4_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest5.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest5_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest6.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest6_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest7.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest7_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest8.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest8_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest9.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	NortonTest9_nj.mfront)
+
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	HyperbolicSineTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	HyperbolicSineTest_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	HyperbolicSineTest2.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	HyperbolicSineTest2_nj.mfront)
+
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	OrthotropicNortonTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	OrthotropicNortonTest_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	OrthotropicNortonTest_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	OrthotropicNortonTest_nanj.mfront)
+
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest_nanj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest2.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest2_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest3.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest3_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest4.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest4_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest5.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest5_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest6.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest6_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest7.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest7_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest8.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest8_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest9.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest9_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest9_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest9_nanj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest10.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest10_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest10_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest10_nanj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest11.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest11_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest11_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest11_nanj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest12.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest12_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest12_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest12_nanj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest13.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest13_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest13_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest13_nanj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest14.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest14_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest14_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest14_nanj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest15.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest15_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest15_na.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest15_nanj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest16.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest16_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest17.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PlasticityTest17_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront)
+
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	 IsotropicDamageHookeLaw.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	 IsotropicDamageHookeLaw_nj.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	 IsotropicDamageHookeLaw2.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+  IsotropicDamageHookeLaw2_nj.mfront)
+
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	ChuNeedleman1980StrainBasedNucleationModelTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	ChuNeedleman1980StressBasedNucleationModelTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PowerLawStrainBasedNucleationModelTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+	PowerLawStressBasedNucleationModelTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+        ElasticContributionToPorosityGrowth.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+        GursonTvergaardNeedleman1982.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+        RousselierTanguyBesson2002.mfront)
+
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+        UserDefinedViscoplasticityTest.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+        UserDefinedViscoplasticityTest2.mfront)
+install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+        UserDefinedViscoplasticityTest3.mfront)
+      
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/ChuNeedleman1980StrainBasedNucleationModelTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/ChuNeedleman1980StrainBasedNucleationModelTest.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/ChuNeedleman1980StrainBasedNucleationModelTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/ChuNeedleman1980StrainBasedNucleationModelTest.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/ChuNeedleman1980StressBasedNucleationModelTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/ChuNeedleman1980StressBasedNucleationModelTest.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/ChuNeedleman1980StressBasedNucleationModelTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/ChuNeedleman1980StressBasedNucleationModelTest.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/ElasticContributionToPorosityGrowth.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/ElasticContributionToPorosityGrowth.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/ElasticContributionToPorosityGrowth.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/ElasticContributionToPorosityGrowth.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/GursonTvergaardNeedleman1982.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/GursonTvergaardNeedleman1982.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/GursonTvergaardNeedleman1982.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/GursonTvergaardNeedleman1982.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront
similarity index 80%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront
index 8e16748b0..a7da46707 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest;
+@Behaviour HarmonicSumOfNortonHoffViscoplasticFlowsTest;
 @Author Thomas Helfer;
 @Date 02 / 11 / 2020;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront
similarity index 81%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront
index 1f136fee8..f423f3bc0 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2;
+@Behaviour HarmonicSumOfNortonHoffViscoplasticFlowsTest2;
 @Author Thomas Helfer;
 @Date 02 / 11 / 2020;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront
similarity index 83%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront
index 9b46abe3d..2f2e1962a 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj;
+@Behaviour HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj;
 @Author Thomas Helfer;
 @Date 02 / 11 / 2020;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront
similarity index 82%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront
index 3b49a9dcf..8f37bf5ab 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest_nj;
+@Behaviour HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj;
 @Author Thomas Helfer;
 @Date 02 / 11 / 2020;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest.mfront
similarity index 83%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest.mfront
index 53f9b20aa..6ace3aa19 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityHyperbolicSineTest;
+@Behaviour HyperbolicSineTest;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest2.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest2.mfront
similarity index 84%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest2.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest2.mfront
index c3984d32d..7173ebbfb 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest2.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest2.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityHyperbolicSineTest2;
+@Behaviour HyperbolicSineTest2;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest2_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest2_nj.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest2_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest2_nj.mfront
index 25ecc30af..87f9b6733 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest2_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest2_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityHyperbolicSineTest2_nj;
+@Behaviour HyperbolicSineTest2_nj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest_nj.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest_nj.mfront
index e5bdec7e4..59235b697 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityHyperbolicSineTest_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/HyperbolicSineTest_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityHyperbolicSineTest_nj;
+@Behaviour HyperbolicSineTest_nj;
 @Author Thomas Helfer;
 @Date 7/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw.mfront
similarity index 83%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw.mfront
index 894738216..cf8642d2c 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityIsotropicDamageHookeLaw;
+@Behaviour IsotropicDamageHookeLaw;
 @Author Thomas Helfer;
 @Date 2/05/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw2.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw2.mfront
similarity index 85%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw2.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw2.mfront
index 59d628200..99082981b 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw2.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw2.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityIsotropicDamageHookeLaw2;
+@Behaviour IsotropicDamageHookeLaw2;
 @Author Thomas Helfer;
 @Date 2/05/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw2_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw2_nj.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw2_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw2_nj.mfront
index 940c710db..2eb5899b5 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw2_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw2_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityIsotropicDamageHookeLaw2_nj;
+@Behaviour IsotropicDamageHookeLaw2_nj;
 @Author Thomas Helfer;
 @Date 2/05/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw_nj.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw_nj.mfront
index 71f069372..5d69aa0ab 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityIsotropicDamageHookeLaw_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/IsotropicDamageHookeLaw_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityIsotropicDamageHookeLaw_nj;
+@Behaviour IsotropicDamageHookeLaw_nj;
 @Author Thomas Helfer;
 @Date 2/05/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest.mfront
similarity index 85%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest.mfront
index a080d018f..6b3f072c2 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest;
+@Behaviour NortonTest;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest2.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest2.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest2.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest2.mfront
index 826561dc3..a427d5dab 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest2.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest2.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest2;
+@Behaviour NortonTest2;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest2_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest2_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest2_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest2_nj.mfront
index bd742f0c1..4f875c573 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest2_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest2_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest2_nj;
+@Behaviour NortonTest2_nj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest3.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest3.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest3.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest3.mfront
index 9df5f70b5..902e4c006 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest3.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest3.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest3;
+@Behaviour NortonTest3;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest3_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest3_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest3_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest3_nj.mfront
index 18fc39cfd..213ba70a8 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest3_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest3_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest3_nj;
+@Behaviour NortonTest3_nj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest4.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest4.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest4.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest4.mfront
index 4908d8807..e5aaa2046 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest4.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest4.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest4;
+@Behaviour NortonTest4;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest4_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest4_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest4_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest4_nj.mfront
index 61a21d930..59f0aed05 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest4_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest4_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest4_nj;
+@Behaviour NortonTest4_nj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest5.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest5.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest5.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest5.mfront
index 5f9f54b3a..99f8b484d 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest5.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest5.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest5;
+@Behaviour NortonTest5;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest5_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest5_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest5_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest5_nj.mfront
index 7da4771ac..0f0425856 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest5_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest5_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest5_nj;
+@Behaviour NortonTest5_nj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest6.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest6.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest6.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest6.mfront
index 0426f46f5..caf11ae83 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest6.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest6.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest6;
+@Behaviour NortonTest6;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest6_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest6_nj.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest6_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest6_nj.mfront
index 69fed8092..bb4bd9bfc 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest6_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest6_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest6_nj;
+@Behaviour NortonTest6_nj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest7.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest7.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest7.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest7.mfront
index fdf1d43fe..60d5883b6 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest7.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest7.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest7;
+@Behaviour NortonTest7;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest7_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest7_nj.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest7_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest7_nj.mfront
index f55f96ff0..b4c587683 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest7_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest7_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest7_nj;
+@Behaviour NortonTest7_nj;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest8.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest8.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest8.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest8.mfront
index 95dcfac7b..11736a6d9 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest8.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest8.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest8;
+@Behaviour NortonTest8;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest8_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest8_nj.mfront
similarity index 91%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest8_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest8_nj.mfront
index 9485f1016..91f9df7a5 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest8_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest8_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest8_nj;
+@Behaviour NortonTest8_nj;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest9.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest9.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest9.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest9.mfront
index bc7e097f0..d588b9384 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest9.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest9.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest9;
+@Behaviour NortonTest9;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest9_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest9_nj.mfront
similarity index 91%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest9_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest9_nj.mfront
index 97384b182..706326522 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest9_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest9_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest9_nj;
+@Behaviour NortonTest9_nj;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest_nj.mfront
index a48a56c04..469f0a7ff 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityNortonTest_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/NortonTest_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityNortonTest_nj;
+@Behaviour NortonTest_nj;
 @Author Thomas Helfer;
 @Date 7/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest.mfront
index a8080b82d..4a436b597 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityOrthotropicNortonTest;
+@Behaviour OrthotropicNortonTest;
 @Author Thomas Helfer;
 @Date 07/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_na.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_na.mfront
index 304630c2d..b43dc07db 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_na.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityOrthotropicNortonTest_na;
+@Behaviour OrthotropicNortonTest_na;
 @Author Thomas Helfer;
 @Date 07/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_nanj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_nanj.mfront
index 76009eb41..ac16d4a21 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityOrthotropicNortonTest_nanj;
+@Behaviour OrthotropicNortonTest_nanj;
 @Author Thomas Helfer;
 @Date 7/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_nj.mfront
index 1eaf87adb..d539e7454 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityOrthotropicNortonTest_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/OrthotropicNortonTest_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityOrthotropicNortonTest_nj;
+@Behaviour OrthotropicNortonTest_nj;
 @Author Thomas Helfer;
 @Date 7/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest.mfront
index 3a09765da..e06a0ab3c 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest;
+@Behaviour PlasticityTest;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10.mfront
similarity index 91%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10.mfront
index 139a423d9..503b3a5a1 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest10;
+@Behaviour PlasticityTest10;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_na.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_na.mfront
index be2fc9642..a4149e0a4 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_na.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest10_na;
+@Behaviour PlasticityTest10_na;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_nanj.mfront
similarity index 94%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_nanj.mfront
index ecfe99c2a..26da16629 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest10_nanj;
+@Behaviour PlasticityTest10_nanj;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_nj.mfront
similarity index 92%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_nj.mfront
index e35a705cc..a41fc5fda 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest10_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest10_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest10_nj;
+@Behaviour PlasticityTest10_nj;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11.mfront
index 065a4ed6b..96fc478a8 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest11;
+@Behaviour PlasticityTest11;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_na.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_na.mfront
index df8f080d6..40d266054 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_na.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest11_na;
+@Behaviour PlasticityTest11_na;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_nanj.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_nanj.mfront
index 2b63097fe..9124bb71d 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest11_nanj;
+@Behaviour PlasticityTest11_nanj;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_nj.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_nj.mfront
index aaf4fed88..e0a512e52 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest11_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest11_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest11_nj;
+@Behaviour PlasticityTest11_nj;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12.mfront
index 600dde038..e89f9aed6 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest12;
+@Behaviour PlasticityTest12;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_na.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_na.mfront
index 20d790815..bf749c1a5 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_na.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest12_na;
+@Behaviour PlasticityTest12_na;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_nanj.mfront
similarity index 91%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_nanj.mfront
index 845b02246..597c3dbce 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest12_nanj;
+@Behaviour PlasticityTest12_nanj;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_nj.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_nj.mfront
index f4c0b2096..af2e8b63e 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest12_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest12_nj.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest12_nj;
+@Behaviour PlasticityTest12_nj;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13.mfront
index af0503a12..3f98887bc 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest13;
+@Behaviour PlasticityTest13;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_na.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_na.mfront
index 7c45d5218..fa8d76b8b 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_na.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest13_na;
+@Behaviour PlasticityTest13_na;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_nanj.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_nanj.mfront
index c54a9eab9..f08ae6ef6 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest13_nanj;
+@Behaviour PlasticityTest13_nanj;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_nj.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_nj.mfront
index 6a80f34a4..b427194fa 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest13_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest13_nj.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest13_nj;
+@Behaviour PlasticityTest13_nj;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14.mfront
similarity index 91%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14.mfront
index c26297a70..03ea2452a 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest14;
+@Behaviour PlasticityTest14;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_na.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_na.mfront
index a5f2f8f32..2cb8787cb 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_na.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest14_na;
+@Behaviour PlasticityTest14_na;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_nanj.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_nanj.mfront
index 17f285330..9b0763426 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest14_nanj;
+@Behaviour PlasticityTest14_nanj;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_nj.mfront
similarity index 92%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_nj.mfront
index ccc65532b..b1b9e10ca 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest14_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest14_nj.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest14_nj;
+@Behaviour PlasticityTest14_nj;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15.mfront
similarity index 91%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15.mfront
index 0e0a8db91..9e9642aae 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest15;
+@Behaviour PlasticityTest15;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_na.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_na.mfront
index 8b24a9412..e47e3b841 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_na.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest15_na;
+@Behaviour PlasticityTest15_na;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_nanj.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_nanj.mfront
index 4529afe12..a440f0f4e 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest15_nanj;
+@Behaviour PlasticityTest15_nanj;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_nj.mfront
similarity index 92%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_nj.mfront
index 1d0225255..ffcb1f4ab 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest15_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest15_nj.mfront
@@ -1,5 +1,5 @@
 @DSL       Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest15_nj;
+@Behaviour PlasticityTest15_nj;
 @Author    Thomas Helfer;
 @Description{
   A simple implementation of a perfect
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest16.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest16.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest16.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest16.mfront
index fa430caac..308995aa7 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest16.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest16.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest16;
+@Behaviour PlasticityTest16;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest16_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest16_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest16_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest16_nj.mfront
index 10b381bb3..833f486cf 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest16_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest16_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest16_nj;
+@Behaviour PlasticityTest16_nj;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest17.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest17.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest17.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest17.mfront
index 1abef6a6e..8edfbfd13 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest17.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest17.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest17;
+@Behaviour PlasticityTest17;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest17_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest17_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest17_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest17_nj.mfront
index dbe439ee5..a651bc964 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest17_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest17_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest17_nj;
+@Behaviour PlasticityTest17_nj;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18.mfront
index 4dab94448..338cc615b 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest18;
+@Behaviour PlasticityTest18;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_nj.mfront
index 23f35549c..f39776ffd 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest18_nj;
+@Behaviour PlasticityTest18_nj;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_qt.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_qt.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_qt.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_qt.mfront
index 3ee9bc047..744c45e7a 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_qt.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_qt.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest18_qt;
+@Behaviour PlasticityTest18_qt;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_qt_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_qt_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_qt_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_qt_nj.mfront
index 536aa4793..e76f51328 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest18_qt_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest18_qt_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest18_qt_nj;
+@Behaviour PlasticityTest18_qt_nj;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19.mfront
index 93467b024..efb263329 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest19;
+@Behaviour PlasticityTest19;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_nj.mfront
index e43b2c444..f455d48ce 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest19_nj;
+@Behaviour PlasticityTest19_nj;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_qt.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_qt.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_qt.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_qt.mfront
index c78025d1d..bb65f0583 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_qt.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_qt.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest19_qt;
+@Behaviour PlasticityTest19_qt;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_qt_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_qt_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_qt_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_qt_nj.mfront
index ff95d101a..86420e8a6 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest19_qt_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest19_qt_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest19_qt_nj;
+@Behaviour PlasticityTest19_qt_nj;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest2.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest2.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest2.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest2.mfront
index 418704ff9..3cab26d85 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest2.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest2.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest2;
+@Behaviour PlasticityTest2;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20.mfront
index 6dad70c86..623700490 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest20;
+@Behaviour PlasticityTest20;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_nj.mfront
index 32f11131d..b1dc5a1e7 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest20_nj;
+@Behaviour PlasticityTest20_nj;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_qt.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_qt.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_qt.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_qt.mfront
index ece6759f3..8bb2a231d 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_qt.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_qt.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest20_qt;
+@Behaviour PlasticityTest20_qt;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_qt_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_qt_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_qt_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_qt_nj.mfront
index 9f3dd0b0c..7d170e3b8 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest20_qt_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest20_qt_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest20_qt_nj;
+@Behaviour PlasticityTest20_qt_nj;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21.mfront
index 273822dbc..92af11865 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest21;
+@Behaviour PlasticityTest21;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_nj.mfront
index ee30a42eb..c4530357c 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest21_nj;
+@Behaviour PlasticityTest21_nj;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_qt.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_qt.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_qt.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_qt.mfront
index 812423a89..cc23c01fb 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_qt.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_qt.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest21_qt;
+@Behaviour PlasticityTest21_qt;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_qt_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_qt_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_qt_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_qt_nj.mfront
index 94e0203d0..1ea702a36 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest21_qt_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest21_qt_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest21_qt_nj;
+@Behaviour PlasticityTest21_qt_nj;
 @Author Thomas Helfer;
 @Date 29 / 07 / 2022;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22.mfront
similarity index 96%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22.mfront
index 3fa697498..a061b16ac 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest22;
+@Behaviour PlasticityTest22;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_nj.mfront
similarity index 96%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_nj.mfront
index c6bbcd9fe..5249c0780 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest22_nj;
+@Behaviour PlasticityTest22_nj;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_qt.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_qt.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_qt.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_qt.mfront
index 56b2681e7..7f5953cc9 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_qt.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_qt.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest22_qt;
+@Behaviour PlasticityTest22_qt;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_qt_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_qt_nj.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_qt_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_qt_nj.mfront
index eaa9a8713..3436303af 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest22_qt_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest22_qt_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest22_qt_nj;
+@Behaviour PlasticityTest22_qt_nj;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23.mfront
index c3511adae..0f1c51ebe 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest23;
+@Behaviour PlasticityTest23;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_nj.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_nj.mfront
index cca389fb5..4f8bf8331 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest23_nj;
+@Behaviour PlasticityTest23_nj;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_qt.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_qt.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_qt.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_qt.mfront
index d06d231e5..cc17d539d 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_qt.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_qt.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest23_qt;
+@Behaviour PlasticityTest23_qt;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_qt_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_qt_nj.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_qt_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_qt_nj.mfront
index dc56e5698..a6c638e27 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest23_qt_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest23_qt_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest23_qt_nj;
+@Behaviour PlasticityTest23_qt_nj;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24.mfront
index f98356e73..cc9574251 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest24;
+@Behaviour PlasticityTest24;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_nj.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_nj.mfront
index 6befc4caf..3a3a7dea8 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest24_nj;
+@Behaviour PlasticityTest24_nj;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_qt.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_qt.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_qt.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_qt.mfront
index ab5c19f40..a6db3304b 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_qt.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_qt.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest24_qt;
+@Behaviour PlasticityTest24_qt;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_qt_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_qt_nj.mfront
similarity index 95%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_qt_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_qt_nj.mfront
index 57eebdf89..d0d6f52d4 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest24_qt_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest24_qt_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest24_qt_nj;
+@Behaviour PlasticityTest24_qt_nj;
 @Author Thomas Helfer;
 @Date 03 / 12 / 2024;
 @UseQt true;
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest2_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest2_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest2_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest2_nj.mfront
index 40b4bd131..1f7578ad0 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest2_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest2_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest2_nj;
+@Behaviour PlasticityTest2_nj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest3.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest3.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest3.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest3.mfront
index 7a3374abd..17ddee9f2 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest3.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest3.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest3;
+@Behaviour PlasticityTest3;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest3_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest3_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest3_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest3_nj.mfront
index cac084490..cac77b40a 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest3_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest3_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest3_nj;
+@Behaviour PlasticityTest3_nj;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest4.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest4.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest4.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest4.mfront
index 2b5add906..ce54be3d8 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest4.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest4.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest4;
+@Behaviour PlasticityTest4;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest4_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest4_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest4_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest4_nj.mfront
index 8a0fa1163..7fe7de396 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest4_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest4_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest4_nj;
+@Behaviour PlasticityTest4_nj;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest5.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest5.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest5.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest5.mfront
index c5c03a639..e13562f45 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest5.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest5.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest5;
+@Behaviour PlasticityTest5;
 @Author Thomas Helfer;
 @Date 11/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest5_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest5_nj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest5_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest5_nj.mfront
index 09957a62f..8c8df5d6b 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest5_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest5_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest5_nj;
+@Behaviour PlasticityTest5_nj;
 @Author Thomas Helfer;
 @Date 11/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest6.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest6.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest6.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest6.mfront
index 934f530c5..b87275cfe 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest6.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest6.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest6;
+@Behaviour PlasticityTest6;
 @Author Thomas Helfer;
 @Date 12 / 04 / 2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest6_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest6_nj.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest6_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest6_nj.mfront
index 576e810f5..a58fd660f 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest6_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest6_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest6_nj;
+@Behaviour PlasticityTest6_nj;
 @Author Thomas Helfer;
 @Date 12 / 04 / 2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest7.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest7.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest7.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest7.mfront
index 566bc8dac..77d4c9aee 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest7.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest7.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest7;
+@Behaviour PlasticityTest7;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest7_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest7_nj.mfront
similarity index 90%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest7_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest7_nj.mfront
index f0bd76750..d5a493f66 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest7_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest7_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest7_nj;
+@Behaviour PlasticityTest7_nj;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest8.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest8.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest8.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest8.mfront
index 07652c6a7..ac1705376 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest8.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest8.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest8;
+@Behaviour PlasticityTest8;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest8_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest8_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest8_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest8_nj.mfront
index e9e125e39..11cbbd797 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest8_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest8_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest8_nj;
+@Behaviour PlasticityTest8_nj;
 @Author Thomas Helfer;
 @Date 06/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9.mfront
index d95207931..783125d70 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest9;
+@Behaviour PlasticityTest9;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_na.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_na.mfront
index e4885ebb1..cd63df293 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_na.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest9_na;
+@Behaviour PlasticityTest9_na;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_nanj.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_nanj.mfront
index cb3decf48..ddde707f4 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest9_nanj;
+@Behaviour PlasticityTest9_nanj;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_nj.mfront
index 7d2309093..e3629df0e 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest9_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest9_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest9_nj;
+@Behaviour PlasticityTest9_nj;
 @Author Thomas Helfer;
 @Date 23/04/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_na.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_na.mfront
similarity index 86%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_na.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_na.mfront
index 082635ef0..00e029eac 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_na.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_na.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest_na;
+@Behaviour PlasticityTest_na;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_nanj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_nanj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_nanj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_nanj.mfront
index 444e8c3a4..b71c14426 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_nanj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_nanj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest_nanj;
+@Behaviour PlasticityTest_nanj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_nj.mfront
similarity index 88%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_nj.mfront
index 16af6bad6..638511500 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityPlasticityTest_nj.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PlasticityTest_nj.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityPlasticityTest_nj;
+@Behaviour PlasticityTest_nj;
 @Author Thomas Helfer;
 @Date 31/03/2018;
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/PowerLawStrainBasedNucleationModelTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PowerLawStrainBasedNucleationModelTest.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/PowerLawStrainBasedNucleationModelTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PowerLawStrainBasedNucleationModelTest.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/PowerLawStressBasedNucleationModelTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/PowerLawStressBasedNucleationModelTest.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/PowerLawStressBasedNucleationModelTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/PowerLawStressBasedNucleationModelTest.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/RousselierTanguyBesson2002.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/RousselierTanguyBesson2002.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/RousselierTanguyBesson2002.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/RousselierTanguyBesson2002.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest1.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test1.mfront
similarity index 87%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest1.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/Test1.mfront
index 701c817a5..3bf116229 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest1.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test1.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityTest1;
+@Behaviour Test1;
 @Author Thomas Helfer;
 @Date 26 / 03 / 2018;
 @Description {
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest2.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test2.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest2.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/Test2.mfront
index b8c0afcbd..78a197911 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest2.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test2.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityTest2;
+@Behaviour Test2;
 @Author Thomas Helfer;
 @Date 26 / 03 / 2018;
 @Description {
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest3.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test3.mfront
similarity index 89%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest3.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/Test3.mfront
index 78d104b46..6071aa7a8 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest3.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test3.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityTest3;
+@Behaviour Test3;
 @Author Thomas Helfer;
 @Date 26 / 03 / 2018;
 @Description {
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest4.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test4.mfront
similarity index 92%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest4.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/Test4.mfront
index 69f86830c..530bfeda4 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest4.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test4.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityTest4;
+@Behaviour Test4;
 @Author Thomas Helfer;
 @Date 26 / 03 / 2018;
 @Description {
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest5.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test5.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest5.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/Test5.mfront
index 533727eba..ef3ed9d32 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest5.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test5.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityTest5;
+@Behaviour Test5;
 @Author Thomas Helfer;
 @Date 26 / 03 / 2018;
 @Description {
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest6.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test6.mfront
similarity index 93%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest6.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/Test6.mfront
index 54ac2e926..3117060eb 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/StandardElastoViscoPlasticityTest6.mfront
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/Test6.mfront
@@ -1,5 +1,5 @@
 @DSL Implicit;
-@Behaviour StandardElastoViscoPlasticityTest6;
+@Behaviour Test6;
 @Author Thomas Helfer;
 @Date 26 / 03 / 2018;
 @Description {
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2_nj.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest2_nj.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3_nj.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest3_nj.mfront
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest_nj.mfront b/mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest_nj.mfront
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest_nj.mfront
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/UserDefinedViscoplasticityTest_nj.mfront
diff --git a/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/CMakeLists.txt b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/CMakeLists.txt
new file mode 100644
index 000000000..edc564049
--- /dev/null
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/CMakeLists.txt
@@ -0,0 +1,509 @@
+if(HAVE_CASTEM)
+  mfront_behaviour_brick_check_library(MFrontCastemStandardElastoViscoPlasticityBrickBehaviours
+  StandardElastoViscoPlasticity umat
+  Test1
+  Test2
+  Test3
+  Test4
+  Test5
+  Test6
+  NortonTest
+  NortonTest_nj
+  NortonTest2
+  NortonTest2_nj
+  NortonTest3
+  NortonTest3_nj
+  NortonTest4
+  NortonTest4_nj
+  NortonTest5
+  NortonTest5_nj
+  NortonTest6
+  NortonTest6_nj
+  NortonTest7
+  NortonTest7_nj
+  NortonTest8
+  NortonTest8_nj
+  NortonTest9
+  NortonTest9_nj
+  OrthotropicNortonTest
+  OrthotropicNortonTest_nj
+  OrthotropicNortonTest_na
+  OrthotropicNortonTest_nanj
+  PlasticityTest
+  PlasticityTest_nj
+  PlasticityTest_na
+  PlasticityTest_nanj
+  PlasticityTest2
+  PlasticityTest2_nj
+  PlasticityTest3
+  PlasticityTest3_nj
+  PlasticityTest4
+  PlasticityTest4_nj
+  PlasticityTest5
+  PlasticityTest5_nj
+  PlasticityTest6
+  PlasticityTest6_nj
+  PlasticityTest7
+  PlasticityTest7_nj
+  PlasticityTest8
+  PlasticityTest8_nj
+  PlasticityTest9
+  PlasticityTest9_nj
+  PlasticityTest9_na
+  PlasticityTest9_nanj
+  PlasticityTest10
+  PlasticityTest10_nj
+  PlasticityTest10_na
+  PlasticityTest10_nanj
+  PlasticityTest11
+  PlasticityTest11_nj
+  PlasticityTest11_na
+  PlasticityTest11_nanj
+  PlasticityTest12
+  PlasticityTest12_nj
+  PlasticityTest12_na
+  PlasticityTest12_nanj
+  PlasticityTest13
+  PlasticityTest13_nj
+  PlasticityTest13_na
+  PlasticityTest13_nanj
+  PlasticityTest14
+  PlasticityTest14_nj
+  PlasticityTest14_na
+  PlasticityTest14_nanj
+  PlasticityTest15
+  PlasticityTest15_nj
+  PlasticityTest15_na
+  PlasticityTest15_nanj
+  PlasticityTest16
+  PlasticityTest16_nj
+  PlasticityTest17
+  PlasticityTest17_nj
+  IsotropicDamageHookeLaw
+  IsotropicDamageHookeLaw_nj
+  IsotropicDamageHookeLaw2
+  IsotropicDamageHookeLaw2_nj
+  HyperbolicSineTest
+  HyperbolicSineTest_nj
+  HyperbolicSineTest2
+  HyperbolicSineTest2_nj
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest2
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj
+  ChuNeedleman1980StrainBasedNucleationModelTest
+  ChuNeedleman1980StressBasedNucleationModelTest
+  PowerLawStrainBasedNucleationModelTest
+  PowerLawStressBasedNucleationModelTest
+  ElasticContributionToPorosityGrowth
+  GursonTvergaardNeedleman1982
+  RousselierTanguyBesson2002)
+
+  target_link_libraries(MFrontCastemStandardElastoViscoPlasticityBrickBehaviours
+    PRIVATE CastemInterface)
+endif(HAVE_CASTEM)
+
+function(castemtest_standardelastovicoplasticitybrick test_arg behaviour_name)
+  if(HAVE_CASTEM)
+    set(_REFERENCE_FILE )
+    set(_MODELLING_HYPOTHESES)
+	foreach(_ARG ${ARGN})
+	  if ( ${_ARG} MATCHES PLANESTRESS)
+	    list(APPEND _MODELLING_HYPOTHESES "PlaneStress")
+	  elseif ( ${_ARG} MATCHES TRIDIMENSIONAL)
+	    list(APPEND _MODELLING_HYPOTHESES "Tridimensional")
+	  elseif ( ${_ARG} MATCHES WILL_FAIL)
+	    set ( _WILL_FAIL ON)
+	  else()
+        set(_REFERENCE_FILE "${_ARG}")
+	  endif()
+	endforeach(_ARG ${ARGN})
+    if(NOT _MODELLING_HYPOTHESES)
+      set(_MODELLING_HYPOTHESES "Tridimensional")
+    endif(NOT _MODELLING_HYPOTHESES)
+    set(file "${CMAKE_CURRENT_SOURCE_DIR}/${test_arg}.mtest")
+    foreach(mh ${_MODELLING_HYPOTHESES})
+      foreach(rm ${IEEE754_ROUNDING_MODES})
+        if(NOT _REFERENCE_FILE)
+          add_test(NAME brick${test_arg}_${behaviour_name}_${mh}_${rm}_castem_mtest
+  	              COMMAND mtest --rounding-direction-mode=${rm}
+                  --verbose=level0 --xml-output=true
+                  --result-file-output=false
+                  --@AccelerationAlgorithm='Cast3M'
+                  --@ModellingHypothesis="${mh}"
+                  --@library@="$<TARGET_FILE:MFrontCastemStandardElastoViscoPlasticityBrickBehaviours>"
+                  --@behaviour@="${behaviour_name}"
+                  --@xml_output@="${test_arg}-${behaviour_name}-${rm}.xml" ${file})
+          add_test(NAME brick${test_arg}_${behaviour_name}_consistenttangentoperator_${mh}_${rm}_castem_mtest
+            	     COMMAND mtest --rounding-direction-mode=${rm}
+                  --verbose=level0 --xml-output=true --result-file-output=false
+                  --@StiffnessMatrixType='ConsistentTangentOperator'
+                  --@ModellingHypothesis="${mh}"
+                  --@library@="$<TARGET_FILE:MFrontCastemStandardElastoViscoPlasticityBrickBehaviours>"
+                  --@behaviour@="${behaviour_name}"
+                  --@xml_output@="${test_arg}-${behaviour_name}-consistenttangentoperator-${rm}.xml" ${file})
+        else(NOT _REFERENCE_FILE)
+          set(rfile "${top_srcdir}/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/${_REFERENCE_FILE}")
+          add_test(NAME brick${test_arg}_${behaviour_name}_${mh}_${rm}_castem_mtest
+            	     COMMAND mtest --rounding-direction-mode=${rm} --verbose=level0 --xml-output=true --result-file-output=false
+            	     --@AccelerationAlgorithm='Cast3M'
+                  --@ModellingHypothesis="${mh}"
+            	     --@library@="$<TARGET_FILE:MFrontCastemStandardElastoViscoPlasticityBrickBehaviours>"
+                  --@behaviour@="${behaviour_name}"
+            	     --@xml_output@="${test_arg}-${behaviour_name}-${rm}.xml"
+            	     --@reference_file@="${rfile}" ${file})
+          add_test(NAME brick${test_arg}_${behaviour_name}_consistenttangentoperator_${mh}_${rm}_castem_mtest
+            	     COMMAND mtest --rounding-direction-mode=${rm} --verbose=level0 --xml-output=true --result-file-output=false
+            	     --@StiffnessMatrixType='ConsistentTangentOperator'
+                  --@ModellingHypothesis="${mh}"
+            	     --@library@="$<TARGET_FILE:MFrontCastemStandardElastoViscoPlasticityBrickBehaviours>"
+                  --@behaviour@="${behaviour_name}"
+            	     --@xml_output@="${test_arg}-${behaviour_name}-consistenttangentoperator-${rm}.xml"
+            	     --@reference_file@="${rfile}" ${file})
+        endif(NOT _REFERENCE_FILE)
+        if((CMAKE_HOST_WIN32) AND (NOT MSYS))
+            	set_property(TEST brick${test_arg}_${behaviour_name}_${mh}_${rm}_castem_mtest
+            	  PROPERTY DEPENDS "MFrontCastemStandardElastoViscoPlasticityBrickBehaviours MFrontMaterialProperties-castem mtest"
+            	  PROPERTY ENVIRONMENT "PATH=$<TARGET_FILE_DIR:TFELMTest>\;$<TARGET_FILE_DIR:TFELMFront>\;$<TARGET_FILE_DIR:MFrontLogStream>\;$<TARGET_FILE_DIR:TFELMaterial>\;$<TARGET_FILE_DIR:TFELNUMODIS>\;$<TARGET_FILE_DIR:TFELMathParser>\;$<TARGET_FILE_DIR:TFELGlossary>\;$<TARGET_FILE_DIR:TFELSystem>\;$<TARGET_FILE_DIR:TFELUtilities>\;$<TARGET_FILE_DIR:TFELException>\;$<TARGET_FILE_DIR:TFELTests>\;$<TARGET_FILE_DIR:TFELConfig>\;$<TARGET_FILE_DIR:TFELUnicodeSupport>\;$ENV{PATH}")
+            	set_property(TEST brick${test_arg}_${behaviour_name}_consistenttangentoperator_${mh}_${rm}_castem_mtest
+            	  PROPERTY DEPENDS "MFrontCastemStandardElastoViscoPlasticityBrickBehaviours MFrontMaterialProperties-castem mtest"
+            	  PROPERTY ENVIRONMENT "PATH=$<TARGET_FILE_DIR:TFELMTest>\;$<TARGET_FILE_DIR:TFELMFront>\;$<TARGET_FILE_DIR:MFrontLogStream>\;$<TARGET_FILE_DIR:TFELMaterial>\;$<TARGET_FILE_DIR:TFELNUMODIS>\;$<TARGET_FILE_DIR:TFELMathParser>\;$<TARGET_FILE_DIR:TFELGlossary>\;$<TARGET_FILE_DIR:TFELSystem>\;$<TARGET_FILE_DIR:TFELUtilities>\;$<TARGET_FILE_DIR:TFELException>\;$<TARGET_FILE_DIR:TFELTests>\;$<TARGET_FILE_DIR:TFELConfig>\;$<TARGET_FILE_DIR:TFELUnicodeSupport>\;$ENV{PATH}")
+        elseif((CMAKE_HOST_WIN32) AND (NOT MSYS))
+          set_property(TEST brick${test_arg}_${behaviour_name}_${mh}_${rm}_castem_mtest
+            	  PROPERTY DEPENDS "MFrontCastemStandardElastoViscoPlasticityBrickBehaviours MFrontMaterialProperties-castem mtest")
+          set_property(TEST brick${test_arg}_${behaviour_name}_consistenttangentoperator_${mh}_${rm}_castem_mtest
+            	  PROPERTY DEPENDS "MFrontCastemStandardElastoViscoPlasticityBrickBehaviours MFrontMaterialProperties-castem mtest")
+        endif((CMAKE_HOST_WIN32) AND (NOT MSYS))
+      endforeach(rm ${IEEE754_ROUNDING_MODES})
+    endforeach(mh ${_MODELLING_HYPOTHESES})
+    if(TFEL_APPEND_SUFFIX)
+      install(FILES ${file}
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem"
+	COMPONENT mtest)
+    else(TFEL_APPEND_SUFFIX)
+      install(FILES ${file}
+	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem"
+	COMPONENT mtest)
+    endif(TFEL_APPEND_SUFFIX)
+  endif(HAVE_CASTEM)
+endfunction(castemtest_standardelastovicoplasticitybrick)
+
+function(castemtest_standardelastovicoplasticitybrick_python test)
+  configure_file(castemtest_standardelastovicoplasticitybrick_python_${test}.py.in
+    castemtest_standardelastovicoplasticitybrick_python_${test}.py @ONLY)
+  add_test(NAME castemtest_standardelastovicoplasticitybrick_python_${test}_py
+    COMMAND ${PYTHON_EXECUTABLE} castemtest_standardelastovicoplasticitybrick_python_${test}.py)
+  set_tests_properties(castemtest_standardelastovicoplasticitybrick_python_${test}_py
+    PROPERTIES DEPENDS MFrontCastemStandardElastoViscoPlasticityBrickBehaviours)
+  if(CMAKE_CONFIGURATION_TYPES)
+    set_tests_properties(castemtest_standardelastovicoplasticitybrick_python_${test}_py
+      PROPERTIES ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/bindings/python;$<TARGET_FILE_DIR:py_std__stl_vector>;$<TARGET_FILE_DIR:py_tfel_tests>")
+  else(CMAKE_CONFIGURATION_TYPES)
+    set_tests_properties(castemtest_standardelastovicoplasticitybrick_python_${test}_py
+      PROPERTIES ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/bindings/python")
+  endif(CMAKE_CONFIGURATION_TYPES)
+endfunction(castemtest_standardelastovicoplasticitybrick_python)
+
+castemtest_standardelastovicoplasticitybrick(nortontest
+  umatnortontest)
+castemtest_standardelastovicoplasticitybrick(nortontest
+  umatnortontest_nj)
+castemtest_standardelastovicoplasticitybrick(nortontest2
+  umatnortontest2)
+castemtest_standardelastovicoplasticitybrick(nortontest2
+  umatnortontest2_nj)
+castemtest_standardelastovicoplasticitybrick(nortontest3
+  umatnortontest3)
+castemtest_standardelastovicoplasticitybrick(nortontest3
+  umatnortontest3_nj)
+castemtest_standardelastovicoplasticitybrick(nortontest4
+  umatnortontest4)
+castemtest_standardelastovicoplasticitybrick(nortontest4
+  umatnortontest4_nj)
+castemtest_standardelastovicoplasticitybrick(nortontest5
+  umatnortontest5)
+castemtest_standardelastovicoplasticitybrick(nortontest5
+  umatnortontest5_nj)
+castemtest_standardelastovicoplasticitybrick(nortontest6-1
+  umatnortontest6)
+castemtest_standardelastovicoplasticitybrick(nortontest6-1
+  umatnortontest6_nj)
+castemtest_standardelastovicoplasticitybrick(nortontest6-2
+  umatnortontest6)
+castemtest_standardelastovicoplasticitybrick(nortontest6-2
+  umatnortontest6_nj)
+castemtest_standardelastovicoplasticitybrick(nortontest7
+  umatnortontest7 standardelastoviscoplasticitynortontest7.ref)
+castemtest_standardelastovicoplasticitybrick(nortontest7
+  umatnortontest7_nj standardelastoviscoplasticitynortontest7.ref)
+castemtest_standardelastovicoplasticitybrick(nortontest8_E
+  umatnortontest8
+  standardelastoviscoplasticitynortontest8_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest8_S
+  umatnortontest8
+  standardelastoviscoplasticitynortontest8_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest8-cyclic_E
+  umatnortontest8
+  standardelastoviscoplasticitynortontest8-cyclic_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest8-cyclic_S
+  umatnortontest8
+  standardelastoviscoplasticitynortontest8-cyclic_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest8_E
+  umatnortontest8_nj
+  standardelastoviscoplasticitynortontest8_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest8_S
+  umatnortontest8_nj
+  standardelastoviscoplasticitynortontest8_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest8-cyclic_E
+  umatnortontest8_nj
+  standardelastoviscoplasticitynortontest8-cyclic_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest8-cyclic_S
+  umatnortontest8_nj
+  standardelastoviscoplasticitynortontest8-cyclic_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+
+castemtest_standardelastovicoplasticitybrick(nortontest9_E
+  umatnortontest9
+  standardelastoviscoplasticitynortontest9_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest9_S
+  umatnortontest9
+  standardelastoviscoplasticitynortontest9_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest9-cyclic_E
+  umatnortontest9
+  standardelastoviscoplasticitynortontest9-cyclic_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest9-cyclic_S
+  umatnortontest9
+  standardelastoviscoplasticitynortontest9-cyclic_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest9_E
+  umatnortontest9_nj
+  standardelastoviscoplasticitynortontest9_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest9_S
+  umatnortontest9_nj
+  standardelastoviscoplasticitynortontest9_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest9-cyclic_E
+  umatnortontest9_nj
+  standardelastoviscoplasticitynortontest9-cyclic_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(nortontest9-cyclic_S
+  umatnortontest9_nj
+  standardelastoviscoplasticitynortontest9-cyclic_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+
+
+castemtest_standardelastovicoplasticitybrick(orthotropicnortontest
+  umatorthotropicnortontest)
+castemtest_standardelastovicoplasticitybrick(orthotropicnortontest
+  umatorthotropicnortontest_nj)
+castemtest_standardelastovicoplasticitybrick(orthotropicnortontest
+  umatorthotropicnortontest_na)
+castemtest_standardelastovicoplasticitybrick(orthotropicnortontest
+  umatorthotropicnortontest_nanj)
+
+castemtest_standardelastovicoplasticitybrick(hyperbolicsinetest
+  umathyperbolicsinetest)
+castemtest_standardelastovicoplasticitybrick(hyperbolicsinetest
+  umathyperbolicsinetest_nj)
+castemtest_standardelastovicoplasticitybrick(hyperbolicsinetest2
+  umathyperbolicsinetest2)
+castemtest_standardelastovicoplasticitybrick(hyperbolicsinetest2
+  umathyperbolicsinetest2_nj)
+
+castemtest_standardelastovicoplasticitybrick(plasticitytest
+  umatplasticitytest
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest_nj
+  umatplasticitytest_nj)
+castemtest_standardelastovicoplasticitybrick(plasticitytest
+  umatplasticitytest_na
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest_nj
+  umatplasticitytest_nanj)
+castemtest_standardelastovicoplasticitybrick(plasticitytest2
+  umatplasticitytest2
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest2_nj
+  umatplasticitytest2_nj
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest3
+  umatplasticitytest3
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest3_nj
+  umatplasticitytest3_nj
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest4
+  umatplasticitytest4 standardelastoviscoplasticityplasticitytest4.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest5
+  umatplasticitytest5
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest5_nj
+  umatplasticitytest5_nj
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest6
+  umatplasticitytest6 standardelastoviscoplasticityplasticitytest6.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest6
+  umatplasticitytest6_nj standardelastoviscoplasticityplasticitytest6.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest7_E
+  umatplasticitytest7
+  standardelastoviscoplasticityplasticitytest7_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest7_S
+  umatplasticitytest7
+  standardelastoviscoplasticityplasticitytest7_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest7-cyclic_E
+  umatplasticitytest7
+  standardelastoviscoplasticityplasticitytest7-cyclic_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest7-cyclic_S
+  umatplasticitytest7
+  standardelastoviscoplasticityplasticitytest7-cyclic_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest7_E
+  umatplasticitytest7_nj
+  standardelastoviscoplasticityplasticitytest7_E.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest7_S
+  umatplasticitytest7_nj
+  standardelastoviscoplasticityplasticitytest7_S.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest7-cyclic_E
+  umatplasticitytest7_nj
+  standardelastoviscoplasticityplasticitytest7-cyclic_E.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest7-cyclic_S
+  umatplasticitytest7_nj
+  standardelastoviscoplasticityplasticitytest7-cyclic_S.ref)
+
+castemtest_standardelastovicoplasticitybrick(plasticitytest8
+  umatplasticitytest8 standardelastoviscoplasticityplasticitytest8.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest8_nj
+  umatplasticitytest8_nj standardelastoviscoplasticityplasticitytest8_nj.ref)
+
+castemtest_standardelastovicoplasticitybrick(plasticitytest11_E
+  umatplasticitytest11
+  standardelastoviscoplasticityplasticitytest11_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11_E
+  umatplasticitytest11_na
+  standardelastoviscoplasticityplasticitytest11_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11_E
+  umatplasticitytest11_nj
+  standardelastoviscoplasticityplasticitytest11_E.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11_E
+  umatplasticitytest11_nanj
+  standardelastoviscoplasticityplasticitytest11_E.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11_S
+  umatplasticitytest11
+  standardelastoviscoplasticityplasticitytest11_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11_S
+  umatplasticitytest11_na
+  standardelastoviscoplasticityplasticitytest11_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11_S
+  umatplasticitytest11_nj
+  standardelastoviscoplasticityplasticitytest11_S.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11_S
+  umatplasticitytest11_nanj
+  standardelastoviscoplasticityplasticitytest11_S.ref)
+
+castemtest_standardelastovicoplasticitybrick(plasticitytest11-cyclic_E
+  umatplasticitytest11
+  standardelastoviscoplasticityplasticitytest11-cyclic_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11-cyclic_E
+  umatplasticitytest11_na
+  standardelastoviscoplasticityplasticitytest11-cyclic_E.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11-cyclic_E
+  umatplasticitytest11_nj
+  standardelastoviscoplasticityplasticitytest11-cyclic_E.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11-cyclic_E
+  umatplasticitytest11_nanj
+  standardelastoviscoplasticityplasticitytest11-cyclic_E.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11-cyclic_S
+  umatplasticitytest11
+  standardelastoviscoplasticityplasticitytest11-cyclic_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11-cyclic_S
+  umatplasticitytest11_na
+  standardelastoviscoplasticityplasticitytest11-cyclic_S.ref
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11-cyclic_S
+  umatplasticitytest11_nj
+  standardelastoviscoplasticityplasticitytest11-cyclic_S.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest11-cyclic_S
+  umatplasticitytest11_nanj
+  standardelastoviscoplasticityplasticitytest11-cyclic_S.ref)
+
+castemtest_standardelastovicoplasticitybrick(plasticitytest12
+  umatplasticitytest12 PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest12
+  umatplasticitytest12_nj PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest12
+  umatplasticitytest12_na PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest12
+  umatplasticitytest12_nanj PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest13
+  umatplasticitytest13 PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest13
+  umatplasticitytest13_nj PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest13
+  umatplasticitytest13_na PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest13
+  umatplasticitytest13_nanj PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(plasticitytest14
+  umatplasticitytest14)
+castemtest_standardelastovicoplasticitybrick(plasticitytest14
+  umatplasticitytest14_nj)
+castemtest_standardelastovicoplasticitybrick(plasticitytest14
+  umatplasticitytest14_na)
+castemtest_standardelastovicoplasticitybrick(plasticitytest14
+  umatplasticitytest14_nanj)
+castemtest_standardelastovicoplasticitybrick(plasticitytest16
+  umatplasticitytest16 standardelastoviscoplasticityplasticitytest16.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest16
+  umatplasticitytest16_nj standardelastoviscoplasticityplasticitytest16.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest17
+  umatplasticitytest17 standardelastoviscoplasticityplasticitytest17.ref)
+castemtest_standardelastovicoplasticitybrick(plasticitytest17
+  umatplasticitytest17_nj standardelastoviscoplasticityplasticitytest17.ref)
+
+
+castemtest_standardelastovicoplasticitybrick(isotropicdamagehookelaw
+  umatisotropicdamagehookelaw
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(isotropicdamagehookelaw
+  umatisotropicdamagehookelaw_nj
+  PLANESTRESS TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(isotropicdamagehookelaw2
+  umatisotropicdamagehookelaw2 TRIDIMENSIONAL)
+castemtest_standardelastovicoplasticitybrick(isotropicdamagehookelaw2
+  umatisotropicdamagehookelaw2_nj)
+
+castemtest_standardelastovicoplasticitybrick(nortontest
+  umatharmonicsumofnortonhoffviscoplasticflowstest)
+castemtest_standardelastovicoplasticitybrick(nortontest
+  umatharmonicsumofnortonhoffviscoplasticflowstest_nj)
+castemtest_standardelastovicoplasticitybrick(nortontest
+  umatharmonicsumofnortonhoffviscoplasticflowstest2)
+castemtest_standardelastovicoplasticitybrick(nortontest
+  umatharmonicsumofnortonhoffviscoplasticflowstest2_nj)
+
+if(enable-python-bindings)
+#  castemtest_standardelastovicoplasticitybrick_python(Cazacu_2001)
+endif(enable-python-bindings)
+
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityhyperbolicsinetest.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/hyperbolicsinetest.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityhyperbolicsinetest.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/hyperbolicsinetest.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityhyperbolicsinetest2.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/hyperbolicsinetest2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityhyperbolicsinetest2.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/hyperbolicsinetest2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityisotropicdamagehookelaw.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/isotropicdamagehookelaw.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityisotropicdamagehookelaw.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/isotropicdamagehookelaw.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityisotropicdamagehookelaw2.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/isotropicdamagehookelaw2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityisotropicdamagehookelaw2.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/isotropicdamagehookelaw2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest2.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest2.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest3.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest3.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest3.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest3.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest4.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest4.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest4.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest4.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest5.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest5.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest5.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest5.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest6-1.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest6-1.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest6-1.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest6-1.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest6-2.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest6-2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest6-2.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest6-2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest7.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest7.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest7.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest7.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8-cyclic_E.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest8-cyclic_E.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8-cyclic_E.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest8-cyclic_E.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8-cyclic_S.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest8-cyclic_S.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8-cyclic_S.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest8-cyclic_S.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8_E.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest8_E.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8_E.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest8_E.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8_S.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest8_S.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest8_S.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest8_S.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9-cyclic_E.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest9-cyclic_E.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9-cyclic_E.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest9-cyclic_E.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9-cyclic_S.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest9-cyclic_S.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9-cyclic_S.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest9-cyclic_S.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9_E.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest9_E.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9_E.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest9_E.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9_S.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest9_S.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticitynortontest9_S.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/nortontest9_S.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityorthotropicnortontest.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/orthotropicnortontest.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityorthotropicnortontest.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/orthotropicnortontest.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11-cyclic_E.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest11-cyclic_E.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11-cyclic_E.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest11-cyclic_E.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11-cyclic_S.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest11-cyclic_S.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11-cyclic_S.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest11-cyclic_S.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11_E.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest11_E.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11_E.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest11_E.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11_S.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest11_S.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest11_S.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest11_S.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest12.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest12.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest12.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest12.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest13.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest13.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest13.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest13.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest14.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest14.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest14.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest14.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest16.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest16.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest16.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest16.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest17.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest17.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest17.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest17.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest2.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest2.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest2_nj.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest2_nj.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest2_nj.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest2_nj.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest3.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest3.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest3.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest3.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest3_nj.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest3_nj.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest3_nj.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest3_nj.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest4.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest4.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest4.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest4.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest5.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest5.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest5.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest5.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest5_nj.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest5_nj.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest5_nj.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest5_nj.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest6.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest6.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest6.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest6.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7-cyclic_E.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest7-cyclic_E.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7-cyclic_E.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest7-cyclic_E.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7-cyclic_S.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest7-cyclic_S.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7-cyclic_S.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest7-cyclic_S.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7_E.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest7_E.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7_E.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest7_E.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7_S.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest7_S.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest7_S.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest7_S.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest8.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest8.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest8.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest8.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest8_nj.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest8_nj.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest8_nj.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest8_nj.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest_nj.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest_nj.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/castemstandardelastoviscoplasticityplasticitytest_nj.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/plasticitytest_nj.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/CMakeLists.txt b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/CMakeLists.txt
similarity index 53%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/CMakeLists.txt
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/CMakeLists.txt
index 21bd6d257..50cc1ca7e 100644
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/CMakeLists.txt
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/CMakeLists.txt
@@ -1,109 +1,109 @@
 mfront_behaviour_brick_check_library(MFrontStandardElastoViscoPlasticityBrickBehaviours
   StandardElastoViscoPlasticity generic
-  StandardElastoViscoPlasticityTest1
-  StandardElastoViscoPlasticityTest2
-  StandardElastoViscoPlasticityTest3
-  StandardElastoViscoPlasticityTest4
-  StandardElastoViscoPlasticityTest5
-  StandardElastoViscoPlasticityTest6
-  StandardElastoViscoPlasticityNortonTest
-  StandardElastoViscoPlasticityNortonTest_nj
-  StandardElastoViscoPlasticityNortonTest2
-  StandardElastoViscoPlasticityNortonTest2_nj
-  StandardElastoViscoPlasticityNortonTest3
-  StandardElastoViscoPlasticityNortonTest3_nj
-  StandardElastoViscoPlasticityNortonTest4
-  StandardElastoViscoPlasticityNortonTest4_nj
-  StandardElastoViscoPlasticityNortonTest5
-  StandardElastoViscoPlasticityNortonTest5_nj
-  StandardElastoViscoPlasticityNortonTest6
-  StandardElastoViscoPlasticityNortonTest6_nj
-  StandardElastoViscoPlasticityNortonTest7
-  StandardElastoViscoPlasticityNortonTest7_nj
-  StandardElastoViscoPlasticityNortonTest8
-  StandardElastoViscoPlasticityNortonTest8_nj
-  StandardElastoViscoPlasticityNortonTest9
-  StandardElastoViscoPlasticityNortonTest9_nj
-  StandardElastoViscoPlasticityOrthotropicNortonTest
-  StandardElastoViscoPlasticityOrthotropicNortonTest_nj
-  StandardElastoViscoPlasticityOrthotropicNortonTest_na
-  StandardElastoViscoPlasticityOrthotropicNortonTest_nanj
-  StandardElastoViscoPlasticityPlasticityTest
-  StandardElastoViscoPlasticityPlasticityTest_nj
-  StandardElastoViscoPlasticityPlasticityTest_na
-  StandardElastoViscoPlasticityPlasticityTest_nanj
-  StandardElastoViscoPlasticityPlasticityTest2
-  StandardElastoViscoPlasticityPlasticityTest2_nj
-  StandardElastoViscoPlasticityPlasticityTest3
-  StandardElastoViscoPlasticityPlasticityTest3_nj
-  StandardElastoViscoPlasticityPlasticityTest4
-  StandardElastoViscoPlasticityPlasticityTest4_nj
-  StandardElastoViscoPlasticityPlasticityTest5
-  StandardElastoViscoPlasticityPlasticityTest5_nj
-  StandardElastoViscoPlasticityPlasticityTest6
-  StandardElastoViscoPlasticityPlasticityTest6_nj
-  StandardElastoViscoPlasticityPlasticityTest7
-  StandardElastoViscoPlasticityPlasticityTest7_nj
-  StandardElastoViscoPlasticityPlasticityTest8
-  StandardElastoViscoPlasticityPlasticityTest8_nj
-  StandardElastoViscoPlasticityPlasticityTest9
-  StandardElastoViscoPlasticityPlasticityTest9_nj
-  StandardElastoViscoPlasticityPlasticityTest9_na
-  StandardElastoViscoPlasticityPlasticityTest9_nanj
-  StandardElastoViscoPlasticityPlasticityTest10
-  StandardElastoViscoPlasticityPlasticityTest10_nj
-  StandardElastoViscoPlasticityPlasticityTest10_na
-  StandardElastoViscoPlasticityPlasticityTest10_nanj
-  StandardElastoViscoPlasticityPlasticityTest11
-  StandardElastoViscoPlasticityPlasticityTest11_nj
-  StandardElastoViscoPlasticityPlasticityTest11_na
-  StandardElastoViscoPlasticityPlasticityTest11_nanj
-  StandardElastoViscoPlasticityPlasticityTest12
-  StandardElastoViscoPlasticityPlasticityTest12_nj
-  StandardElastoViscoPlasticityPlasticityTest12_na
-  StandardElastoViscoPlasticityPlasticityTest12_nanj
-  StandardElastoViscoPlasticityPlasticityTest13
-  StandardElastoViscoPlasticityPlasticityTest13_nj
-  StandardElastoViscoPlasticityPlasticityTest13_na
-  StandardElastoViscoPlasticityPlasticityTest13_nanj
-  StandardElastoViscoPlasticityPlasticityTest14
-  StandardElastoViscoPlasticityPlasticityTest14_nj
-  StandardElastoViscoPlasticityPlasticityTest14_na
-  StandardElastoViscoPlasticityPlasticityTest14_nanj
-  StandardElastoViscoPlasticityPlasticityTest15
-  StandardElastoViscoPlasticityPlasticityTest15_nj
-  StandardElastoViscoPlasticityPlasticityTest15_na
-  StandardElastoViscoPlasticityPlasticityTest15_nanj
-  StandardElastoViscoPlasticityPlasticityTest16
-  StandardElastoViscoPlasticityPlasticityTest16_nj
-  StandardElastoViscoPlasticityPlasticityTest17
-  StandardElastoViscoPlasticityPlasticityTest17_nj
-  StandardElastoViscoPlasticityPlasticityTest18
-  StandardElastoViscoPlasticityPlasticityTest18_nj
-  StandardElastoViscoPlasticityPlasticityTest19
-  StandardElastoViscoPlasticityPlasticityTest19_nj
-  StandardElastoViscoPlasticityPlasticityTest20
-  StandardElastoViscoPlasticityPlasticityTest20_nj
-  StandardElastoViscoPlasticityPlasticityTest21
-  StandardElastoViscoPlasticityPlasticityTest21_nj
-  StandardElastoViscoPlasticityPlasticityTest22
-  StandardElastoViscoPlasticityPlasticityTest22_nj
-  StandardElastoViscoPlasticityPlasticityTest23
-  StandardElastoViscoPlasticityPlasticityTest23_nj
-  StandardElastoViscoPlasticityPlasticityTest24
-  StandardElastoViscoPlasticityPlasticityTest24_nj
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw_nj
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw2
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw2_nj
-  StandardElastoViscoPlasticityHyperbolicSineTest
-  StandardElastoViscoPlasticityHyperbolicSineTest_nj
-  StandardElastoViscoPlasticityHyperbolicSineTest2
-  StandardElastoViscoPlasticityHyperbolicSineTest2_nj
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest_nj
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj
+  Test1
+  Test2
+  Test3
+  Test4
+  Test5
+  Test6
+  NortonTest
+  NortonTest_nj
+  NortonTest2
+  NortonTest2_nj
+  NortonTest3
+  NortonTest3_nj
+  NortonTest4
+  NortonTest4_nj
+  NortonTest5
+  NortonTest5_nj
+  NortonTest6
+  NortonTest6_nj
+  NortonTest7
+  NortonTest7_nj
+  NortonTest8
+  NortonTest8_nj
+  NortonTest9
+  NortonTest9_nj
+  OrthotropicNortonTest
+  OrthotropicNortonTest_nj
+  OrthotropicNortonTest_na
+  OrthotropicNortonTest_nanj
+  PlasticityTest
+  PlasticityTest_nj
+  PlasticityTest_na
+  PlasticityTest_nanj
+  PlasticityTest2
+  PlasticityTest2_nj
+  PlasticityTest3
+  PlasticityTest3_nj
+  PlasticityTest4
+  PlasticityTest4_nj
+  PlasticityTest5
+  PlasticityTest5_nj
+  PlasticityTest6
+  PlasticityTest6_nj
+  PlasticityTest7
+  PlasticityTest7_nj
+  PlasticityTest8
+  PlasticityTest8_nj
+  PlasticityTest9
+  PlasticityTest9_nj
+  PlasticityTest9_na
+  PlasticityTest9_nanj
+  PlasticityTest10
+  PlasticityTest10_nj
+  PlasticityTest10_na
+  PlasticityTest10_nanj
+  PlasticityTest11
+  PlasticityTest11_nj
+  PlasticityTest11_na
+  PlasticityTest11_nanj
+  PlasticityTest12
+  PlasticityTest12_nj
+  PlasticityTest12_na
+  PlasticityTest12_nanj
+  PlasticityTest13
+  PlasticityTest13_nj
+  PlasticityTest13_na
+  PlasticityTest13_nanj
+  PlasticityTest14
+  PlasticityTest14_nj
+  PlasticityTest14_na
+  PlasticityTest14_nanj
+  PlasticityTest15
+  PlasticityTest15_nj
+  PlasticityTest15_na
+  PlasticityTest15_nanj
+  PlasticityTest16
+  PlasticityTest16_nj
+  PlasticityTest17
+  PlasticityTest17_nj
+  PlasticityTest18
+  PlasticityTest18_nj
+  PlasticityTest19
+  PlasticityTest19_nj
+  PlasticityTest20
+  PlasticityTest20_nj
+  PlasticityTest21
+  PlasticityTest21_nj
+  PlasticityTest22
+  PlasticityTest22_nj
+  PlasticityTest23
+  PlasticityTest23_nj
+  PlasticityTest24
+  PlasticityTest24_nj
+  IsotropicDamageHookeLaw
+  IsotropicDamageHookeLaw_nj
+  IsotropicDamageHookeLaw2
+  IsotropicDamageHookeLaw2_nj
+  HyperbolicSineTest
+  HyperbolicSineTest_nj
+  HyperbolicSineTest2
+  HyperbolicSineTest2_nj
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest2
+  HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj
   ChuNeedleman1980StrainBasedNucleationModelTest
   ChuNeedleman1980StressBasedNucleationModelTest
   PowerLawStrainBasedNucleationModelTest
@@ -124,20 +124,20 @@ mfront_behaviour_brick_check_library(MFrontStandardElastoViscoPlasticityBrickBeh
 if(enable-mfront-quantity-tests)
   mfront_behaviour_brick_check_library(MFrontStandardElastoViscoPlasticityBrickBehaviours3
     StandardElastoViscoPlasticity generic
-    StandardElastoViscoPlasticityPlasticityTest18_qt
-    StandardElastoViscoPlasticityPlasticityTest18_qt_nj
-    StandardElastoViscoPlasticityPlasticityTest19_qt
-    StandardElastoViscoPlasticityPlasticityTest19_qt_nj
-    StandardElastoViscoPlasticityPlasticityTest20_qt
-    StandardElastoViscoPlasticityPlasticityTest20_qt_nj
-    StandardElastoViscoPlasticityPlasticityTest21_qt
-    StandardElastoViscoPlasticityPlasticityTest21_qt_nj
-    StandardElastoViscoPlasticityPlasticityTest22_qt
-    StandardElastoViscoPlasticityPlasticityTest22_qt_nj
-    StandardElastoViscoPlasticityPlasticityTest23_qt
-    StandardElastoViscoPlasticityPlasticityTest23_qt_nj
-    StandardElastoViscoPlasticityPlasticityTest24_qt
-    StandardElastoViscoPlasticityPlasticityTest24_qt_nj)
+    PlasticityTest18_qt
+    PlasticityTest18_qt_nj
+    PlasticityTest19_qt
+    PlasticityTest19_qt_nj
+    PlasticityTest20_qt
+    PlasticityTest20_qt_nj
+    PlasticityTest21_qt
+    PlasticityTest21_qt_nj
+    PlasticityTest22_qt
+    PlasticityTest22_qt_nj
+    PlasticityTest23_qt
+    PlasticityTest23_qt_nj
+    PlasticityTest24_qt
+    PlasticityTest24_qt_nj)
 endif(enable-mfront-quantity-tests)
 
 function(generictest_standardelastovicoplasticitybrick test_name test_file library_name behaviour_name)
@@ -169,7 +169,7 @@ function(generictest_standardelastovicoplasticitybrick test_name test_file libra
                  --@behaviour@="${behaviour_name}"
                  --@xml_output@="${test_name}-${behaviour_name}-${rm}.xml" ${file})
       else(NOT _REFERENCE_FILE)
-        set(rfile "${top_srcdir}/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/${_REFERENCE_FILE}")
+        set(rfile "${top_srcdir}/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/${_REFERENCE_FILE}")
         add_test(NAME brick${test_name}_${behaviour_name}_${mh}_${rm}_generic_mtest
           	     COMMAND mtest --rounding-direction-mode=${rm} --verbose=level0 --xml-output=true --result-file-output=false
                  --@ModellingHypothesis="${mh}"
@@ -190,11 +190,11 @@ function(generictest_standardelastovicoplasticitybrick test_name test_file libra
   endforeach(mh ${_MODELLING_HYPOTHESES})
   if(TFEL_APPEND_SUFFIX)
     install(FILES ${file}
-      DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic"
+      DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/generic"
       COMPONENT mtest)
   else(TFEL_APPEND_SUFFIX)
     install(FILES ${file}
-      DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic"
+      DESTINATION "share/doc/mfront/tests/behaviours/bricks/generic"
       COMPONENT mtest)
   endif(TFEL_APPEND_SUFFIX)
 endfunction(generictest_standardelastovicoplasticitybrick)
@@ -212,23 +212,23 @@ foreach(id RANGE 18 21)
   generictest_standardelastovicoplasticitybrick("DataIsotropicHardeningRuleTest-${id}"
     DataIsotropicHardeningRuleTest
     MFrontStandardElastoViscoPlasticityBrickBehaviours
-    "StandardElastoViscoPlasticityPlasticityTest${id}"
+    "PlasticityTest${id}"
     "DataIsotropicHardeningRuleTest-${id}.ref")
   generictest_standardelastovicoplasticitybrick("DataIsotropicHardeningRuleTest-nj-${id}"
     DataIsotropicHardeningRuleTest
     MFrontStandardElastoViscoPlasticityBrickBehaviours
-    "StandardElastoViscoPlasticityPlasticityTest${id}_nj"
+    "PlasticityTest${id}_nj"
     "DataIsotropicHardeningRuleTest-${id}.ref")
   if(enable-mfront-quantity-tests)
     generictest_standardelastovicoplasticitybrick("DataIsotropicHardeningRuleTest-qt-${id}"
       DataIsotropicHardeningRuleTest
       MFrontStandardElastoViscoPlasticityBrickBehaviours3
-      "StandardElastoViscoPlasticityPlasticityTest${id}_qt"
+      "PlasticityTest${id}_qt"
       "DataIsotropicHardeningRuleTest-${id}.ref")
     generictest_standardelastovicoplasticitybrick("DataIsotropicHardeningRuleTest-qt-nj-${id}"
       DataIsotropicHardeningRuleTest
       MFrontStandardElastoViscoPlasticityBrickBehaviours3
-      "StandardElastoViscoPlasticityPlasticityTest${id}_qt_nj"
+      "PlasticityTest${id}_qt_nj"
       "DataIsotropicHardeningRuleTest-${id}.ref")
   endif(enable-mfront-quantity-tests)
 endforeach()
@@ -237,42 +237,42 @@ foreach(final_time 0.05 0.5 5 50 500 5000)
   generictest_standardelastovicoplasticitybrick("CowperSymondsRateSensitivityFactor-${final_time}"
      "RateSensitivityFactorTest-${final_time}"
      MFrontStandardElastoViscoPlasticityBrickBehaviours
-     "StandardElastoViscoPlasticityPlasticityTest22"
+     "PlasticityTest22"
      "CowperSymondsRateSensitivityFactorTest-${final_time}.ref")
   generictest_standardelastovicoplasticitybrick("CowperSymondsRateSensitivityFactor_nj-${final_time}"
      "RateSensitivityFactorTest-${final_time}"
      MFrontStandardElastoViscoPlasticityBrickBehaviours
-     "StandardElastoViscoPlasticityPlasticityTest22_nj"
+     "PlasticityTest22_nj"
      "CowperSymondsRateSensitivityFactorTest-${final_time}.ref")
   generictest_standardelastovicoplasticitybrick("CowperSymondsRateSensitivityFactor_qt-${final_time}"
      "RateSensitivityFactorTest-${final_time}"
      MFrontStandardElastoViscoPlasticityBrickBehaviours3
-     "StandardElastoViscoPlasticityPlasticityTest22_qt"
+     "PlasticityTest22_qt"
      "CowperSymondsRateSensitivityFactorTest-${final_time}.ref")
   generictest_standardelastovicoplasticitybrick("CowperSymondsRateSensitivityFactor_qt_nj-${final_time}"
      "RateSensitivityFactorTest-${final_time}"
      MFrontStandardElastoViscoPlasticityBrickBehaviours3
-     "StandardElastoViscoPlasticityPlasticityTest22_qt_nj"
+     "PlasticityTest22_qt_nj"
      "CowperSymondsRateSensitivityFactorTest-${final_time}.ref")
   generictest_standardelastovicoplasticitybrick("JohnsonCookRateSensitivityFactor-${final_time}"
      "RateSensitivityFactorTest-${final_time}"
      MFrontStandardElastoViscoPlasticityBrickBehaviours
-     "StandardElastoViscoPlasticityPlasticityTest24"
+     "PlasticityTest24"
      "JohnsonCookRateSensitivityFactorTest-${final_time}.ref")
   generictest_standardelastovicoplasticitybrick("JohnsonCookRateSensitivityFactor_nj-${final_time}"
      "RateSensitivityFactorTest-${final_time}"
      MFrontStandardElastoViscoPlasticityBrickBehaviours
-     "StandardElastoViscoPlasticityPlasticityTest24_nj"
+     "PlasticityTest24_nj"
      "JohnsonCookRateSensitivityFactorTest-${final_time}.ref")
   generictest_standardelastovicoplasticitybrick("JohnsonCookRateSensitivityFactor_qt-${final_time}"
      "RateSensitivityFactorTest-${final_time}"
      MFrontStandardElastoViscoPlasticityBrickBehaviours3
-     "StandardElastoViscoPlasticityPlasticityTest24_qt"
+     "PlasticityTest24_qt"
      "JohnsonCookRateSensitivityFactorTest-${final_time}.ref")
   generictest_standardelastovicoplasticitybrick("JohnsonCookRateSensitivityFactor_qt_nj-${final_time}"
      "RateSensitivityFactorTest-${final_time}"
      MFrontStandardElastoViscoPlasticityBrickBehaviours3
-     "StandardElastoViscoPlasticityPlasticityTest24_qt_nj"
+     "PlasticityTest24_qt_nj"
      "JohnsonCookRateSensitivityFactorTest-${final_time}.ref")
 endforeach()
 
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/DataIsotropicHardeningRuleTest.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/DataIsotropicHardeningRuleTest.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/DataIsotropicHardeningRuleTest.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/DataIsotropicHardeningRuleTest.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test1.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test1.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test1.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test1.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test2.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test2.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test2.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/GursonTvergaardNeedleman1982-test2.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.05.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.05.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.05.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.05.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.5.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.5.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.5.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-0.5.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-50.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-50.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-50.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-50.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-500.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-500.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-500.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-500.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5000.mtest b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5000.mtest
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5000.mtest
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/RateSensitivityFactorTest-5000.mtest
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.005.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.005.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.005.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.005.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.05.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.05.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.05.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.05.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.5.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.5.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.5.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-0.5.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-50.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-50.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-50.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-50.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-500.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-500.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-500.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-500.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5000.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5000.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5000.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/CowperSymondsRateSensitivityFactorTest-5000.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-18.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-18.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-18.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-18.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-19.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-19.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-19.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-19.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-20.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-20.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-20.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-20.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-21.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-21.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-21.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/DataIsotropicHardeningRuleTest-21.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test1.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test1.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test1.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test1.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test2.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test2.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test2.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/GursonTvergaardNeedleman1982-test2.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.005.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.005.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.005.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.005.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.05.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.05.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.05.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.05.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.5.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.5.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.5.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-0.5.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-50.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-50.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-50.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-50.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-500.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-500.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-500.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-500.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5000.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5000.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5000.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/JohnsonCookRateSensitivityFactorTest-5000.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest7.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest7.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest7.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest7.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_E.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_E.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_E.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_E.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_S.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_S.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_S.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8-cyclic_S.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_E.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_E.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_E.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_E.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_S.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_S.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_S.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest8_S.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_E.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_E.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_E.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_E.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_S.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_S.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_S.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9-cyclic_S.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_E.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_E.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_E.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_E.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_S.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_S.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_S.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticitynortontest9_S.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_E.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_E.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_E.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_E.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_S.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_S.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_S.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11-cyclic_S.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_E.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_E.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_E.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_E.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_S.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_S.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_S.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest11_S.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest16.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest16.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest16.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest16.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest17.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest17.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest17.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest17.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest4.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest4.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest4.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest4.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest6.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest6.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest6.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest6.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_E.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_E.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_E.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_E.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_S.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_S.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_S.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7-cyclic_S.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_E.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_E.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_E.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_E.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_S.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_S.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_S.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest7_S.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8.ref
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8_nj.ref b/mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8_nj.ref
similarity index 100%
rename from mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8_nj.ref
rename to mfront/tests/behaviours/StandardElastoViscoPlasticity/references/standardelastoviscoplasticityplasticitytest8_nj.ref
diff --git a/mfront/tests/behaviours/bricks/CMakeLists.txt b/mfront/tests/behaviours/bricks/CMakeLists.txt
deleted file mode 100644
index cc071a269..000000000
--- a/mfront/tests/behaviours/bricks/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_subdirectory(StandardElasticity)
-add_subdirectory(StandardElastoViscoPlasticity)
-add_subdirectory(FiniteStrainSingleCrystal)
-add_subdirectory(DDIF2)
\ No newline at end of file
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/CMakeLists.txt b/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/CMakeLists.txt
deleted file mode 100644
index 571f99175..000000000
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/CMakeLists.txt
+++ /dev/null
@@ -1,210 +0,0 @@
-add_subdirectory(castem)
-add_subdirectory(generic)
-
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityTest1.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityTest2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityTest3.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityTest4.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityTest5.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityTest6.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest2_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest3.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest3_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest4.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest4_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest5.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest5_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest6.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest6_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest7.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest7_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest8.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest8_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest9.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityNortonTest9_nj.mfront)
-
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityHyperbolicSineTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityHyperbolicSineTest_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityHyperbolicSineTest2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityHyperbolicSineTest2_nj.mfront)
-
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityOrthotropicNortonTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityOrthotropicNortonTest_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityOrthotropicNortonTest_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityOrthotropicNortonTest_nanj.mfront)
-
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest_nanj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest2_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest3.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest3_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest4.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest4_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest5.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest5_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest6.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest6_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest7.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest7_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest8.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest8_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest9.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest9_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest9_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest9_nanj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest10.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest10_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest10_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest10_nanj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest11.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest11_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest11_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest11_nanj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest12.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest12_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest12_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest12_nanj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest13.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest13_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest13_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest13_nanj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest14.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest14_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest14_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest14_nanj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest15.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest15_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest15_na.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest15_nanj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest16.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest16_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest17.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	StandardElastoViscoPlasticityPlasticityTest17_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront)
-
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	 StandardElastoViscoPlasticityIsotropicDamageHookeLaw.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	 StandardElastoViscoPlasticityIsotropicDamageHookeLaw_nj.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	 StandardElastoViscoPlasticityIsotropicDamageHookeLaw2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw2_nj.mfront)
-
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	ChuNeedleman1980StrainBasedNucleationModelTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	ChuNeedleman1980StressBasedNucleationModelTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	PowerLawStrainBasedNucleationModelTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-	PowerLawStressBasedNucleationModelTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-        ElasticContributionToPorosityGrowth.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-        GursonTvergaardNeedleman1982.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-        RousselierTanguyBesson2002.mfront)
-
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-        UserDefinedViscoplasticityTest.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-        UserDefinedViscoplasticityTest2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElastoViscoPlasticity
-        UserDefinedViscoplasticityTest3.mfront)
-      
diff --git a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/CMakeLists.txt b/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/CMakeLists.txt
deleted file mode 100644
index f356cfb25..000000000
--- a/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem/CMakeLists.txt
+++ /dev/null
@@ -1,510 +0,0 @@
-if(HAVE_CASTEM)
-  mfront_behaviour_brick_check_library(MFrontCastemStandardElastoViscoPlasticityBrickBehaviours
-  StandardElastoViscoPlasticity umat
-  StandardElastoViscoPlasticityTest1
-  StandardElastoViscoPlasticityTest2
-  StandardElastoViscoPlasticityTest3
-  StandardElastoViscoPlasticityTest4
-  StandardElastoViscoPlasticityTest5
-  StandardElastoViscoPlasticityTest6
-  StandardElastoViscoPlasticityNortonTest
-  StandardElastoViscoPlasticityNortonTest_nj
-  StandardElastoViscoPlasticityNortonTest2
-  StandardElastoViscoPlasticityNortonTest2_nj
-  StandardElastoViscoPlasticityNortonTest3
-  StandardElastoViscoPlasticityNortonTest3_nj
-  StandardElastoViscoPlasticityNortonTest4
-  StandardElastoViscoPlasticityNortonTest4_nj
-  StandardElastoViscoPlasticityNortonTest5
-  StandardElastoViscoPlasticityNortonTest5_nj
-  StandardElastoViscoPlasticityNortonTest6
-  StandardElastoViscoPlasticityNortonTest6_nj
-  StandardElastoViscoPlasticityNortonTest7
-  StandardElastoViscoPlasticityNortonTest7_nj
-  StandardElastoViscoPlasticityNortonTest8
-  StandardElastoViscoPlasticityNortonTest8_nj
-  StandardElastoViscoPlasticityNortonTest9
-  StandardElastoViscoPlasticityNortonTest9_nj
-  StandardElastoViscoPlasticityOrthotropicNortonTest
-  StandardElastoViscoPlasticityOrthotropicNortonTest_nj
-  StandardElastoViscoPlasticityOrthotropicNortonTest_na
-  StandardElastoViscoPlasticityOrthotropicNortonTest_nanj
-  StandardElastoViscoPlasticityPlasticityTest
-  StandardElastoViscoPlasticityPlasticityTest_nj
-  StandardElastoViscoPlasticityPlasticityTest_na
-  StandardElastoViscoPlasticityPlasticityTest_nanj
-  StandardElastoViscoPlasticityPlasticityTest2
-  StandardElastoViscoPlasticityPlasticityTest2_nj
-  StandardElastoViscoPlasticityPlasticityTest3
-  StandardElastoViscoPlasticityPlasticityTest3_nj
-  StandardElastoViscoPlasticityPlasticityTest4
-  StandardElastoViscoPlasticityPlasticityTest4_nj
-  StandardElastoViscoPlasticityPlasticityTest5
-  StandardElastoViscoPlasticityPlasticityTest5_nj
-  StandardElastoViscoPlasticityPlasticityTest6
-  StandardElastoViscoPlasticityPlasticityTest6_nj
-  StandardElastoViscoPlasticityPlasticityTest7
-  StandardElastoViscoPlasticityPlasticityTest7_nj
-  StandardElastoViscoPlasticityPlasticityTest8
-  StandardElastoViscoPlasticityPlasticityTest8_nj
-  StandardElastoViscoPlasticityPlasticityTest9
-  StandardElastoViscoPlasticityPlasticityTest9_nj
-  StandardElastoViscoPlasticityPlasticityTest9_na
-  StandardElastoViscoPlasticityPlasticityTest9_nanj
-  StandardElastoViscoPlasticityPlasticityTest10
-  StandardElastoViscoPlasticityPlasticityTest10_nj
-  StandardElastoViscoPlasticityPlasticityTest10_na
-  StandardElastoViscoPlasticityPlasticityTest10_nanj
-  StandardElastoViscoPlasticityPlasticityTest11
-  StandardElastoViscoPlasticityPlasticityTest11_nj
-  StandardElastoViscoPlasticityPlasticityTest11_na
-  StandardElastoViscoPlasticityPlasticityTest11_nanj
-  StandardElastoViscoPlasticityPlasticityTest12
-  StandardElastoViscoPlasticityPlasticityTest12_nj
-  StandardElastoViscoPlasticityPlasticityTest12_na
-  StandardElastoViscoPlasticityPlasticityTest12_nanj
-  StandardElastoViscoPlasticityPlasticityTest13
-  StandardElastoViscoPlasticityPlasticityTest13_nj
-  StandardElastoViscoPlasticityPlasticityTest13_na
-  StandardElastoViscoPlasticityPlasticityTest13_nanj
-  StandardElastoViscoPlasticityPlasticityTest14
-  StandardElastoViscoPlasticityPlasticityTest14_nj
-  StandardElastoViscoPlasticityPlasticityTest14_na
-  StandardElastoViscoPlasticityPlasticityTest14_nanj
-  StandardElastoViscoPlasticityPlasticityTest15
-  StandardElastoViscoPlasticityPlasticityTest15_nj
-  StandardElastoViscoPlasticityPlasticityTest15_na
-  StandardElastoViscoPlasticityPlasticityTest15_nanj
-  StandardElastoViscoPlasticityPlasticityTest16
-  StandardElastoViscoPlasticityPlasticityTest16_nj
-  StandardElastoViscoPlasticityPlasticityTest17
-  StandardElastoViscoPlasticityPlasticityTest17_nj
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw_nj
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw2
-  StandardElastoViscoPlasticityIsotropicDamageHookeLaw2_nj
-  StandardElastoViscoPlasticityHyperbolicSineTest
-  StandardElastoViscoPlasticityHyperbolicSineTest_nj
-  StandardElastoViscoPlasticityHyperbolicSineTest2
-  StandardElastoViscoPlasticityHyperbolicSineTest2_nj
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest_nj
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2
-  StandardElastoViscoPlasticityHarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj
-  ChuNeedleman1980StrainBasedNucleationModelTest
-  ChuNeedleman1980StressBasedNucleationModelTest
-  PowerLawStrainBasedNucleationModelTest
-  PowerLawStressBasedNucleationModelTest
-  ElasticContributionToPorosityGrowth
-  GursonTvergaardNeedleman1982
-  RousselierTanguyBesson2002)
-
-  target_link_libraries(MFrontCastemStandardElastoViscoPlasticityBrickBehaviours
-    PRIVATE CastemInterface)
-endif(HAVE_CASTEM)
-
-function(castemtest_standardelastovicoplasticitybrick test_arg behaviour_name)
-  if(HAVE_CASTEM)
-    set(_REFERENCE_FILE )
-    set(_MODELLING_HYPOTHESES)
-	foreach(_ARG ${ARGN})
-	  if ( ${_ARG} MATCHES PLANESTRESS)
-	    list(APPEND _MODELLING_HYPOTHESES "PlaneStress")
-	  elseif ( ${_ARG} MATCHES TRIDIMENSIONAL)
-	    list(APPEND _MODELLING_HYPOTHESES "Tridimensional")
-	  elseif ( ${_ARG} MATCHES WILL_FAIL)
-	    set ( _WILL_FAIL ON)
-	  else()
-        set(_REFERENCE_FILE "${_ARG}")
-	  endif()
-	endforeach(_ARG ${ARGN})
-    if(NOT _MODELLING_HYPOTHESES)
-      set(_MODELLING_HYPOTHESES "Tridimensional")
-    endif(NOT _MODELLING_HYPOTHESES)
-    set(file "${CMAKE_CURRENT_SOURCE_DIR}/${test_arg}.mtest")
-    foreach(mh ${_MODELLING_HYPOTHESES})
-      foreach(rm ${IEEE754_ROUNDING_MODES})
-        if(NOT _REFERENCE_FILE)
-          add_test(NAME brick${test_arg}_${behaviour_name}_${mh}_${rm}_castem_mtest
-  	              COMMAND mtest --rounding-direction-mode=${rm}
-                  --verbose=level0 --xml-output=true
-                  --result-file-output=false
-                  --@AccelerationAlgorithm='Cast3M'
-                  --@ModellingHypothesis="${mh}"
-                  --@library@="$<TARGET_FILE:MFrontCastemStandardElastoViscoPlasticityBrickBehaviours>"
-                  --@behaviour@="${behaviour_name}"
-                  --@xml_output@="${test_arg}-${behaviour_name}-${rm}.xml" ${file})
-          add_test(NAME brick${test_arg}_${behaviour_name}_consistenttangentoperator_${mh}_${rm}_castem_mtest
-            	     COMMAND mtest --rounding-direction-mode=${rm}
-                  --verbose=level0 --xml-output=true --result-file-output=false
-                  --@StiffnessMatrixType='ConsistentTangentOperator'
-                  --@ModellingHypothesis="${mh}"
-                  --@library@="$<TARGET_FILE:MFrontCastemStandardElastoViscoPlasticityBrickBehaviours>"
-                  --@behaviour@="${behaviour_name}"
-                  --@xml_output@="${test_arg}-${behaviour_name}-consistenttangentoperator-${rm}.xml" ${file})
-        else(NOT _REFERENCE_FILE)
-          set(rfile "${top_srcdir}/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/references/${_REFERENCE_FILE}")
-          add_test(NAME brick${test_arg}_${behaviour_name}_${mh}_${rm}_castem_mtest
-            	     COMMAND mtest --rounding-direction-mode=${rm} --verbose=level0 --xml-output=true --result-file-output=false
-            	     --@AccelerationAlgorithm='Cast3M'
-                  --@ModellingHypothesis="${mh}"
-            	     --@library@="$<TARGET_FILE:MFrontCastemStandardElastoViscoPlasticityBrickBehaviours>"
-                  --@behaviour@="${behaviour_name}"
-            	     --@xml_output@="${test_arg}-${behaviour_name}-${rm}.xml"
-            	     --@reference_file@="${rfile}" ${file})
-          add_test(NAME brick${test_arg}_${behaviour_name}_consistenttangentoperator_${mh}_${rm}_castem_mtest
-            	     COMMAND mtest --rounding-direction-mode=${rm} --verbose=level0 --xml-output=true --result-file-output=false
-            	     --@StiffnessMatrixType='ConsistentTangentOperator'
-                  --@ModellingHypothesis="${mh}"
-            	     --@library@="$<TARGET_FILE:MFrontCastemStandardElastoViscoPlasticityBrickBehaviours>"
-                  --@behaviour@="${behaviour_name}"
-            	     --@xml_output@="${test_arg}-${behaviour_name}-consistenttangentoperator-${rm}.xml"
-            	     --@reference_file@="${rfile}" ${file})
-        endif(NOT _REFERENCE_FILE)
-        if((CMAKE_HOST_WIN32) AND (NOT MSYS))
-            	set_property(TEST brick${test_arg}_${behaviour_name}_${mh}_${rm}_castem_mtest
-            	  PROPERTY DEPENDS "MFrontCastemStandardElastoViscoPlasticityBrickBehaviours MFrontMaterialProperties-castem mtest"
-            	  PROPERTY ENVIRONMENT "PATH=$<TARGET_FILE_DIR:TFELMTest>\;$<TARGET_FILE_DIR:TFELMFront>\;$<TARGET_FILE_DIR:MFrontLogStream>\;$<TARGET_FILE_DIR:TFELMaterial>\;$<TARGET_FILE_DIR:TFELNUMODIS>\;$<TARGET_FILE_DIR:TFELMathParser>\;$<TARGET_FILE_DIR:TFELGlossary>\;$<TARGET_FILE_DIR:TFELSystem>\;$<TARGET_FILE_DIR:TFELUtilities>\;$<TARGET_FILE_DIR:TFELException>\;$<TARGET_FILE_DIR:TFELTests>\;$<TARGET_FILE_DIR:TFELConfig>\;$<TARGET_FILE_DIR:TFELUnicodeSupport>\;$ENV{PATH}")
-            	set_property(TEST brick${test_arg}_${behaviour_name}_consistenttangentoperator_${mh}_${rm}_castem_mtest
-            	  PROPERTY DEPENDS "MFrontCastemStandardElastoViscoPlasticityBrickBehaviours MFrontMaterialProperties-castem mtest"
-            	  PROPERTY ENVIRONMENT "PATH=$<TARGET_FILE_DIR:TFELMTest>\;$<TARGET_FILE_DIR:TFELMFront>\;$<TARGET_FILE_DIR:MFrontLogStream>\;$<TARGET_FILE_DIR:TFELMaterial>\;$<TARGET_FILE_DIR:TFELNUMODIS>\;$<TARGET_FILE_DIR:TFELMathParser>\;$<TARGET_FILE_DIR:TFELGlossary>\;$<TARGET_FILE_DIR:TFELSystem>\;$<TARGET_FILE_DIR:TFELUtilities>\;$<TARGET_FILE_DIR:TFELException>\;$<TARGET_FILE_DIR:TFELTests>\;$<TARGET_FILE_DIR:TFELConfig>\;$<TARGET_FILE_DIR:TFELUnicodeSupport>\;$ENV{PATH}")
-        elseif((CMAKE_HOST_WIN32) AND (NOT MSYS))
-          set_property(TEST brick${test_arg}_${behaviour_name}_${mh}_${rm}_castem_mtest
-            	  PROPERTY DEPENDS "MFrontCastemStandardElastoViscoPlasticityBrickBehaviours MFrontMaterialProperties-castem mtest")
-          set_property(TEST brick${test_arg}_${behaviour_name}_consistenttangentoperator_${mh}_${rm}_castem_mtest
-            	  PROPERTY DEPENDS "MFrontCastemStandardElastoViscoPlasticityBrickBehaviours MFrontMaterialProperties-castem mtest")
-        endif((CMAKE_HOST_WIN32) AND (NOT MSYS))
-      endforeach(rm ${IEEE754_ROUNDING_MODES})
-    endforeach(mh ${_MODELLING_HYPOTHESES})
-    if(TFEL_APPEND_SUFFIX)
-      install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem"
-	COMPONENT mtest)
-    else(TFEL_APPEND_SUFFIX)
-      install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem"
-	COMPONENT mtest)
-    endif(TFEL_APPEND_SUFFIX)
-  endif(HAVE_CASTEM)
-endfunction(castemtest_standardelastovicoplasticitybrick)
-
-function(castemtest_standardelastovicoplasticitybrick_python test)
-  configure_file(castemtest_standardelastovicoplasticitybrick_python_${test}.py.in
-    castemtest_standardelastovicoplasticitybrick_python_${test}.py @ONLY)
-  add_test(NAME castemtest_standardelastovicoplasticitybrick_python_${test}_py
-    COMMAND ${PYTHON_EXECUTABLE} castemtest_standardelastovicoplasticitybrick_python_${test}.py)
-  set_tests_properties(castemtest_standardelastovicoplasticitybrick_python_${test}_py
-    PROPERTIES DEPENDS MFrontCastemStandardElastoViscoPlasticityBrickBehaviours)
-  if(CMAKE_CONFIGURATION_TYPES)
-    set_tests_properties(castemtest_standardelastovicoplasticitybrick_python_${test}_py
-      PROPERTIES ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/bindings/python;$<TARGET_FILE_DIR:py_std__stl_vector>;$<TARGET_FILE_DIR:py_tfel_tests>")
-  else(CMAKE_CONFIGURATION_TYPES)
-    set_tests_properties(castemtest_standardelastovicoplasticitybrick_python_${test}_py
-      PROPERTIES ENVIRONMENT "PYTHONPATH=${PROJECT_BINARY_DIR}/bindings/python")
-  endif(CMAKE_CONFIGURATION_TYPES)
-endfunction(castemtest_standardelastovicoplasticitybrick_python)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest
-  umatstandardelastoviscoplasticitynortontest)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest
-  umatstandardelastoviscoplasticitynortontest_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest2
-  umatstandardelastoviscoplasticitynortontest2)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest2
-  umatstandardelastoviscoplasticitynortontest2_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest3
-  umatstandardelastoviscoplasticitynortontest3)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest3
-  umatstandardelastoviscoplasticitynortontest3_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest4
-  umatstandardelastoviscoplasticitynortontest4)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest4
-  umatstandardelastoviscoplasticitynortontest4_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest5
-  umatstandardelastoviscoplasticitynortontest5)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest5
-  umatstandardelastoviscoplasticitynortontest5_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest6-1
-  umatstandardelastoviscoplasticitynortontest6)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest6-1
-  umatstandardelastoviscoplasticitynortontest6_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest6-2
-  umatstandardelastoviscoplasticitynortontest6)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest6-2
-  umatstandardelastoviscoplasticitynortontest6_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest7
-  umatstandardelastoviscoplasticitynortontest7 standardelastoviscoplasticitynortontest7.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest7
-  umatstandardelastoviscoplasticitynortontest7_nj standardelastoviscoplasticitynortontest7.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest8_E
-  umatstandardelastoviscoplasticitynortontest8
-  standardelastoviscoplasticitynortontest8_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest8_S
-  umatstandardelastoviscoplasticitynortontest8
-  standardelastoviscoplasticitynortontest8_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest8-cyclic_E
-  umatstandardelastoviscoplasticitynortontest8
-  standardelastoviscoplasticitynortontest8-cyclic_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest8-cyclic_S
-  umatstandardelastoviscoplasticitynortontest8
-  standardelastoviscoplasticitynortontest8-cyclic_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest8_E
-  umatstandardelastoviscoplasticitynortontest8_nj
-  standardelastoviscoplasticitynortontest8_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest8_S
-  umatstandardelastoviscoplasticitynortontest8_nj
-  standardelastoviscoplasticitynortontest8_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest8-cyclic_E
-  umatstandardelastoviscoplasticitynortontest8_nj
-  standardelastoviscoplasticitynortontest8-cyclic_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest8-cyclic_S
-  umatstandardelastoviscoplasticitynortontest8_nj
-  standardelastoviscoplasticitynortontest8-cyclic_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest9_E
-  umatstandardelastoviscoplasticitynortontest9
-  standardelastoviscoplasticitynortontest9_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest9_S
-  umatstandardelastoviscoplasticitynortontest9
-  standardelastoviscoplasticitynortontest9_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest9-cyclic_E
-  umatstandardelastoviscoplasticitynortontest9
-  standardelastoviscoplasticitynortontest9-cyclic_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest9-cyclic_S
-  umatstandardelastoviscoplasticitynortontest9
-  standardelastoviscoplasticitynortontest9-cyclic_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest9_E
-  umatstandardelastoviscoplasticitynortontest9_nj
-  standardelastoviscoplasticitynortontest9_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest9_S
-  umatstandardelastoviscoplasticitynortontest9_nj
-  standardelastoviscoplasticitynortontest9_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest9-cyclic_E
-  umatstandardelastoviscoplasticitynortontest9_nj
-  standardelastoviscoplasticitynortontest9-cyclic_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest9-cyclic_S
-  umatstandardelastoviscoplasticitynortontest9_nj
-  standardelastoviscoplasticitynortontest9-cyclic_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityorthotropicnortontest
-  umatstandardelastoviscoplasticityorthotropicnortontest)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityorthotropicnortontest
-  umatstandardelastoviscoplasticityorthotropicnortontest_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityorthotropicnortontest
-  umatstandardelastoviscoplasticityorthotropicnortontest_na)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityorthotropicnortontest
-  umatstandardelastoviscoplasticityorthotropicnortontest_nanj)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityhyperbolicsinetest
-  umatstandardelastoviscoplasticityhyperbolicsinetest)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityhyperbolicsinetest
-  umatstandardelastoviscoplasticityhyperbolicsinetest_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityhyperbolicsinetest2
-  umatstandardelastoviscoplasticityhyperbolicsinetest2)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityhyperbolicsinetest2
-  umatstandardelastoviscoplasticityhyperbolicsinetest2_nj)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest
-  umatstandardelastoviscoplasticityplasticitytest
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest_nj
-  umatstandardelastoviscoplasticityplasticitytest_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest
-  umatstandardelastoviscoplasticityplasticitytest_na
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest_nj
-  umatstandardelastoviscoplasticityplasticitytest_nanj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest2
-  umatstandardelastoviscoplasticityplasticitytest2
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest2_nj
-  umatstandardelastoviscoplasticityplasticitytest2_nj
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest3
-  umatstandardelastoviscoplasticityplasticitytest3
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest3_nj
-  umatstandardelastoviscoplasticityplasticitytest3_nj
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest4
-  umatstandardelastoviscoplasticityplasticitytest4 standardelastoviscoplasticityplasticitytest4.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest5
-  umatstandardelastoviscoplasticityplasticitytest5
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest5_nj
-  umatstandardelastoviscoplasticityplasticitytest5_nj
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest6
-  umatstandardelastoviscoplasticityplasticitytest6 standardelastoviscoplasticityplasticitytest6.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest6
-  umatstandardelastoviscoplasticityplasticitytest6_nj standardelastoviscoplasticityplasticitytest6.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest7_E
-  umatstandardelastoviscoplasticityplasticitytest7
-  standardelastoviscoplasticityplasticitytest7_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest7_S
-  umatstandardelastoviscoplasticityplasticitytest7
-  standardelastoviscoplasticityplasticitytest7_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest7-cyclic_E
-  umatstandardelastoviscoplasticityplasticitytest7
-  standardelastoviscoplasticityplasticitytest7-cyclic_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest7-cyclic_S
-  umatstandardelastoviscoplasticityplasticitytest7
-  standardelastoviscoplasticityplasticitytest7-cyclic_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest7_E
-  umatstandardelastoviscoplasticityplasticitytest7_nj
-  standardelastoviscoplasticityplasticitytest7_E.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest7_S
-  umatstandardelastoviscoplasticityplasticitytest7_nj
-  standardelastoviscoplasticityplasticitytest7_S.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest7-cyclic_E
-  umatstandardelastoviscoplasticityplasticitytest7_nj
-  standardelastoviscoplasticityplasticitytest7-cyclic_E.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest7-cyclic_S
-  umatstandardelastoviscoplasticityplasticitytest7_nj
-  standardelastoviscoplasticityplasticitytest7-cyclic_S.ref)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest8
-  umatstandardelastoviscoplasticityplasticitytest8 standardelastoviscoplasticityplasticitytest8.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest8_nj
-  umatstandardelastoviscoplasticityplasticitytest8_nj standardelastoviscoplasticityplasticitytest8_nj.ref)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11_E
-  umatstandardelastoviscoplasticityplasticitytest11
-  standardelastoviscoplasticityplasticitytest11_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11_E
-  umatstandardelastoviscoplasticityplasticitytest11_na
-  standardelastoviscoplasticityplasticitytest11_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11_E
-  umatstandardelastoviscoplasticityplasticitytest11_nj
-  standardelastoviscoplasticityplasticitytest11_E.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11_E
-  umatstandardelastoviscoplasticityplasticitytest11_nanj
-  standardelastoviscoplasticityplasticitytest11_E.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11_S
-  umatstandardelastoviscoplasticityplasticitytest11
-  standardelastoviscoplasticityplasticitytest11_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11_S
-  umatstandardelastoviscoplasticityplasticitytest11_na
-  standardelastoviscoplasticityplasticitytest11_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11_S
-  umatstandardelastoviscoplasticityplasticitytest11_nj
-  standardelastoviscoplasticityplasticitytest11_S.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11_S
-  umatstandardelastoviscoplasticityplasticitytest11_nanj
-  standardelastoviscoplasticityplasticitytest11_S.ref)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11-cyclic_E
-  umatstandardelastoviscoplasticityplasticitytest11
-  standardelastoviscoplasticityplasticitytest11-cyclic_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11-cyclic_E
-  umatstandardelastoviscoplasticityplasticitytest11_na
-  standardelastoviscoplasticityplasticitytest11-cyclic_E.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11-cyclic_E
-  umatstandardelastoviscoplasticityplasticitytest11_nj
-  standardelastoviscoplasticityplasticitytest11-cyclic_E.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11-cyclic_E
-  umatstandardelastoviscoplasticityplasticitytest11_nanj
-  standardelastoviscoplasticityplasticitytest11-cyclic_E.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11-cyclic_S
-  umatstandardelastoviscoplasticityplasticitytest11
-  standardelastoviscoplasticityplasticitytest11-cyclic_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11-cyclic_S
-  umatstandardelastoviscoplasticityplasticitytest11_na
-  standardelastoviscoplasticityplasticitytest11-cyclic_S.ref
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11-cyclic_S
-  umatstandardelastoviscoplasticityplasticitytest11_nj
-  standardelastoviscoplasticityplasticitytest11-cyclic_S.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest11-cyclic_S
-  umatstandardelastoviscoplasticityplasticitytest11_nanj
-  standardelastoviscoplasticityplasticitytest11-cyclic_S.ref)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest12
-  umatstandardelastoviscoplasticityplasticitytest12 PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest12
-  umatstandardelastoviscoplasticityplasticitytest12_nj PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest12
-  umatstandardelastoviscoplasticityplasticitytest12_na PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest12
-  umatstandardelastoviscoplasticityplasticitytest12_nanj PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest13
-  umatstandardelastoviscoplasticityplasticitytest13 PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest13
-  umatstandardelastoviscoplasticityplasticitytest13_nj PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest13
-  umatstandardelastoviscoplasticityplasticitytest13_na PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest13
-  umatstandardelastoviscoplasticityplasticitytest13_nanj PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest14
-  umatstandardelastoviscoplasticityplasticitytest14)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest14
-  umatstandardelastoviscoplasticityplasticitytest14_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest14
-  umatstandardelastoviscoplasticityplasticitytest14_na)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest14
-  umatstandardelastoviscoplasticityplasticitytest14_nanj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest16
-  umatstandardelastoviscoplasticityplasticitytest16 standardelastoviscoplasticityplasticitytest16.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest16
-  umatstandardelastoviscoplasticityplasticitytest16_nj standardelastoviscoplasticityplasticitytest16.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest17
-  umatstandardelastoviscoplasticityplasticitytest17 standardelastoviscoplasticityplasticitytest17.ref)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityplasticitytest17
-  umatstandardelastoviscoplasticityplasticitytest17_nj standardelastoviscoplasticityplasticitytest17.ref)
-
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityisotropicdamagehookelaw
-  umatstandardelastoviscoplasticityisotropicdamagehookelaw
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityisotropicdamagehookelaw
-  umatstandardelastoviscoplasticityisotropicdamagehookelaw_nj
-  PLANESTRESS TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityisotropicdamagehookelaw2
-  umatstandardelastoviscoplasticityisotropicdamagehookelaw2 TRIDIMENSIONAL)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticityisotropicdamagehookelaw2
-  umatstandardelastoviscoplasticityisotropicdamagehookelaw2_nj)
-
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest
-  umatstandardelastoviscoplasticityharmonicsumofnortonhoffviscoplasticflowstest)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest
-  umatstandardelastoviscoplasticityharmonicsumofnortonhoffviscoplasticflowstest_nj)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest
-  umatstandardelastoviscoplasticityharmonicsumofnortonhoffviscoplasticflowstest2)
-castemtest_standardelastovicoplasticitybrick(castemstandardelastoviscoplasticitynortontest
-  umatstandardelastoviscoplasticityharmonicsumofnortonhoffviscoplasticflowstest2_nj)
-
-
-if(enable-python-bindings)
-#  castemtest_standardelastovicoplasticitybrick_python(Cazacu_2001)
-endif(enable-python-bindings)
-

From 2ea66209e06d4fc0a2dd2c79cd067117e1409511 Mon Sep 17 00:00:00 2001
From: Thomas Helfer <thomas.helfer@cea.fr>
Date: Sat, 21 Dec 2024 15:31:37 +0100
Subject: [PATCH 2/3] change install paths

---
 mfront/tests/behaviours/DDIF2/CMakeLists.txt  |  12 +-
 .../behaviours/DDIF2/castem/CMakeLists.txt    |   4 +-
 .../FiniteStrainSingleCrystal/CMakeLists.txt  |   4 +-
 .../aster/CMakeLists.txt                      |   4 +-
 .../castem/CMakeLists.txt                     |   4 +-
 .../StandardElasticity/CMakeLists.txt         |  36 ++--
 .../StandardElasticity/castem/CMakeLists.txt  |   4 +-
 .../StandardElasticity/cyrano/CMakeLists.txt  |   4 +-
 .../CMakeLists.txt                            | 200 +++++++++---------
 .../castem/CMakeLists.txt                     |   4 +-
 .../generic/CMakeLists.txt                    |   4 +-
 .../tests/behaviours/dianafea/CMakeLists.txt  |   4 +-
 12 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/mfront/tests/behaviours/DDIF2/CMakeLists.txt b/mfront/tests/behaviours/DDIF2/CMakeLists.txt
index 6dc4ec5a9..dbe1d8531 100644
--- a/mfront/tests/behaviours/DDIF2/CMakeLists.txt
+++ b/mfront/tests/behaviours/DDIF2/CMakeLists.txt
@@ -1,10 +1,10 @@
 add_subdirectory(castem)
 # add_subdirectory(aster)
 
-install_mfront_data(tests/behavioursbricks/DDIF2 DDIF2.mfront)
-install_mfront_data(tests/behavioursbricks/DDIF2 DDIF2_2.mfront)
-install_mfront_data(tests/behavioursbricks/DDIF2 DDIF2_3.mfront)
-install_mfront_data(tests/behavioursbricks/DDIF2 DDIF2_4.mfront)
-install_mfront_data(tests/behavioursbricks/DDIF2 DDIF2_5.mfront)
-install_mfront_data(tests/behavioursbricks/DDIF2 DDIF2_6.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_2.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_3.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_4.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_5.mfront)
+install_mfront_data(tests/behaviours/DDIF2 DDIF2_6.mfront)
 
diff --git a/mfront/tests/behaviours/DDIF2/castem/CMakeLists.txt b/mfront/tests/behaviours/DDIF2/castem/CMakeLists.txt
index 54f7a147c..035c2240d 100644
--- a/mfront/tests/behaviours/DDIF2/castem/CMakeLists.txt
+++ b/mfront/tests/behaviours/DDIF2/castem/CMakeLists.txt
@@ -53,11 +53,11 @@ macro(castemtest_ddif2brick test_arg behaviour)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/DDIF2/castem"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/DDIF2/castem"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/DDIF2/castem"
+	DESTINATION "share/doc/mfront/tests/behaviours/DDIF2/castem"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CASTEM)
diff --git a/mfront/tests/behaviours/FiniteStrainSingleCrystal/CMakeLists.txt b/mfront/tests/behaviours/FiniteStrainSingleCrystal/CMakeLists.txt
index 1f37d0f5c..6d31046da 100644
--- a/mfront/tests/behaviours/FiniteStrainSingleCrystal/CMakeLists.txt
+++ b/mfront/tests/behaviours/FiniteStrainSingleCrystal/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(castem)
 add_subdirectory(aster)
 
-install_mfront_data(tests/behavioursbricks/FiniteStrainSingleCrystal FiniteStrainSingleCrystal.mfront)
-install_mfront_data(tests/behavioursbricks/FiniteStrainSingleCrystal FiniteStrainSingleCrystal_NumericalJacobian.mfront)
+install_mfront_data(tests/behaviours/FiniteStrainSingleCrystal FiniteStrainSingleCrystal.mfront)
+install_mfront_data(tests/behaviours/FiniteStrainSingleCrystal FiniteStrainSingleCrystal_NumericalJacobian.mfront)
diff --git a/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/CMakeLists.txt b/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/CMakeLists.txt
index 740f7e25c..64c7a3a0c 100644
--- a/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/CMakeLists.txt
+++ b/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/CMakeLists.txt
@@ -39,11 +39,11 @@ macro(astertest_finitestrainsinglecrystalbrick test_arg behaviour)
     endif((CMAKE_HOST_WIN32) AND (NOT MSYS))
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/FiniteStrainSingleCrystal/aster/"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/aster/"
+	DESTINATION "share/doc/mfront/tests/behaviours/FiniteStrainSingleCrystal/aster/"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_ASTER)
diff --git a/mfront/tests/behaviours/FiniteStrainSingleCrystal/castem/CMakeLists.txt b/mfront/tests/behaviours/FiniteStrainSingleCrystal/castem/CMakeLists.txt
index 2fada2ae7..ca1897ea1 100644
--- a/mfront/tests/behaviours/FiniteStrainSingleCrystal/castem/CMakeLists.txt
+++ b/mfront/tests/behaviours/FiniteStrainSingleCrystal/castem/CMakeLists.txt
@@ -55,11 +55,11 @@ macro(castemtest_finitestrainsinglecrystalbrick test_arg behaviour)
     endif((CMAKE_HOST_WIN32) AND (NOT MSYS))
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/FiniteStrainSingleCrystal/castem/"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/FiniteStrainSingleCrystal/castem/"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/FiniteStrainSingleCrystal/castem/"
+	DESTINATION "share/doc/mfront/tests/behaviours/FiniteStrainSingleCrystal/castem/"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CASTEM)
diff --git a/mfront/tests/behaviours/StandardElasticity/CMakeLists.txt b/mfront/tests/behaviours/StandardElasticity/CMakeLists.txt
index 9022e36af..54ec5a4ec 100644
--- a/mfront/tests/behaviours/StandardElasticity/CMakeLists.txt
+++ b/mfront/tests/behaviours/StandardElasticity/CMakeLists.txt
@@ -2,21 +2,21 @@ add_subdirectory(aster)
 add_subdirectory(castem)
 add_subdirectory(cyrano)
 
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity3.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity4.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity5.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity7.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity8.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity9.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity10.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity11.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity12.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity IsotropicStandardElasticity13.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity OrthotropicStandardElasticity.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity OrthotropicStandardElasticity2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity OrthotropicStandardElasticity3.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity TestComputeElasticPrediction.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity TestComputeElasticPrediction2.mfront)
-install_mfront_data(tests/behavioursbricks/StandardElasticity SingleCrystal_DD_FCC.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity2.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity3.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity4.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity5.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity7.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity8.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity9.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity10.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity11.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity12.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity IsotropicStandardElasticity13.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity OrthotropicStandardElasticity.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity OrthotropicStandardElasticity2.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity OrthotropicStandardElasticity3.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity TestComputeElasticPrediction.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity TestComputeElasticPrediction2.mfront)
+install_mfront_data(tests/behaviours/StandardElasticity SingleCrystal_DD_FCC.mfront)
diff --git a/mfront/tests/behaviours/StandardElasticity/castem/CMakeLists.txt b/mfront/tests/behaviours/StandardElasticity/castem/CMakeLists.txt
index a44789a14..1b9c5941b 100644
--- a/mfront/tests/behaviours/StandardElasticity/castem/CMakeLists.txt
+++ b/mfront/tests/behaviours/StandardElasticity/castem/CMakeLists.txt
@@ -86,11 +86,11 @@ macro(castemtest_standardelasticitybrick test_arg behaviour)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElasticity/castem"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/StandardElasticity/castem"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElasticity/castem"
+	DESTINATION "share/doc/mfront/tests/behaviours/StandardElasticity/castem"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CASTEM)
diff --git a/mfront/tests/behaviours/StandardElasticity/cyrano/CMakeLists.txt b/mfront/tests/behaviours/StandardElasticity/cyrano/CMakeLists.txt
index d301c9ce8..f65ee765c 100644
--- a/mfront/tests/behaviours/StandardElasticity/cyrano/CMakeLists.txt
+++ b/mfront/tests/behaviours/StandardElasticity/cyrano/CMakeLists.txt
@@ -66,11 +66,11 @@ macro(cyranotest_standardelasticitybrick test_arg behaviour)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElasticity/cyrano/"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/StandardElasticity/cyrano/"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElasticity/cyrano/"
+	DESTINATION "share/doc/mfront/tests/behaviours/StandardElasticity/cyrano/"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CYRANO)
diff --git a/mfront/tests/behaviours/StandardElastoViscoPlasticity/CMakeLists.txt b/mfront/tests/behaviours/StandardElastoViscoPlasticity/CMakeLists.txt
index c9aae009d..3ae039503 100644
--- a/mfront/tests/behaviours/StandardElastoViscoPlasticity/CMakeLists.txt
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/CMakeLists.txt
@@ -1,210 +1,210 @@
 add_subdirectory(castem)
 add_subdirectory(generic)
 
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   Test1.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   Test2.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   Test3.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   Test4.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   Test5.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   Test6.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest2.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest2_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest3.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest3_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest4.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest4_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest5.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest5_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest6.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest6_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest7.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest7_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest8.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest8_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest9.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	NortonTest9_nj.mfront)
 
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	HyperbolicSineTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	HyperbolicSineTest_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	HyperbolicSineTest2.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	HyperbolicSineTest2_nj.mfront)
 
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	OrthotropicNortonTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	OrthotropicNortonTest_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	OrthotropicNortonTest_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	OrthotropicNortonTest_nanj.mfront)
 
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest_nanj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest2.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest2_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest3.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest3_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest4.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest4_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest5.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest5_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest6.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest6_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest7.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest7_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest8.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest8_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest9.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest9_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest9_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest9_nanj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest10.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest10_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest10_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest10_nanj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest11.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest11_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest11_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest11_nanj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest12.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest12_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest12_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest12_nanj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest13.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest13_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest13_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest13_nanj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest14.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest14_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest14_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest14_nanj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest15.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest15_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest15_na.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest15_nanj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest16.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest16_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest17.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PlasticityTest17_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   HarmonicSumOfNortonHoffViscoplasticFlowsTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   HarmonicSumOfNortonHoffViscoplasticFlowsTest_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   HarmonicSumOfNortonHoffViscoplasticFlowsTest2.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   HarmonicSumOfNortonHoffViscoplasticFlowsTest2_nj.mfront)
 
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	 IsotropicDamageHookeLaw.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	 IsotropicDamageHookeLaw_nj.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	 IsotropicDamageHookeLaw2.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
   IsotropicDamageHookeLaw2_nj.mfront)
 
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	ChuNeedleman1980StrainBasedNucleationModelTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	ChuNeedleman1980StressBasedNucleationModelTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PowerLawStrainBasedNucleationModelTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
 	PowerLawStressBasedNucleationModelTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
         ElasticContributionToPorosityGrowth.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
         GursonTvergaardNeedleman1982.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
         RousselierTanguyBesson2002.mfront)
 
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
         UserDefinedViscoplasticityTest.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
         UserDefinedViscoplasticityTest2.mfront)
-install_mfront_data(tests/behaviours/bricks/StandardElastoViscoPlasticity
+install_mfront_data(tests/behaviours/StandardElastoViscoPlasticity
         UserDefinedViscoplasticityTest3.mfront)
       
diff --git a/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/CMakeLists.txt b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/CMakeLists.txt
index edc564049..b89a22335 100644
--- a/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/CMakeLists.txt
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem/CMakeLists.txt
@@ -178,11 +178,11 @@ function(castemtest_standardelastovicoplasticitybrick test_arg behaviour_name)
     endforeach(mh ${_MODELLING_HYPOTHESES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/StandardElastoViscoPlasticity/castem"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem"
+	DESTINATION "share/doc/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_CASTEM)
diff --git a/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/CMakeLists.txt b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/CMakeLists.txt
index 50cc1ca7e..1b40fcc46 100644
--- a/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/CMakeLists.txt
+++ b/mfront/tests/behaviours/StandardElastoViscoPlasticity/generic/CMakeLists.txt
@@ -190,11 +190,11 @@ function(generictest_standardelastovicoplasticitybrick test_name test_file libra
   endforeach(mh ${_MODELLING_HYPOTHESES})
   if(TFEL_APPEND_SUFFIX)
     install(FILES ${file}
-      DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/generic"
+      DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/generic"
       COMPONENT mtest)
   else(TFEL_APPEND_SUFFIX)
     install(FILES ${file}
-      DESTINATION "share/doc/mfront/tests/behaviours/bricks/generic"
+      DESTINATION "share/doc/mfront/tests/behaviours/generic"
       COMPONENT mtest)
   endif(TFEL_APPEND_SUFFIX)
 endfunction(generictest_standardelastovicoplasticitybrick)
diff --git a/mfront/tests/behaviours/dianafea/CMakeLists.txt b/mfront/tests/behaviours/dianafea/CMakeLists.txt
index 61bad9960..45befcb8f 100644
--- a/mfront/tests/behaviours/dianafea/CMakeLists.txt
+++ b/mfront/tests/behaviours/dianafea/CMakeLists.txt
@@ -92,11 +92,11 @@ function(test_dianafea test_arg)
     endforeach(rm ${IEEE754_ROUNDING_MODES})
     if(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem"
+	DESTINATION "share/doc/mfront-${TFEL_SUFFIX}/tests/behaviours/StandardElastoViscoPlasticity/castem"
 	COMPONENT mtest)
     else(TFEL_APPEND_SUFFIX)
       install(FILES ${file}
-	DESTINATION "share/doc/mfront/tests/behaviours/bricks/StandardElastoViscoPlasticity/castem"
+	DESTINATION "share/doc/mfront/tests/behaviours/StandardElastoViscoPlasticity/castem"
 	COMPONENT mtest)
     endif(TFEL_APPEND_SUFFIX)
   endif(HAVE_DIANAFEA)

From e4e5e19e593895e7d5fce97dd4c3e085bf69491b Mon Sep 17 00:00:00 2001
From: Thomas Helfer <thomas.helfer@cea.fr>
Date: Sat, 21 Dec 2024 18:42:16 +0100
Subject: [PATCH 3/3] fix env.bat

---
 CMakeLists.txt   |  1 +
 env-win32.bat.in | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2566304f..8fc48ad28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -481,6 +481,7 @@ if(CMAKE_HOST_WIN32 OR CYGWIN OR MSYS)
   else(MSYS)
      set(TFEL_BINARY_DIR "${PROJECT_BINARY_DIR}")
   endif(MSYS)	      
+  cmake_path(NATIVE_PATH TFEL_BINARY_DIR NORMALIZE TFEL_BINARY_DIR_NATIVE_PATH)  
   if(CMAKE_CONFIGURATION_TYPES)
     foreach(conf ${CMAKE_CONFIGURATION_TYPES})
       set(TFEL_CONF_DIR "/${conf}")
diff --git a/env-win32.bat.in b/env-win32.bat.in
index 8fd624873..de657639a 100644
--- a/env-win32.bat.in
+++ b/env-win32.bat.in
@@ -1,13 +1,13 @@
-set PATH=@TFEL_BINARY_DIR@/mtest/src@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/mfront/src@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/NUMODIS@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Material@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Tests@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Math@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Utilities@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Exception@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Glossary@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/System@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/Config@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/PhysicalConstants@TFEL_CONF_DIR@;%PATH%
-set PATH=@TFEL_BINARY_DIR@/src/UnicodeSupport@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\mtest\src@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\mfront\src@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\NUMODIS@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Material@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Tests@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Math@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Utilities@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Exception@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Glossary@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\System@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\Config@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\PhysicalConstants@TFEL_CONF_DIR@;%PATH%
+set PATH=@TFEL_BINARY_DIR_NATIVE_PATH@\src\UnicodeSupport@TFEL_CONF_DIR@;%PATH%