From: ageay <ageay>
Date: Wed, 28 Sep 2011 09:04:48 +0000 (+0000)
Subject: Split of MEDCoupling ttsts in several testsuits to make easier debugging.
X-Git-Tag: V6_main_FINAL~945
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=795959a47385a62fcfbca1b8ecc8cebd2fc3c6db;p=tools%2Fmedcoupling.git

Split of MEDCoupling ttsts in several testsuits to make easier debugging.
---

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest.hxx
index 11d3b7e85..99168c6bd 100644
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest.hxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest.hxx
@@ -34,603 +34,6 @@ namespace ParaMEDMEM
 
   class MEDCouplingBasicsTest : public CppUnit::TestFixture
   {
-    CPPUNIT_TEST_SUITE(MEDCouplingBasicsTest);
-    //MEDCouplingBasicsTest1.cxx
-    CPPUNIT_TEST( testArray );
-    CPPUNIT_TEST( testArray2 );
-    CPPUNIT_TEST( testArray3 );
-    CPPUNIT_TEST( testMesh );
-    CPPUNIT_TEST( testMeshPointsCloud );
-    CPPUNIT_TEST( testMeshM1D );
-    CPPUNIT_TEST( testDeepCopy );
-    CPPUNIT_TEST( testRevNodal );
-    CPPUNIT_TEST( testConvertToPolyTypes );
-    CPPUNIT_TEST( testDescConn2D );
-    CPPUNIT_TEST( testDescConn3D );
-    CPPUNIT_TEST( testFindBoundaryNodes );
-    CPPUNIT_TEST( testBoundaryMesh );
-    CPPUNIT_TEST( testBuildPartOfMySelf );
-    CPPUNIT_TEST( testBuildPartOfMySelfNode );
-    CPPUNIT_TEST( testZipCoords );
-    CPPUNIT_TEST( testZipConnectivity );
-    CPPUNIT_TEST( testEqualMesh );
-    CPPUNIT_TEST( testEqualFieldDouble );
-    CPPUNIT_TEST( testNatureChecking );
-    CPPUNIT_TEST( testBuildSubMeshData );
-    CPPUNIT_TEST( testExtrudedMesh1 );
-    CPPUNIT_TEST( testExtrudedMesh2 );
-    CPPUNIT_TEST( testExtrudedMesh3 );
-    CPPUNIT_TEST( testExtrudedMesh4 );
-    CPPUNIT_TEST( testFindCommonNodes );
-    CPPUNIT_TEST( testCheckButterflyCells );
-    CPPUNIT_TEST( testMergeMesh1 );
-    CPPUNIT_TEST( testMergeMeshOnSameCoords1 );
-    CPPUNIT_TEST( testMergeField1 );
-    CPPUNIT_TEST( testFillFromAnalytic );
-    CPPUNIT_TEST( testFillFromAnalytic2 );
-    CPPUNIT_TEST( testApplyFunc );
-    CPPUNIT_TEST( testApplyFunc2 );
-    CPPUNIT_TEST( testOperationsOnFields );
-    CPPUNIT_TEST( testOperationsOnFields2 );
-    CPPUNIT_TEST( testOperationsOnFields3 );
-    CPPUNIT_TEST( testOperationsOnFields4 );
-    CPPUNIT_TEST( testMergeNodesOnField );
-    CPPUNIT_TEST( testCheckConsecutiveCellTypes );
-    CPPUNIT_TEST( testRearrange2ConsecutiveCellTypes );
-    CPPUNIT_TEST( testSplitByType );
-    CPPUNIT_TEST( testFuseUMeshesOnSameCoords );
-    CPPUNIT_TEST( testFuseUMeshesOnSameCoords2 );
-    CPPUNIT_TEST( testBuildOrthogonalField );
-    CPPUNIT_TEST( testGetCellsContainingPoint );
-    CPPUNIT_TEST( testGetValueOn1 );
-    CPPUNIT_TEST( testCMesh0 );
-    CPPUNIT_TEST( testScale );
-    CPPUNIT_TEST( testTryToShareSameCoords );
-    CPPUNIT_TEST( testFindNodeOnPlane );
-    CPPUNIT_TEST( testRenumberCells );
-    CPPUNIT_TEST( testChangeSpaceDimension );
-    //MEDCouplingBasicsTest2.cxx
-    CPPUNIT_TEST( testGaussPointField1 );
-    CPPUNIT_TEST( testGaussPointNEField1 );
-    CPPUNIT_TEST( testCellOrientation1 );
-    CPPUNIT_TEST( testCellOrientation2 );
-    CPPUNIT_TEST( testPolyhedronBarycenter );
-    CPPUNIT_TEST( testNormL12Integ1D );
-    CPPUNIT_TEST( testAreaBary2D );
-    CPPUNIT_TEST( testAreaBary3D );
-    CPPUNIT_TEST( testRenumberCellsForFields );
-    CPPUNIT_TEST( testRenumberNodesForFields );
-    CPPUNIT_TEST( testConvertQuadraticCellsToLinear );
-    CPPUNIT_TEST( testCheckGeoEquivalWith );
-    CPPUNIT_TEST( testCheckGeoEquivalWith2 );
-    CPPUNIT_TEST( testCopyTinyStringsFromOnFields );
-    CPPUNIT_TEST( testTryToShareSameCoordsPermute );
-    CPPUNIT_TEST( testTryToShareSameCoordsPermute2 );
-    CPPUNIT_TEST( testChangeUnderlyingMesh1 );
-    CPPUNIT_TEST( testGetMaxValue1 );
-    CPPUNIT_TEST( testSubstractInPlaceDM1 );
-    CPPUNIT_TEST( testDotCrossProduct1 );
-    CPPUNIT_TEST( testMinMaxFields1 );
-    CPPUNIT_TEST( testApplyLin1 );
-    CPPUNIT_TEST( testGetIdsInRange1 );
-    CPPUNIT_TEST( testBuildSubPart1 );
-    CPPUNIT_TEST( testDoublyContractedProduct1 );
-    CPPUNIT_TEST( testDeterminant1 );
-    CPPUNIT_TEST( testEigenValues1 );
-    CPPUNIT_TEST( testEigenVectors1 );
-    CPPUNIT_TEST( testInverse1 );
-    CPPUNIT_TEST( testTrace1 );
-    CPPUNIT_TEST( testDeviator1 );
-    CPPUNIT_TEST( testMagnitude1 );
-    CPPUNIT_TEST( testMaxPerTuple1 );
-    CPPUNIT_TEST( testChangeNbOfComponents );
-    CPPUNIT_TEST( testSortPerTuple1 );
-    CPPUNIT_TEST( testIsEqualWithoutConsideringStr1 );
-    CPPUNIT_TEST( testGetNodeIdsOfCell1 );
-    CPPUNIT_TEST( testGetEdgeRatioField1 );
-    CPPUNIT_TEST( testFillFromAnalytic3 );
-    CPPUNIT_TEST( testFieldDoubleOpEqual1 );
-    CPPUNIT_TEST( testAreaBary3D2 );
-    //MEDCouplingBasicsTest3.cxx
-    CPPUNIT_TEST( testGetMeasureFieldCMesh1 );
-    CPPUNIT_TEST( testFieldDoubleZipCoords1 );
-    CPPUNIT_TEST( testFieldDoubleZipConnectivity1 );
-    CPPUNIT_TEST( testDaDoubleRenumber1 );
-    CPPUNIT_TEST( testDaDoubleRenumberAndReduce1 );
-    CPPUNIT_TEST( testDaDoubleRenumberInPlace1 );
-    CPPUNIT_TEST( testDaDoubleSelectByTupleId1 );
-    CPPUNIT_TEST( testDaDoubleRenumberR1 );
-    CPPUNIT_TEST( testDaDoubleRenumberInPlaceR1 );
-    CPPUNIT_TEST( testDaDoubleGetMinMaxValues1 );
-    CPPUNIT_TEST( testFieldDoubleGetMinMaxValues2 );
-    CPPUNIT_TEST( testBuildUnstructuredCMesh1 );
-    CPPUNIT_TEST( testDataArrayIntInvertO2NNO21 );
-    CPPUNIT_TEST( testKeepSetSelectedComponent1 );
-    CPPUNIT_TEST( testKeepSetSelectedComponent2 );
-    CPPUNIT_TEST( testDAIGetIdsEqual1 );
-    CPPUNIT_TEST( testDAIGetIdsEqualList1 );
-    CPPUNIT_TEST( testDAFromNoInterlace1 );
-    CPPUNIT_TEST( testDAToNoInterlace1 );
-    CPPUNIT_TEST( testDAIsUniform1 );
-    CPPUNIT_TEST( testDADFromPolarToCart1 );
-    CPPUNIT_TEST( testDADFromCylToCart1 );
-    CPPUNIT_TEST( testDADFromSpherToCart1 );
-    CPPUNIT_TEST( testUnPolyze1 );
-    CPPUNIT_TEST( testConvertDegeneratedCells1 );
-    CPPUNIT_TEST( testGetNodeIdsNearPoints1 );
-    CPPUNIT_TEST( testFieldCopyTinyAttrFrom1 );
-    CPPUNIT_TEST( testExtrudedMesh5 );
-    CPPUNIT_TEST( testExtrudedMesh6 );
-    CPPUNIT_TEST( testExtrudedMesh7 );
-    CPPUNIT_TEST( testSimplexize1 );
-    CPPUNIT_TEST( testSimplexize2 );
-    CPPUNIT_TEST( testDAMeld1 );
-    CPPUNIT_TEST( testFieldMeld1 );
-    CPPUNIT_TEST( testMergeNodes2 );
-    CPPUNIT_TEST( testMergeField2 );
-    CPPUNIT_TEST( testDAIBuildComplement1 );
-    CPPUNIT_TEST( testDAIBuildUnion1 );
-    CPPUNIT_TEST( testDAIBuildIntersection1 );
-    CPPUNIT_TEST( testDAIDeltaShiftIndex1 );
-    CPPUNIT_TEST( testDaDoubleSelectByTupleIdSafe1 );
-    CPPUNIT_TEST( testAreCellsIncludedIn1 );
-    CPPUNIT_TEST( testDAIBuildSubstraction1 );
-    CPPUNIT_TEST( testBuildOrthogonalField2 );
-    CPPUNIT_TEST( testUMInsertNextCell1 );
-    CPPUNIT_TEST( testFieldOperatorDivDiffComp1 );
-    CPPUNIT_TEST( testDARearrange1 );
-    CPPUNIT_TEST( testGetDifferentValues1 );
-    CPPUNIT_TEST( testDAIBuildPermutationArr1 );
-    CPPUNIT_TEST( testAreCellsIncludedIn2 );
-    CPPUNIT_TEST( testUMeshGetPartBarycenterAndOwner1 );
-    CPPUNIT_TEST( testUMeshGetPartMeasureField1 );
-    CPPUNIT_TEST( testUMeshBuildPartOrthogonalField1 );
-    CPPUNIT_TEST( testUMeshGetTypesOfPart1 );
-    CPPUNIT_TEST( testUMeshKeepCellIdsByType1 );
-    CPPUNIT_TEST( testDAIAggregateMulti1 );
-    CPPUNIT_TEST( testMergeUMeshes2 );
-    CPPUNIT_TEST( testBuild0DMeshFromCoords1 );
-    //MEDCouplingBasicsTest4.cxx
-    CPPUNIT_TEST( testDescriptionInMeshTimeUnit1 );
-    CPPUNIT_TEST( testMultiFields1 );
-    CPPUNIT_TEST( testFieldOverTime1 );
-    CPPUNIT_TEST( testDAICheckAndPreparePermutation1 );
-    CPPUNIT_TEST( testDAIChangeSurjectiveFormat1 );
-    CPPUNIT_TEST( testUMeshGetCellIdsLyingOnNodes1 );
-    CPPUNIT_TEST( testUMeshFindCellsIdsOnBoundary1 );
-    CPPUNIT_TEST( testMeshSetTime1 );
-    CPPUNIT_TEST( testApplyFuncTwo1 );
-    CPPUNIT_TEST( testApplyFuncThree1 );
-    CPPUNIT_TEST( testFillFromAnalyticTwo1 );
-    CPPUNIT_TEST( testFillFromAnalyticThree1 );
-    CPPUNIT_TEST( testDAUnitVar1 );
-    CPPUNIT_TEST( testGaussCoordinates1 );
-    CPPUNIT_TEST( testP2Localization1 );
-    CPPUNIT_TEST( testP2Localization2 );
-    CPPUNIT_TEST( testGetValueOn2 );
-    CPPUNIT_TEST( testDAIGetIdsNotEqual1 );
-    CPPUNIT_TEST( testDAIComputeOffsets1 );
-    CPPUNIT_TEST( testUMeshHexagonPrism1 );
-    CPPUNIT_TEST( testDADCheckIsMonotonic );
-    CPPUNIT_TEST( testCheckCoherencyDeeper1 );
-    CPPUNIT_TEST( testUnPolyze2 );
-    CPPUNIT_TEST( testDACpyFrom1 );
-    CPPUNIT_TEST( testDAITransformWithIndArr1 );
-    CPPUNIT_TEST( testDAIBuildPermArrPerLevel1 );
-    CPPUNIT_TEST( testDAIOperations1 );
-    CPPUNIT_TEST( testEmulateMEDMEMBDC1 );
-    CPPUNIT_TEST( testGetLevArrPerCellTypes1 );
-    CPPUNIT_TEST( testSortCellsInMEDFileFrmt1 );
-    CPPUNIT_TEST( testBuildPartAndReduceNodes1 );
-    CPPUNIT_TEST( testDAITransformWithIndArrR1 );
-    CPPUNIT_TEST( testDAISplitByValueRange1 );
-    CPPUNIT_TEST( testUMeshSplitProfilePerType1 );
-    CPPUNIT_TEST( testDAIBuildExplicitArrByRanges1 );
-    CPPUNIT_TEST( testDAIComputeOffsets2 );
-    CPPUNIT_TEST( testMergeField3 );
-    CPPUNIT_TEST( testGetDistributionOfTypes1 );
-    CPPUNIT_TEST( testNorm2_1 );
-    CPPUNIT_TEST( testNormMax1 );
-    CPPUNIT_TEST( testFindAndCorrectBadOriented3DExtrudedCells1 );
-    CPPUNIT_TEST( testConvertExtrudedPolyhedra1 );
-    CPPUNIT_TEST( testNonRegressionCopyTinyStrings );
-    //MEDCouplingBasicsTestInterp.cxx
-    CPPUNIT_TEST( test2DInterpP0P0_1 );
-    CPPUNIT_TEST( test2DInterpP0P0PL_1 );
-    CPPUNIT_TEST( test2DInterpP0P0PL_2 );
-    CPPUNIT_TEST( test2DInterpP0P0PL_3 );
-    CPPUNIT_TEST( test2DInterpP0P0PL_4 );
-    CPPUNIT_TEST( test2DInterpP0P1_1 );
-    CPPUNIT_TEST( test2DInterpP0P1PL_1 );
-    CPPUNIT_TEST( test2DInterpP0P1PL_2 );
-    CPPUNIT_TEST( test2DInterpP1P0_1 );
-    CPPUNIT_TEST( test2DInterpP1P0PL_1 );
-    CPPUNIT_TEST( test2DInterpP1P0PL_2 );
-    CPPUNIT_TEST( test2DInterpP1P1_1 );
-    CPPUNIT_TEST( test2DInterpP1P1PL_1 );
-    CPPUNIT_TEST( test3DSurfInterpP0P0_1 );
-    CPPUNIT_TEST( test3DSurfInterpP0P0PL_1 );
-    CPPUNIT_TEST( test3DSurfInterpP0P1_1 );
-    CPPUNIT_TEST( test3DSurfInterpP0P1PL_1 );
-    CPPUNIT_TEST( test3DSurfInterpP1P0_1 );
-    CPPUNIT_TEST( test3DSurfInterpP1P0PL_1 );
-    CPPUNIT_TEST( test3DSurfInterpP1P1_1 );
-    CPPUNIT_TEST( test3DSurfInterpP1P1PL_1 );
-    CPPUNIT_TEST( test3DSurfInterpP0P0_2 );
-    CPPUNIT_TEST( test3DSurfInterpP0P0_3 );
-
-    CPPUNIT_TEST( testInterpolationCC );
-    CPPUNIT_TEST( testInterpolationCU1D );
-    CPPUNIT_TEST( testInterpolationCU2D );
-    CPPUNIT_TEST( testInterpolationCU3D );
-
-    CPPUNIT_TEST( test3DInterpP0P0_1 );
-    CPPUNIT_TEST( test3DInterpP0P0PL_1 );
-    CPPUNIT_TEST( test3DInterpP0P0PL_2 );
-    CPPUNIT_TEST( test3DInterpP0P0PL_3 );
-    CPPUNIT_TEST( test3DInterpP0P0PL_4 );
-    CPPUNIT_TEST( test3DInterpP0P1_1 );
-    CPPUNIT_TEST( test3DInterpP0P1PL_1 );
-    CPPUNIT_TEST( test3DInterpP1P0_1 );
-    CPPUNIT_TEST( test3DInterpP1P0PL_1 );
-    CPPUNIT_TEST( test3DInterpP1P1_1 );
-    CPPUNIT_TEST( test3DInterpP1P1PL_1 );
-    CPPUNIT_TEST( test3DInterpP0P0Empty );
-    CPPUNIT_TEST( test2DInterpP0IntegralUniform );
-    CPPUNIT_TEST( test3DSurfInterpP0IntegralUniform );
-    CPPUNIT_TEST( test3DInterpP0IntegralUniform );
-    CPPUNIT_TEST( test2DInterpP1IntegralUniform );
-    CPPUNIT_TEST( test3DInterpP1IntegralUniform );
-    CPPUNIT_TEST( test2DInterpP1P0Bary_1 );
-    CPPUNIT_TEST( test3DSurfInterpP1P0Bary_1 );
-    CPPUNIT_TEST( test3DInterpP1P0Bary_1 );
-    CPPUNIT_TEST( test3DTo1DInterpP0P0PL_1 );
-
-    CPPUNIT_TEST( test2D1DBasicInterpP0P0 );
-    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_1 );
-    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_2 );
-    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_3 );
-    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_4 );
-    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_5 );
-    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_6 );
-    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_1 );
-    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_2 );
-    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_3 );
-    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_4 );
-    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_5 );
-    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_6 );
-    CPPUNIT_TEST( test3D2DBasicInterpP0P0 );
-    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_1 );
-    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_2 );
-    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_3 );
-    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_4 );
-    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_5 );
-    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_6 );
-    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_1 );
-    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_2 );
-    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_3 );
-    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_4 );
-    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_5 );
-    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_6 );
-    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_1 );
-    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_2 );
-    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_3 );
-    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_4 );
-    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_5 );
-    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_6 );
-    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_1 );
-    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_2 );
-    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_3 );
-    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_4 );
-    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_5 );
-    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_6 );
-
-    CPPUNIT_TEST( test1DInterp_1 );
-    CPPUNIT_TEST( test2DCurveInterpP0P0_1 );
-    CPPUNIT_TEST( test2DCurveInterpP0P0_2 );
-    CPPUNIT_TEST( test2DCurveInterpP0P1_1 );
-    CPPUNIT_TEST( test2DCurveInterpP1P0_1 );
-    CPPUNIT_TEST( test2DCurveInterpP1P1_1 );
-    CPPUNIT_TEST_SUITE_END();
-  public:
-    //MEDCouplingBasicsTest1.cxx
-    void testArray();
-    void testArray2();
-    void testArray3();
-    void testMesh();
-    void testMeshPointsCloud();
-    void testMeshM1D();
-    void testDeepCopy();
-    void testRevNodal();
-    void testConvertToPolyTypes();
-    void testDescConn2D();
-    void testDescConn3D();
-    void testFindBoundaryNodes();
-    void testBoundaryMesh();
-    void testBuildPartOfMySelf();
-    void testBuildPartOfMySelfNode();
-    void testZipCoords();
-    void testZipConnectivity();
-    void testEqualMesh();
-    void testEqualFieldDouble();
-    void testNatureChecking();
-    void testBuildSubMeshData();
-    void testExtrudedMesh1();
-    void testExtrudedMesh2();
-    void testExtrudedMesh3();
-    void testExtrudedMesh4();
-    void testFindCommonNodes();
-    void testCheckButterflyCells();
-    void testMergeMesh1();
-    void testMergeMeshOnSameCoords1();
-    void testMergeField1();
-    void testFillFromAnalytic();
-    void testFillFromAnalytic2();
-    void testApplyFunc();
-    void testApplyFunc2();
-    void testOperationsOnFields();
-    void testOperationsOnFields2();
-    void testOperationsOnFields3();
-    void testOperationsOnFields4();
-    void testMergeNodesOnField();
-    void testCheckConsecutiveCellTypes();
-    void testRearrange2ConsecutiveCellTypes();
-    void testSplitByType();
-    void testFuseUMeshesOnSameCoords();
-    void testFuseUMeshesOnSameCoords2();
-    void testBuildOrthogonalField();
-    void testGetCellsContainingPoint();
-    void testGetValueOn1();
-    void testCMesh0();
-    void testScale();
-    void testTryToShareSameCoords();
-    void testFindNodeOnPlane();
-    void testRenumberCells();
-    void testChangeSpaceDimension();
-    //MEDCouplingBasicsTest2.cxx
-    void testGaussPointField1();
-    void testGaussPointNEField1();
-    void testCellOrientation1();
-    void testCellOrientation2();
-    void testPolyhedronBarycenter();
-    void testNormL12Integ1D();
-    void testAreaBary2D();
-    void testAreaBary3D();
-    void testRenumberCellsForFields();
-    void testRenumberNodesForFields();
-    void testConvertQuadraticCellsToLinear();
-    void testCheckGeoEquivalWith();
-    void testCheckGeoEquivalWith2();
-    void testCopyTinyStringsFromOnFields();
-    void testTryToShareSameCoordsPermute();
-    void testTryToShareSameCoordsPermute2();
-    void testChangeUnderlyingMesh1();
-    void testGetMaxValue1();
-    void testSubstractInPlaceDM1();
-    void testDotCrossProduct1();
-    void testMinMaxFields1();
-    void testApplyLin1();
-    void testGetIdsInRange1();
-    void testBuildSubPart1();
-    void testDoublyContractedProduct1();
-    void testDeterminant1();
-    void testEigenValues1();
-    void testEigenVectors1();
-    void testInverse1();
-    void testTrace1();
-    void testDeviator1();
-    void testMagnitude1();
-    void testMaxPerTuple1();
-    void testChangeNbOfComponents();
-    void testSortPerTuple1();
-    void testIsEqualWithoutConsideringStr1();
-    void testGetNodeIdsOfCell1();
-    void testGetEdgeRatioField1();
-    void testFillFromAnalytic3();
-    void testFieldDoubleOpEqual1();
-    void testAreaBary3D2();
-    //MEDCouplingBasicsTest3.cxx
-    void testGetMeasureFieldCMesh1();
-    void testFieldDoubleZipCoords1();
-    void testFieldDoubleZipConnectivity1();
-    void testDaDoubleRenumber1();
-    void testDaDoubleRenumberAndReduce1();
-    void testDaDoubleRenumberInPlace1();
-    void testDaDoubleSelectByTupleId1();
-    void testDaDoubleRenumberR1();
-    void testDaDoubleRenumberInPlaceR1();
-    void testDaDoubleGetMinMaxValues1();
-    void testFieldDoubleGetMinMaxValues2();
-    void testBuildUnstructuredCMesh1();
-    void testDataArrayIntInvertO2NNO21();
-    void testKeepSetSelectedComponent1();
-    void testKeepSetSelectedComponent2();
-    void testDAIGetIdsEqual1();
-    void testDAIGetIdsEqualList1();
-    void testDAFromNoInterlace1();
-    void testDAToNoInterlace1();
-    void testDAIsUniform1();
-    void testDADFromPolarToCart1();
-    void testDADFromCylToCart1();
-    void testDADFromSpherToCart1();
-    void testUnPolyze1();
-    void testConvertDegeneratedCells1();
-    void testGetNodeIdsNearPoints1();
-    void testFieldCopyTinyAttrFrom1();
-    void testExtrudedMesh5();
-    void testExtrudedMesh6();
-    void testExtrudedMesh7();
-    void testSimplexize1();
-    void testSimplexize2();
-    void testDAMeld1();
-    void testFieldMeld1();
-    void testMergeNodes2();
-    void testMergeField2();
-    void testDAIBuildComplement1();
-    void testDAIBuildUnion1();
-    void testDAIBuildIntersection1();
-    void testDAIDeltaShiftIndex1();
-    void testDaDoubleSelectByTupleIdSafe1();
-    void testAreCellsIncludedIn1();
-    void testDAIBuildSubstraction1();
-    void testBuildOrthogonalField2();
-    void testUMInsertNextCell1();
-    void testFieldOperatorDivDiffComp1();
-    void testDARearrange1();
-    void testGetDifferentValues1();
-    void testDAIBuildPermutationArr1();
-    void testAreCellsIncludedIn2();
-    void testUMeshGetPartBarycenterAndOwner1();
-    void testUMeshGetPartMeasureField1();
-    void testUMeshBuildPartOrthogonalField1();
-    void testUMeshGetTypesOfPart1();
-    void testUMeshKeepCellIdsByType1();
-    void testDAIAggregateMulti1();
-    void testMergeUMeshes2();
-    void testBuild0DMeshFromCoords1();
-    //MEDCouplingBasicsTest4.cxx
-    void testDescriptionInMeshTimeUnit1();
-    void testMultiFields1();
-    void testFieldOverTime1();
-    void testDAICheckAndPreparePermutation1();
-    void testDAIChangeSurjectiveFormat1();
-    void testUMeshGetCellIdsLyingOnNodes1();
-    void testUMeshFindCellsIdsOnBoundary1();
-    void testMeshSetTime1();
-    void testApplyFuncTwo1();
-    void testApplyFuncThree1();
-    void testFillFromAnalyticTwo1();
-    void testFillFromAnalyticThree1();
-    void testDAUnitVar1();
-    void testGaussCoordinates1();
-    void testQ1Localization1();
-    void testP2Localization1();
-    void testP2Localization2();
-    void testGetValueOn2();
-    void testDAIGetIdsNotEqual1();
-    void testDAIComputeOffsets1();
-    void testUMeshHexagonPrism1();
-    void testDADCheckIsMonotonic();
-    void testCheckCoherencyDeeper1();
-    void testUnPolyze2();
-    void testDACpyFrom1();
-    void testDAITransformWithIndArr1();
-    void testDAIBuildPermArrPerLevel1();
-    void testDAIOperations1();
-    void testEmulateMEDMEMBDC1();
-    void testGetLevArrPerCellTypes1();
-    void testSortCellsInMEDFileFrmt1();
-    void testBuildPartAndReduceNodes1();
-    void testDAITransformWithIndArrR1();
-    void testDAISplitByValueRange1();
-    void testUMeshSplitProfilePerType1();
-    void testDAIBuildExplicitArrByRanges1();
-    void testDAIComputeOffsets2();
-    void testMergeField3();
-    void testGetDistributionOfTypes1();
-    void testNorm2_1();
-    void testNormMax1();
-    void testFindAndCorrectBadOriented3DExtrudedCells1();
-    void testConvertExtrudedPolyhedra1();
-    void testNonRegressionCopyTinyStrings();
-    //MEDCouplingBasicsTestInterp.cxx
-    void test2DInterpP0P0_1();
-    void test2DInterpP0P0PL_1();
-    void test2DInterpP0P0PL_2();
-    void test2DInterpP0P0PL_3();
-    void test2DInterpP0P0PL_4();
-    void test2DInterpP0P1_1();
-    void test2DInterpP0P1PL_1();
-    void test2DInterpP0P1PL_2();
-    void test2DInterpP1P0_1();
-    void test2DInterpP1P0PL_1();
-    void test2DInterpP1P0PL_2();
-    void test2DInterpP1P1_1();
-    void test2DInterpP1P1PL_1();
-    void test3DSurfInterpP0P0_1();
-    void test3DSurfInterpP0P0PL_1();
-    void test3DSurfInterpP0P1_1();
-    void test3DSurfInterpP0P1PL_1();
-    void test3DSurfInterpP1P0_1();
-    void test3DSurfInterpP1P0PL_1();
-    void test3DSurfInterpP1P1_1();
-    void test3DSurfInterpP1P1PL_1();
-    void test3DSurfInterpP0P0_2();
-    void test3DSurfInterpP0P0_3();
-    void test3DInterpP0P0_1();
-    void test3DInterpP0P0PL_1();
-    void test3DInterpP0P0PL_2();
-    void test3DInterpP0P0PL_3();
-    void test3DInterpP0P0PL_4();
-    void test3DInterpP0P1_1();
-    void test3DInterpP0P1PL_1();
-    void test3DInterpP1P0_1();
-    void test3DInterpP1P0PL_1();
-    void test3DInterpP1P1_1();
-    void test3DInterpP1P1PL_1();
-
-    void testInterpolationCC();
-    void testInterpolationCU1D();
-    void testInterpolationCU2D();
-    void testInterpolationCU3D();
-
-    void test3DInterpP0P0Empty();
-    void test2DInterpP0IntegralUniform();
-    void test3DSurfInterpP0IntegralUniform();
-    void test3DInterpP0IntegralUniform();
-    void test2DInterpP1IntegralUniform();
-    void test3DInterpP1IntegralUniform();
-    void test2DInterpP1P0Bary_1();
-    void test3DSurfInterpP1P0Bary_1();
-    void test3DInterpP1P0Bary_1();
-    void test3DTo1DInterpP0P0PL_1();
-
-    void test2D1DBasicInterpP0P0();
-    void test2D1DSegQuadInterpP0P0_1();
-    void test2D1DSegQuadInterpP0P0_2();
-    void test2D1DSegQuadInterpP0P0_3();
-    void test2D1DSegQuadInterpP0P0_4();
-    void test2D1DSegQuadInterpP0P0_5();
-    void test2D1DSegQuadInterpP0P0_6();
-    void test2D1DSegTriInterpP0P0_1();
-    void test2D1DSegTriInterpP0P0_2();
-    void test2D1DSegTriInterpP0P0_3();
-    void test2D1DSegTriInterpP0P0_4();
-    void test2D1DSegTriInterpP0P0_5();
-    void test2D1DSegTriInterpP0P0_6();
-    void test3D2DBasicInterpP0P0();
-    void test3D2DQuadHexaInterpP0P0_1();
-    void test3D2DQuadHexaInterpP0P0_2();
-    void test3D2DQuadHexaInterpP0P0_3();
-    void test3D2DQuadHexaInterpP0P0_4();
-    void test3D2DQuadHexaInterpP0P0_5();
-    void test3D2DQuadHexaInterpP0P0_6();
-    void test3D2DTriHexaInterpP0P0_1();
-    void test3D2DTriHexaInterpP0P0_2();
-    void test3D2DTriHexaInterpP0P0_3();
-    void test3D2DTriHexaInterpP0P0_4();
-    void test3D2DTriHexaInterpP0P0_5();
-    void test3D2DTriHexaInterpP0P0_6();
-    void test3D2DQuadTetraInterpP0P0_1();
-    void test3D2DQuadTetraInterpP0P0_2();
-    void test3D2DQuadTetraInterpP0P0_3();
-    void test3D2DQuadTetraInterpP0P0_4();
-    void test3D2DQuadTetraInterpP0P0_5();
-    void test3D2DQuadTetraInterpP0P0_6();
-    void test3D2DTriTetraInterpP0P0_1();
-    void test3D2DTriTetraInterpP0P0_2();
-    void test3D2DTriTetraInterpP0P0_3();
-    void test3D2DTriTetraInterpP0P0_4();
-    void test3D2DTriTetraInterpP0P0_5();
-    void test3D2DTriTetraInterpP0P0_6();
-
-    void test1DInterp_1();
-    void test2DCurveInterpP0P0_1();
-    void test2DCurveInterpP0P0_2();
-    void test2DCurveInterpP0P1_1();
-    void test2DCurveInterpP1P0_1();
-    void test2DCurveInterpP1P1_1();
-
   public:
     static MEDCouplingUMesh *build3DSourceMesh_2();
     static MEDCouplingUMesh *build3DTargetMesh_2();
@@ -690,7 +93,7 @@ namespace ParaMEDMEM
     static MEDCouplingMultiFields *buildMultiFields_1();
     static std::vector<MEDCouplingFieldDouble *> buildMultiFields_2();
     static double sumAll(const std::vector< std::map<int,double> >& matrix);
-  private:
+  protected:
     static int countNonZero(const std::vector< std::map<int,double> >& matrix);
 
     static void test2D1DMeshesIntersection(MEDCouplingUMesh *sourceMesh,
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
index 1810a94ae..9847e4886 100644
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx
@@ -26,8 +26,16 @@
 
 #include "MEDCouplingBasicsTestData1.hxx"
 
+#include "Interpolation2D.txx"
+#include "Interpolation3D2D.txx"
+#include "Interpolation2D1D.txx"
+#include "MEDCouplingNormalizedUnstructuredMesh.txx"
+#include "MEDCouplingNormalizedCartesianMesh.txx"
+
 using namespace ParaMEDMEM;
 
+typedef std::vector<std::map<int,double> > IntersectionMatrix;
+
 MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSourceMesh_2()
 {
   double sourceCoords[84]={100.0, 100.0, 0.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 100.0, 0.0, 0.0, 0.0, 100.0, 0.0, 0.0, 100.0, 100.0, 0.0,
@@ -1617,3 +1625,91 @@ MEDCouplingUMesh* MEDCouplingBasicsTest::build3D2DTetraTargetMesh(const double i
 
   return targetMesh;
 }
+
+int MEDCouplingBasicsTest::countNonZero(const std::vector< std::map<int,double> >& matrix)
+{
+  int ret=0.;
+  for(std::vector< std::map<int,double> >::const_iterator iter=matrix.begin();iter!=matrix.end();iter++)
+    for(std::map<int,double>::const_iterator iter2=(*iter).begin();iter2!=(*iter).end();iter2++)
+      if (!INTERP_KERNEL::epsilonEqual((*iter2).second, 0.)) ret +=1;
+  return ret;
+}
+
+void MEDCouplingBasicsTest::test2D1DMeshesIntersection(MEDCouplingUMesh *sourceMesh,
+                                                       MEDCouplingUMesh *targetMesh,
+                                                       const double correctLength,
+                                                       const int correctDuplicateFacesNbr,
+                                                       const int correctTotalIntersectFacesNbr)
+{
+  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
+  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
+  INTERP_KERNEL::Interpolation2D1D myInterpolator;
+  myInterpolator.setPrecision(1e-12);
+  const double prec = 1.0e-5;
+  IntersectionMatrix matrix;
+  myInterpolator.setIntersectionType(INTERP_KERNEL::Geometric2D);
+  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,matrix,"P0P0");
+
+  std::cout.precision(16);
+
+  const double length = sumAll(matrix);
+  LOG(1, "length =  " << surf <<"  correctLength = " << correctLength );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL(correctLength, length, prec * std::max(correctLength, length));
+
+  INTERP_KERNEL::Interpolation3D2D::DuplicateFacesType duplicateFaces = myInterpolator.retrieveDuplicateFaces();
+  int duplicateFacesNbr = duplicateFaces.size();
+  LOG(1, "duplicateFacesNbr =  " << duplicateFacesNbr <<"  correctDuplicateFacesNbr = " <<  correctDuplicateFacesNbr);
+  CPPUNIT_ASSERT_EQUAL(correctDuplicateFacesNbr, duplicateFacesNbr);
+
+  if (correctTotalIntersectFacesNbr >= 0)
+    {
+      int totalIntersectFacesNbr = countNonZero(matrix);
+      LOG(1, "totalIntersectFacesNbr =  " << totalIntersectFacesNbr <<"  correctTotalIntersectFacesNbr = " << correctTotalIntersectFacesNbr );
+      CPPUNIT_ASSERT_EQUAL(correctTotalIntersectFacesNbr, totalIntersectFacesNbr);
+    }
+  //clean up
+  sourceMesh->decrRef();
+  targetMesh->decrRef();
+}
+
+void MEDCouplingBasicsTest::test3D2DMeshesIntersection(MEDCouplingUMesh *sourceMesh,
+                                                       MEDCouplingUMesh *targetMesh,
+                                                       const double correctSurf,
+                                                       const int correctDuplicateFacesNbr,
+                                                       const int correctTotalIntersectFacesNbr)
+{
+  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
+  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
+  INTERP_KERNEL::Interpolation3D2D myInterpolator;
+  myInterpolator.setPrecision(1e-12);
+  const double prec = 1.0e-5;
+  IntersectionMatrix matrix;
+  INTERP_KERNEL::SplittingPolicy sp[] = { INTERP_KERNEL::PLANAR_FACE_5, INTERP_KERNEL::PLANAR_FACE_6, INTERP_KERNEL::GENERAL_24, INTERP_KERNEL::GENERAL_48 };
+  for ( size_t i = 0; i < sizeof(sp)/sizeof(sp[0]); ++i )
+  {
+    myInterpolator.setSplittingPolicy( sp[i] );
+    matrix.clear();
+    myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,matrix,"P0P0");
+
+    std::cout.precision(16);
+
+    const double surf = sumAll(matrix);
+    LOG(1, "surf =  " << surf <<"  correctSurf = " << correctSurf );
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(correctSurf, surf, prec * std::max(correctSurf, surf));
+
+    INTERP_KERNEL::Interpolation3D2D::DuplicateFacesType duplicateFaces = myInterpolator.retrieveDuplicateFaces();
+    int duplicateFacesNbr = duplicateFaces.size();
+    LOG(1, "duplicateFacesNbr =  " << duplicateFacesNbr <<"  correctDuplicateFacesNbr = " <<  correctDuplicateFacesNbr);
+    CPPUNIT_ASSERT_EQUAL(correctDuplicateFacesNbr, duplicateFacesNbr);
+
+    if (correctTotalIntersectFacesNbr >= 0)
+      {
+        int totalIntersectFacesNbr = countNonZero(matrix);
+        LOG(1, "totalIntersectFacesNbr =  " << totalIntersectFacesNbr <<"  correctTotalIntersectFacesNbr = " << correctTotalIntersectFacesNbr );
+        CPPUNIT_ASSERT_EQUAL(correctTotalIntersectFacesNbr, totalIntersectFacesNbr);
+      }
+  }
+  //clean up
+  sourceMesh->decrRef();
+  targetMesh->decrRef();
+}
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
index a71b6220c..7820cfa33 100644
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include "MEDCouplingBasicsTest.hxx"
+#include "MEDCouplingBasicsTest1.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingExtrudedMesh.hxx"
@@ -29,7 +29,7 @@
 
 using namespace ParaMEDMEM;
 
-void MEDCouplingBasicsTest::testArray()
+void MEDCouplingBasicsTest1::testArray()
 {
   int tmp1[6]={7,6,5,4,3,2};
   const int tmp2[3]={8,9,10};
@@ -59,7 +59,7 @@ void MEDCouplingBasicsTest::testArray()
   }
 }
 
-void MEDCouplingBasicsTest::testArray2()
+void MEDCouplingBasicsTest1::testArray2()
 {
   DataArrayDouble *arr=DataArrayDouble::New();
   arr->alloc(3,4);
@@ -78,7 +78,7 @@ void MEDCouplingBasicsTest::testArray2()
   arr->decrRef();
 }
 
-void MEDCouplingBasicsTest::testArray3()
+void MEDCouplingBasicsTest1::testArray3()
 {
   DataArrayInt *arr1=DataArrayInt::New();
   arr1->alloc(7,2);
@@ -121,7 +121,7 @@ void MEDCouplingBasicsTest::testArray3()
   arr6->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMesh()
+void MEDCouplingBasicsTest1::testMesh()
 {
   const int nbOfCells=6;
   const int nbOfNodes=12;
@@ -255,7 +255,7 @@ void MEDCouplingBasicsTest::testMesh()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMeshPointsCloud()
+void MEDCouplingBasicsTest1::testMeshPointsCloud()
 {
   double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
   const int targetConn[]={0,1,2,3,4,5,7,6};
@@ -286,7 +286,7 @@ void MEDCouplingBasicsTest::testMeshPointsCloud()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMeshM1D()
+void MEDCouplingBasicsTest1::testMeshM1D()
 {
   MEDCouplingUMesh *meshM1D=MEDCouplingUMesh::New();
   CPPUNIT_ASSERT_THROW(meshM1D->getMeshDimension(),INTERP_KERNEL::Exception);
@@ -318,7 +318,7 @@ void MEDCouplingBasicsTest::testMeshM1D()
   meshM1D->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDeepCopy()
+void MEDCouplingBasicsTest1::testDeepCopy()
 {
   DataArrayDouble *array=DataArrayDouble::New();
   array->alloc(5,3);
@@ -345,7 +345,7 @@ void MEDCouplingBasicsTest::testDeepCopy()
   array4->decrRef();
 }
 
-void MEDCouplingBasicsTest::testRevNodal()
+void MEDCouplingBasicsTest1::testRevNodal()
 {
   MEDCouplingUMesh *mesh=build2DTargetMesh_1();
   DataArrayInt *revNodal=DataArrayInt::New();
@@ -364,7 +364,7 @@ void MEDCouplingBasicsTest::testRevNodal()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testConvertToPolyTypes()
+void MEDCouplingBasicsTest1::testConvertToPolyTypes()
 {
   ////// 2D
   MEDCouplingUMesh *mesh=build2DTargetMesh_1();
@@ -394,7 +394,7 @@ void MEDCouplingBasicsTest::testConvertToPolyTypes()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDescConn2D()
+void MEDCouplingBasicsTest1::testDescConn2D()
 {
   MEDCouplingUMesh *mesh=build2DTargetMesh_1();
   DataArrayInt *desc=DataArrayInt::New();
@@ -466,7 +466,7 @@ void MEDCouplingBasicsTest::testDescConn2D()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDescConn3D()
+void MEDCouplingBasicsTest1::testDescConn3D()
 {
   MEDCouplingUMesh *mesh=build3DTargetMesh_1();
   DataArrayInt *desc=DataArrayInt::New();
@@ -540,7 +540,7 @@ void MEDCouplingBasicsTest::testDescConn3D()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFindBoundaryNodes()
+void MEDCouplingBasicsTest1::testFindBoundaryNodes()
 {
   MEDCouplingUMesh *mesh=build3DTargetMesh_1();
   std::vector<int> boundaryNodes;
@@ -551,7 +551,7 @@ void MEDCouplingBasicsTest::testFindBoundaryNodes()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBoundaryMesh()
+void MEDCouplingBasicsTest1::testBoundaryMesh()
 {
   MEDCouplingUMesh *mesh=build3DTargetMesh_1();
   MEDCouplingPointSet *mesh2=mesh->buildBoundaryMesh(false);
@@ -561,7 +561,7 @@ void MEDCouplingBasicsTest::testBoundaryMesh()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuildPartOfMySelf()
+void MEDCouplingBasicsTest1::testBuildPartOfMySelf()
 {
   MEDCouplingUMesh *mesh=build2DTargetMesh_1();
   mesh->setName("Toto");
@@ -614,7 +614,7 @@ void MEDCouplingBasicsTest::testBuildPartOfMySelf()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuildPartOfMySelfNode()
+void MEDCouplingBasicsTest1::testBuildPartOfMySelfNode()
 {
   MEDCouplingUMesh *mesh=build2DTargetMesh_1();
   const int tab1[2]={5,7};
@@ -662,7 +662,7 @@ void MEDCouplingBasicsTest::testBuildPartOfMySelfNode()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testZipCoords()
+void MEDCouplingBasicsTest1::testZipCoords()
 {
   MEDCouplingUMesh *mesh=build2DTargetMesh_1();
   CPPUNIT_ASSERT_EQUAL(2,(int)mesh->getAllTypes().size());
@@ -720,7 +720,7 @@ void MEDCouplingBasicsTest::testZipCoords()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testZipConnectivity()
+void MEDCouplingBasicsTest1::testZipConnectivity()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   MEDCouplingUMesh *m2=build2DTargetMesh_1();
@@ -761,7 +761,7 @@ void MEDCouplingBasicsTest::testZipConnectivity()
   m6->decrRef();
 }
 
-void MEDCouplingBasicsTest::testEqualMesh()
+void MEDCouplingBasicsTest1::testEqualMesh()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingUMesh *mesh2=build2DTargetMesh_1();
@@ -815,7 +815,7 @@ void MEDCouplingBasicsTest::testEqualMesh()
   mesh2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testEqualFieldDouble()
+void MEDCouplingBasicsTest1::testEqualFieldDouble()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingUMesh *mesh2=build2DTargetMesh_1();
@@ -906,7 +906,7 @@ void MEDCouplingBasicsTest::testEqualFieldDouble()
   mesh2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testNatureChecking()
+void MEDCouplingBasicsTest1::testNatureChecking()
 {
   MEDCouplingFieldDouble *field=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
   field->setNature(Integral);
@@ -920,7 +920,7 @@ void MEDCouplingBasicsTest::testNatureChecking()
   field->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuildSubMeshData()
+void MEDCouplingBasicsTest1::testBuildSubMeshData()
 {
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
   //check buildSubMesh on field on cells
@@ -959,7 +959,7 @@ void MEDCouplingBasicsTest::testBuildSubMeshData()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testExtrudedMesh1()
+void MEDCouplingBasicsTest1::testExtrudedMesh1()
 {
   MEDCouplingUMesh *mesh2D=0;
   MEDCouplingUMesh *mesh3D=build3DExtrudedUMesh_1(mesh2D);
@@ -989,7 +989,7 @@ void MEDCouplingBasicsTest::testExtrudedMesh1()
   mesh2D->decrRef();
 }
 
-void MEDCouplingBasicsTest::testExtrudedMesh2()
+void MEDCouplingBasicsTest1::testExtrudedMesh2()
 {
   MEDCouplingUMesh *mN,*mTT,*mTF;
   build3DExtrudedUMesh_2(mN,mTT,mTF);
@@ -1051,7 +1051,7 @@ void MEDCouplingBasicsTest::testExtrudedMesh2()
 /*!
  * This test check MEDCouplingUMesh::buildExtrudedMesh method.
  */
-void MEDCouplingBasicsTest::testExtrudedMesh3()
+void MEDCouplingBasicsTest1::testExtrudedMesh3()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   m1->changeSpaceDimension(3);
@@ -1110,7 +1110,7 @@ void MEDCouplingBasicsTest::testExtrudedMesh3()
  * This test check MEDCouplingUMesh::buildExtrudedMesh method, but also, MEDCouplingExtrudedMesh following methods :
  * getCellContainingPoint getMeasureField getNodeIdsOfCell getCoordinateOfNode getTypeOfCell build3DUnstructuredMesh.
  */
-void MEDCouplingBasicsTest::testExtrudedMesh4()
+void MEDCouplingBasicsTest1::testExtrudedMesh4()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   std::vector<int> cells(2); cells[0]=2; cells[1]=4;
@@ -1155,7 +1155,7 @@ void MEDCouplingBasicsTest::testExtrudedMesh4()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFindCommonNodes()
+void MEDCouplingBasicsTest1::testFindCommonNodes()
 {
   DataArrayInt *comm,*commI;
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
@@ -1251,7 +1251,7 @@ void MEDCouplingBasicsTest::testFindCommonNodes()
   o2n->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCheckButterflyCells()
+void MEDCouplingBasicsTest1::testCheckButterflyCells()
 {
   std::vector<int> cells;
   MEDCouplingUMesh *sourceMesh=build2DTargetMesh_1();
@@ -1283,7 +1283,7 @@ void MEDCouplingBasicsTest::testCheckButterflyCells()
   sourceMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMergeMesh1()
+void MEDCouplingBasicsTest1::testMergeMesh1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   MEDCouplingUMesh *m2=build2DSourceMesh_1();
@@ -1308,7 +1308,7 @@ void MEDCouplingBasicsTest::testMergeMesh1()
   m2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMergeMeshOnSameCoords1()
+void MEDCouplingBasicsTest1::testMergeMeshOnSameCoords1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   MEDCouplingUMesh *m2=build2DTargetMesh_1();
@@ -1345,7 +1345,7 @@ void MEDCouplingBasicsTest::testMergeMeshOnSameCoords1()
   m3->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMergeField1()
+void MEDCouplingBasicsTest1::testMergeField1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   MEDCouplingUMesh *m2=build2DSourceMesh_1();
@@ -1403,7 +1403,7 @@ bool func3(const double *pt, double *res)
   return true;
 }
 
-void MEDCouplingBasicsTest::testFillFromAnalytic()
+void MEDCouplingBasicsTest1::testFillFromAnalytic()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_CELLS,1,func1);
@@ -1460,7 +1460,7 @@ void MEDCouplingBasicsTest::testFillFromAnalytic()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFillFromAnalytic2()
+void MEDCouplingBasicsTest1::testFillFromAnalytic2()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_CELLS,1,"y+x");
@@ -1530,7 +1530,7 @@ void MEDCouplingBasicsTest::testFillFromAnalytic2()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testApplyFunc()
+void MEDCouplingBasicsTest1::testApplyFunc()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,2,func2);
@@ -1554,7 +1554,7 @@ void MEDCouplingBasicsTest::testApplyFunc()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testApplyFunc2()
+void MEDCouplingBasicsTest1::testApplyFunc2()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,2,func2);
@@ -1597,7 +1597,7 @@ void MEDCouplingBasicsTest::testApplyFunc2()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testOperationsOnFields()
+void MEDCouplingBasicsTest1::testOperationsOnFields()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,1,func1);
@@ -1701,7 +1701,7 @@ void MEDCouplingBasicsTest::testOperationsOnFields()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testOperationsOnFields2()
+void MEDCouplingBasicsTest1::testOperationsOnFields2()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,1,"x+y+z");
@@ -1743,7 +1743,7 @@ void MEDCouplingBasicsTest::testOperationsOnFields2()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testOperationsOnFields3()
+void MEDCouplingBasicsTest1::testOperationsOnFields3()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   MEDCouplingFieldDouble *f1=m->fillFromAnalytic(ON_NODES,1,"x+y+z");
@@ -1783,7 +1783,7 @@ void MEDCouplingBasicsTest::testOperationsOnFields3()
 /*!
  * Check of LINEAR_TIME and CONST_ON_TIME_INTERVAL policies
  */
-void MEDCouplingBasicsTest::testOperationsOnFields4()
+void MEDCouplingBasicsTest1::testOperationsOnFields4()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   int nbOfCells=m->getNumberOfCells();
@@ -1885,7 +1885,7 @@ bool func4(const double *pt, double *res)
   return true;
 }
 
-void MEDCouplingBasicsTest::testMergeNodesOnField()
+void MEDCouplingBasicsTest1::testMergeNodesOnField()
 {
   double *tmp;
   MEDCouplingUMesh *targetMesh=build3DTargetMeshMergeNode_1();
@@ -1911,7 +1911,7 @@ void MEDCouplingBasicsTest::testMergeNodesOnField()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCheckConsecutiveCellTypes()
+void MEDCouplingBasicsTest1::testCheckConsecutiveCellTypes()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -1942,7 +1942,7 @@ void MEDCouplingBasicsTest::testCheckConsecutiveCellTypes()
   sourceMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testRearrange2ConsecutiveCellTypes()
+void MEDCouplingBasicsTest1::testRearrange2ConsecutiveCellTypes()
 {
   MEDCouplingUMesh *m1_1=build2DSourceMesh_1();
   MEDCouplingUMesh *m2_1=build2DTargetMesh_1();
@@ -1973,7 +1973,7 @@ void MEDCouplingBasicsTest::testRearrange2ConsecutiveCellTypes()
   m2_2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testSplitByType()
+void MEDCouplingBasicsTest1::testSplitByType()
 {
   MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
   std::vector<MEDCouplingUMesh *> v=m1->splitByType();
@@ -1988,7 +1988,7 @@ void MEDCouplingBasicsTest::testSplitByType()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFuseUMeshesOnSameCoords()
+void MEDCouplingBasicsTest1::testFuseUMeshesOnSameCoords()
 {
   std::vector<const MEDCouplingUMesh *> meshes;
   MEDCouplingUMesh *m2=build2DTargetMesh_1();
@@ -2050,7 +2050,7 @@ void MEDCouplingBasicsTest::testFuseUMeshesOnSameCoords()
   m5->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFuseUMeshesOnSameCoords2()
+void MEDCouplingBasicsTest1::testFuseUMeshesOnSameCoords2()
 {
   MEDCouplingUMesh *m2;
   MEDCouplingUMesh *m1=build3DExtrudedUMesh_1(m2);
@@ -2090,7 +2090,7 @@ void MEDCouplingBasicsTest::testFuseUMeshesOnSameCoords2()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuildOrthogonalField()
+void MEDCouplingBasicsTest1::testBuildOrthogonalField()
 {
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
   MEDCouplingFieldDouble *field=targetMesh->buildOrthogonalField();
@@ -2126,7 +2126,7 @@ void MEDCouplingBasicsTest::testBuildOrthogonalField()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetCellsContainingPoint()
+void MEDCouplingBasicsTest1::testGetCellsContainingPoint()
 {
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
   double pos[12]={0.,0.,0.4,0.4,0.,0.4,0.1,0.1,0.25,0.,0.65,0.};
@@ -2198,7 +2198,7 @@ void MEDCouplingBasicsTest::testGetCellsContainingPoint()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetValueOn1()
+void MEDCouplingBasicsTest1::testGetValueOn1()
 {
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
   MEDCouplingFieldDouble *fieldOnCells=MEDCouplingFieldDouble::New(ON_CELLS);
@@ -2246,7 +2246,7 @@ void MEDCouplingBasicsTest::testGetValueOn1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCMesh0()
+void MEDCouplingBasicsTest1::testCMesh0()
 {
   MEDCouplingCMesh* mesh=MEDCouplingCMesh::New();
   DataArrayDouble* coordsX=DataArrayDouble::New();
@@ -2293,7 +2293,7 @@ void MEDCouplingBasicsTest::testCMesh0()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testScale()
+void MEDCouplingBasicsTest1::testScale()
 {
   MEDCouplingUMesh *mesh=build2DTargetMesh_1();
   const double pos[2]={0.2,0.2};
@@ -2307,7 +2307,7 @@ void MEDCouplingBasicsTest::testScale()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testTryToShareSameCoords()
+void MEDCouplingBasicsTest1::testTryToShareSameCoords()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   MEDCouplingUMesh *m2=build2DTargetMesh_1();
@@ -2341,7 +2341,7 @@ void MEDCouplingBasicsTest::testTryToShareSameCoords()
   m2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFindNodeOnPlane()
+void MEDCouplingBasicsTest1::testFindNodeOnPlane()
 {
   MEDCouplingUMesh *mesh=build3DTargetMesh_1();
   std::vector<int> n;
@@ -2362,7 +2362,7 @@ void MEDCouplingBasicsTest::testFindNodeOnPlane()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testRenumberCells()
+void MEDCouplingBasicsTest1::testRenumberCells()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   MEDCouplingUMesh *m2=build3DSurfTargetMesh_1();
@@ -2382,7 +2382,7 @@ void MEDCouplingBasicsTest::testRenumberCells()
   m2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testChangeSpaceDimension()
+void MEDCouplingBasicsTest1::testChangeSpaceDimension()
 {
   MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
   MEDCouplingUMesh *m2=build2DTargetMesh_1();
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.hxx
new file mode 100644
index 000000000..7bf0388d2
--- /dev/null
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.hxx
@@ -0,0 +1,149 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef __MEDCOUPLINGBASICSTEST1_HXX__
+#define __MEDCOUPLINGBASICSTEST1_HXX__
+
+#include "MEDCouplingBasicsTest.hxx"
+
+#include <map>
+#include <vector>
+
+namespace ParaMEDMEM
+{
+  class DataArrayDouble;
+  class MEDCouplingUMesh;
+  class MEDCouplingFieldDouble;
+  class MEDCouplingMultiFields;
+
+  class MEDCouplingBasicsTest1 : public MEDCouplingBasicsTest
+  {
+    CPPUNIT_TEST_SUITE(MEDCouplingBasicsTest1);
+    CPPUNIT_TEST( testArray );
+    CPPUNIT_TEST( testArray2 );
+    CPPUNIT_TEST( testArray3 );
+    CPPUNIT_TEST( testMesh );
+    CPPUNIT_TEST( testMeshPointsCloud );
+    CPPUNIT_TEST( testMeshM1D );
+    CPPUNIT_TEST( testDeepCopy );
+    CPPUNIT_TEST( testRevNodal );
+    CPPUNIT_TEST( testConvertToPolyTypes );
+    CPPUNIT_TEST( testDescConn2D );
+    CPPUNIT_TEST( testDescConn3D );
+    CPPUNIT_TEST( testFindBoundaryNodes );
+    CPPUNIT_TEST( testBoundaryMesh );
+    CPPUNIT_TEST( testBuildPartOfMySelf );
+    CPPUNIT_TEST( testBuildPartOfMySelfNode );
+    CPPUNIT_TEST( testZipCoords );
+    CPPUNIT_TEST( testZipConnectivity );
+    CPPUNIT_TEST( testEqualMesh );
+    CPPUNIT_TEST( testEqualFieldDouble );
+    CPPUNIT_TEST( testNatureChecking );
+    CPPUNIT_TEST( testBuildSubMeshData );
+    CPPUNIT_TEST( testExtrudedMesh1 );
+    CPPUNIT_TEST( testExtrudedMesh2 );
+    CPPUNIT_TEST( testExtrudedMesh3 );
+    CPPUNIT_TEST( testExtrudedMesh4 );
+    CPPUNIT_TEST( testFindCommonNodes );
+    CPPUNIT_TEST( testCheckButterflyCells );
+    CPPUNIT_TEST( testMergeMesh1 );
+    CPPUNIT_TEST( testMergeMeshOnSameCoords1 );
+    CPPUNIT_TEST( testMergeField1 );
+    CPPUNIT_TEST( testFillFromAnalytic );
+    CPPUNIT_TEST( testFillFromAnalytic2 );
+    CPPUNIT_TEST( testApplyFunc );
+    CPPUNIT_TEST( testApplyFunc2 );
+    CPPUNIT_TEST( testOperationsOnFields );
+    CPPUNIT_TEST( testOperationsOnFields2 );
+    CPPUNIT_TEST( testOperationsOnFields3 );
+    CPPUNIT_TEST( testOperationsOnFields4 );
+    CPPUNIT_TEST( testMergeNodesOnField );
+    CPPUNIT_TEST( testCheckConsecutiveCellTypes );
+    CPPUNIT_TEST( testRearrange2ConsecutiveCellTypes );
+    CPPUNIT_TEST( testSplitByType );
+    CPPUNIT_TEST( testFuseUMeshesOnSameCoords );
+    CPPUNIT_TEST( testFuseUMeshesOnSameCoords2 );
+    CPPUNIT_TEST( testBuildOrthogonalField );
+    CPPUNIT_TEST( testGetCellsContainingPoint );
+    CPPUNIT_TEST( testGetValueOn1 );
+    CPPUNIT_TEST( testCMesh0 );
+    CPPUNIT_TEST( testScale );
+    CPPUNIT_TEST( testTryToShareSameCoords );
+    CPPUNIT_TEST( testFindNodeOnPlane );
+    CPPUNIT_TEST( testRenumberCells );
+    CPPUNIT_TEST( testChangeSpaceDimension );
+    CPPUNIT_TEST_SUITE_END();
+  public:
+    void testArray();
+    void testArray2();
+    void testArray3();
+    void testMesh();
+    void testMeshPointsCloud();
+    void testMeshM1D();
+    void testDeepCopy();
+    void testRevNodal();
+    void testConvertToPolyTypes();
+    void testDescConn2D();
+    void testDescConn3D();
+    void testFindBoundaryNodes();
+    void testBoundaryMesh();
+    void testBuildPartOfMySelf();
+    void testBuildPartOfMySelfNode();
+    void testZipCoords();
+    void testZipConnectivity();
+    void testEqualMesh();
+    void testEqualFieldDouble();
+    void testNatureChecking();
+    void testBuildSubMeshData();
+    void testExtrudedMesh1();
+    void testExtrudedMesh2();
+    void testExtrudedMesh3();
+    void testExtrudedMesh4();
+    void testFindCommonNodes();
+    void testCheckButterflyCells();
+    void testMergeMesh1();
+    void testMergeMeshOnSameCoords1();
+    void testMergeField1();
+    void testFillFromAnalytic();
+    void testFillFromAnalytic2();
+    void testApplyFunc();
+    void testApplyFunc2();
+    void testOperationsOnFields();
+    void testOperationsOnFields2();
+    void testOperationsOnFields3();
+    void testOperationsOnFields4();
+    void testMergeNodesOnField();
+    void testCheckConsecutiveCellTypes();
+    void testRearrange2ConsecutiveCellTypes();
+    void testSplitByType();
+    void testFuseUMeshesOnSameCoords();
+    void testFuseUMeshesOnSameCoords2();
+    void testBuildOrthogonalField();
+    void testGetCellsContainingPoint();
+    void testGetValueOn1();
+    void testCMesh0();
+    void testScale();
+    void testTryToShareSameCoords();
+    void testFindNodeOnPlane();
+    void testRenumberCells();
+    void testChangeSpaceDimension();
+  };
+}
+
+#endif
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest2.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest2.cxx
index 0b75ef8af..9c5c4bf12 100644
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest2.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest2.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include "MEDCouplingBasicsTest.hxx"
+#include "MEDCouplingBasicsTest2.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingExtrudedMesh.hxx"
@@ -31,7 +31,7 @@
 
 using namespace ParaMEDMEM;
 
-void MEDCouplingBasicsTest::testGaussPointField1()
+void MEDCouplingBasicsTest2::testGaussPointField1()
 {
   const double _a=0.446948490915965;
   const double _b=0.091576213509771;
@@ -119,7 +119,7 @@ void MEDCouplingBasicsTest::testGaussPointField1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGaussPointNEField1()
+void MEDCouplingBasicsTest2::testGaussPointNEField1()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_GAUSS_NE,NO_TIME);
@@ -146,7 +146,7 @@ void MEDCouplingBasicsTest::testGaussPointNEField1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCellOrientation1()
+void MEDCouplingBasicsTest2::testCellOrientation1()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   double vec[3]={0.,0.,1.};
@@ -182,7 +182,7 @@ void MEDCouplingBasicsTest::testCellOrientation1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCellOrientation2()
+void MEDCouplingBasicsTest2::testCellOrientation2()
 {
   MEDCouplingUMesh *m1=0;
   MEDCouplingUMesh *m2=build3DExtrudedUMesh_1(m1);
@@ -260,7 +260,7 @@ void MEDCouplingBasicsTest::testCellOrientation2()
 /*!
  * This test check polyhedron true barycenter computation. 
  */
-void MEDCouplingBasicsTest::testPolyhedronBarycenter()
+void MEDCouplingBasicsTest2::testPolyhedronBarycenter()
 {
   int connN[]={0,3,2,1, -1, 4,5,6,7, -1, 0,4,7,3, -1, 3,7,6,2, -1, 2,6,5,1, -1, 1,5,4,0};
   double coords[]={0.,0.,0., 1.,0.,0., 1.,1.,0., 0.,1.,0., 0.,0.,1., 1.,0.,1., 1.,1.,1., 0.,1.,1., 0.5, 0.5, 0.5};
@@ -323,7 +323,7 @@ void MEDCouplingBasicsTest::testPolyhedronBarycenter()
   meshN->decrRef();
 }
 
-void MEDCouplingBasicsTest::testNormL12Integ1D()
+void MEDCouplingBasicsTest2::testNormL12Integ1D()
 {
   MEDCouplingUMesh *m1=build1DTargetMesh_3();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -448,7 +448,7 @@ void MEDCouplingBasicsTest::testNormL12Integ1D()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testAreaBary2D()
+void MEDCouplingBasicsTest2::testAreaBary2D()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_3();
   MEDCouplingFieldDouble *f1=m1->getMeasureField(false);
@@ -500,7 +500,7 @@ void MEDCouplingBasicsTest::testAreaBary2D()
 /*!
  * This test check polyhedron true barycenter computation 2. 
  */
-void MEDCouplingBasicsTest::testAreaBary3D()
+void MEDCouplingBasicsTest2::testAreaBary3D()
 {
   double coords [] = { 0.241310763507 , 0.0504777305619 , 0.0682283524903 , 0.252501053866 , -0.0625176732937 , 0.137272639894 ,
                        0.152262663601 , 0.241816569527 , 0.133812556197 , 0.18047750211 , -0.0789949051358 , 0.339098173401 ,
@@ -594,7 +594,7 @@ void MEDCouplingBasicsTest::testAreaBary3D()
   meshN->decrRef();
 }
 
-void MEDCouplingBasicsTest::testRenumberCellsForFields()
+void MEDCouplingBasicsTest2::testRenumberCellsForFields()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -693,7 +693,7 @@ void MEDCouplingBasicsTest::testRenumberCellsForFields()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testRenumberNodesForFields()
+void MEDCouplingBasicsTest2::testRenumberNodesForFields()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_NODES,NO_TIME);
@@ -739,7 +739,7 @@ void MEDCouplingBasicsTest::testRenumberNodesForFields()
   f->decrRef();
 }
 
-void MEDCouplingBasicsTest::testConvertQuadraticCellsToLinear()
+void MEDCouplingBasicsTest2::testConvertQuadraticCellsToLinear()
 {
   MEDCouplingUMesh *mesh=build2DTargetMesh_3();
   mesh->checkCoherency();
@@ -770,7 +770,7 @@ void MEDCouplingBasicsTest::testConvertQuadraticCellsToLinear()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCheckGeoEquivalWith()
+void MEDCouplingBasicsTest2::testCheckGeoEquivalWith()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_3();
   MEDCouplingUMesh *mesh2=build2DTargetMesh_3();
@@ -875,7 +875,7 @@ void MEDCouplingBasicsTest::testCheckGeoEquivalWith()
   mesh2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCheckGeoEquivalWith2()
+void MEDCouplingBasicsTest2::testCheckGeoEquivalWith2()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_4();
   MEDCouplingUMesh *mesh2=build2DTargetMesh_1();
@@ -892,7 +892,7 @@ void MEDCouplingBasicsTest::testCheckGeoEquivalWith2()
   mesh2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCopyTinyStringsFromOnFields()
+void MEDCouplingBasicsTest2::testCopyTinyStringsFromOnFields()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   int nbOfCells=m->getNumberOfCells();
@@ -955,7 +955,7 @@ void MEDCouplingBasicsTest::testCopyTinyStringsFromOnFields()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testTryToShareSameCoordsPermute()
+void MEDCouplingBasicsTest2::testTryToShareSameCoordsPermute()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   MEDCouplingUMesh *m2=build3DSurfTargetMesh_1();
@@ -974,7 +974,7 @@ void MEDCouplingBasicsTest::testTryToShareSameCoordsPermute()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testTryToShareSameCoordsPermute2()
+void MEDCouplingBasicsTest2::testTryToShareSameCoordsPermute2()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_4();
   double targetCoords[8]={-0.3,-0.3, 0.2,-0.3, -0.3,0.2, 0.2,0.2 };
@@ -1020,7 +1020,7 @@ void MEDCouplingBasicsTest::testTryToShareSameCoordsPermute2()
   m2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testChangeUnderlyingMesh1()
+void MEDCouplingBasicsTest2::testChangeUnderlyingMesh1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_3();
   MEDCouplingUMesh *mesh2=build2DTargetMesh_3();
@@ -1068,7 +1068,7 @@ void MEDCouplingBasicsTest::testChangeUnderlyingMesh1()
   mesh2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetMaxValue1()
+void MEDCouplingBasicsTest2::testGetMaxValue1()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   int nbOfCells=m->getNumberOfCells();
@@ -1104,7 +1104,7 @@ void MEDCouplingBasicsTest::testGetMaxValue1()
   f->decrRef();
 }
 
-void MEDCouplingBasicsTest::testSubstractInPlaceDM1()
+void MEDCouplingBasicsTest2::testSubstractInPlaceDM1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_3();
   MEDCouplingUMesh *mesh2=build2DTargetMesh_3();
@@ -1143,7 +1143,7 @@ void MEDCouplingBasicsTest::testSubstractInPlaceDM1()
   mesh2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDotCrossProduct1()
+void MEDCouplingBasicsTest2::testDotCrossProduct1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_3();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -1182,7 +1182,7 @@ void MEDCouplingBasicsTest::testDotCrossProduct1()
   mesh1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMinMaxFields1()
+void MEDCouplingBasicsTest2::testMinMaxFields1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_3();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -1221,7 +1221,7 @@ void MEDCouplingBasicsTest::testMinMaxFields1()
   mesh1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testApplyLin1()
+void MEDCouplingBasicsTest2::testApplyLin1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_3();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,LINEAR_TIME);
@@ -1258,7 +1258,7 @@ void MEDCouplingBasicsTest::testApplyLin1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetIdsInRange1()
+void MEDCouplingBasicsTest2::testGetIdsInRange1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_3();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -1287,7 +1287,7 @@ void MEDCouplingBasicsTest::testGetIdsInRange1()
   mesh1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuildSubPart1()
+void MEDCouplingBasicsTest2::testBuildSubPart1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -1401,7 +1401,7 @@ void MEDCouplingBasicsTest::testBuildSubPart1()
   mesh1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDoublyContractedProduct1()
+void MEDCouplingBasicsTest2::testDoublyContractedProduct1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1426,7 +1426,7 @@ void MEDCouplingBasicsTest::testDoublyContractedProduct1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDeterminant1()
+void MEDCouplingBasicsTest2::testDeterminant1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,CONST_ON_TIME_INTERVAL);
@@ -1524,7 +1524,7 @@ void MEDCouplingBasicsTest::testDeterminant1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testEigenValues1()
+void MEDCouplingBasicsTest2::testEigenValues1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1554,7 +1554,7 @@ void MEDCouplingBasicsTest::testEigenValues1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testEigenVectors1()
+void MEDCouplingBasicsTest2::testEigenVectors1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1594,7 +1594,7 @@ void MEDCouplingBasicsTest::testEigenVectors1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testInverse1()
+void MEDCouplingBasicsTest2::testInverse1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1676,7 +1676,7 @@ void MEDCouplingBasicsTest::testInverse1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testTrace1()
+void MEDCouplingBasicsTest2::testTrace1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1733,7 +1733,7 @@ void MEDCouplingBasicsTest::testTrace1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDeviator1()
+void MEDCouplingBasicsTest2::testDeviator1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1766,7 +1766,7 @@ void MEDCouplingBasicsTest::testDeviator1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMagnitude1()
+void MEDCouplingBasicsTest2::testMagnitude1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1791,7 +1791,7 @@ void MEDCouplingBasicsTest::testMagnitude1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMaxPerTuple1()
+void MEDCouplingBasicsTest2::testMaxPerTuple1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1816,7 +1816,7 @@ void MEDCouplingBasicsTest::testMaxPerTuple1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testChangeNbOfComponents()
+void MEDCouplingBasicsTest2::testChangeNbOfComponents()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1848,7 +1848,7 @@ void MEDCouplingBasicsTest::testChangeNbOfComponents()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testSortPerTuple1()
+void MEDCouplingBasicsTest2::testSortPerTuple1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -1891,7 +1891,7 @@ void MEDCouplingBasicsTest::testSortPerTuple1()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testIsEqualWithoutConsideringStr1()
+void MEDCouplingBasicsTest2::testIsEqualWithoutConsideringStr1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   MEDCouplingUMesh *mesh2=build2DTargetMesh_1();
@@ -1966,7 +1966,7 @@ void MEDCouplingBasicsTest::testIsEqualWithoutConsideringStr1()
   mesh2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetNodeIdsOfCell1()
+void MEDCouplingBasicsTest2::testGetNodeIdsOfCell1()
 {
   MEDCouplingUMesh *mesh1=build2DTargetMesh_1();
   std::vector<int> nodeIds;
@@ -1983,7 +1983,7 @@ void MEDCouplingBasicsTest::testGetNodeIdsOfCell1()
   mesh1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetEdgeRatioField1()
+void MEDCouplingBasicsTest2::testGetEdgeRatioField1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=m1->getEdgeRatioField();
@@ -2008,7 +2008,7 @@ void MEDCouplingBasicsTest::testGetEdgeRatioField1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFillFromAnalytic3()
+void MEDCouplingBasicsTest2::testFillFromAnalytic3()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -2100,7 +2100,7 @@ void MEDCouplingBasicsTest::testFillFromAnalytic3()
   f1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFieldDoubleOpEqual1()
+void MEDCouplingBasicsTest2::testFieldDoubleOpEqual1()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -2138,7 +2138,7 @@ void MEDCouplingBasicsTest::testFieldDoubleOpEqual1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testAreaBary3D2()
+void MEDCouplingBasicsTest2::testAreaBary3D2()
 {
   const double coordsForHexa8[24]={
     -75.45749305371, 180.95495078401, 39.515472018008,
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest2.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest2.hxx
new file mode 100644
index 000000000..d0da20187
--- /dev/null
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest2.hxx
@@ -0,0 +1,125 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef __MEDCOUPLINGBASICSTEST2_HXX__
+#define __MEDCOUPLINGBASICSTEST2_HXX__
+
+#include "MEDCouplingBasicsTest.hxx"
+
+#include <map>
+#include <vector>
+
+namespace ParaMEDMEM
+{
+  class DataArrayDouble;
+  class MEDCouplingUMesh;
+  class MEDCouplingFieldDouble;
+  class MEDCouplingMultiFields;
+
+  class MEDCouplingBasicsTest2 : public MEDCouplingBasicsTest
+  {
+    CPPUNIT_TEST_SUITE(MEDCouplingBasicsTest2);
+    CPPUNIT_TEST( testGaussPointField1 );
+    CPPUNIT_TEST( testGaussPointNEField1 );
+    CPPUNIT_TEST( testCellOrientation1 );
+    CPPUNIT_TEST( testCellOrientation2 );
+    CPPUNIT_TEST( testPolyhedronBarycenter );
+    CPPUNIT_TEST( testNormL12Integ1D );
+    CPPUNIT_TEST( testAreaBary2D );
+    CPPUNIT_TEST( testAreaBary3D );
+    CPPUNIT_TEST( testRenumberCellsForFields );
+    CPPUNIT_TEST( testRenumberNodesForFields );
+    CPPUNIT_TEST( testConvertQuadraticCellsToLinear );
+    CPPUNIT_TEST( testCheckGeoEquivalWith );
+    CPPUNIT_TEST( testCheckGeoEquivalWith2 );
+    CPPUNIT_TEST( testCopyTinyStringsFromOnFields );
+    CPPUNIT_TEST( testTryToShareSameCoordsPermute );
+    CPPUNIT_TEST( testTryToShareSameCoordsPermute2 );
+    CPPUNIT_TEST( testChangeUnderlyingMesh1 );
+    CPPUNIT_TEST( testGetMaxValue1 );
+    CPPUNIT_TEST( testSubstractInPlaceDM1 );
+    CPPUNIT_TEST( testDotCrossProduct1 );
+    CPPUNIT_TEST( testMinMaxFields1 );
+    CPPUNIT_TEST( testApplyLin1 );
+    CPPUNIT_TEST( testGetIdsInRange1 );
+    CPPUNIT_TEST( testBuildSubPart1 );
+    CPPUNIT_TEST( testDoublyContractedProduct1 );
+    CPPUNIT_TEST( testDeterminant1 );
+    CPPUNIT_TEST( testEigenValues1 );
+    CPPUNIT_TEST( testEigenVectors1 );
+    CPPUNIT_TEST( testInverse1 );
+    CPPUNIT_TEST( testTrace1 );
+    CPPUNIT_TEST( testDeviator1 );
+    CPPUNIT_TEST( testMagnitude1 );
+    CPPUNIT_TEST( testMaxPerTuple1 );
+    CPPUNIT_TEST( testChangeNbOfComponents );
+    CPPUNIT_TEST( testSortPerTuple1 );
+    CPPUNIT_TEST( testIsEqualWithoutConsideringStr1 );
+    CPPUNIT_TEST( testGetNodeIdsOfCell1 );
+    CPPUNIT_TEST( testGetEdgeRatioField1 );
+    CPPUNIT_TEST( testFillFromAnalytic3 );
+    CPPUNIT_TEST( testFieldDoubleOpEqual1 );
+    CPPUNIT_TEST( testAreaBary3D2 );
+    CPPUNIT_TEST_SUITE_END();
+  public:
+    void testGaussPointField1();
+    void testGaussPointNEField1();
+    void testCellOrientation1();
+    void testCellOrientation2();
+    void testPolyhedronBarycenter();
+    void testNormL12Integ1D();
+    void testAreaBary2D();
+    void testAreaBary3D();
+    void testRenumberCellsForFields();
+    void testRenumberNodesForFields();
+    void testConvertQuadraticCellsToLinear();
+    void testCheckGeoEquivalWith();
+    void testCheckGeoEquivalWith2();
+    void testCopyTinyStringsFromOnFields();
+    void testTryToShareSameCoordsPermute();
+    void testTryToShareSameCoordsPermute2();
+    void testChangeUnderlyingMesh1();
+    void testGetMaxValue1();
+    void testSubstractInPlaceDM1();
+    void testDotCrossProduct1();
+    void testMinMaxFields1();
+    void testApplyLin1();
+    void testGetIdsInRange1();
+    void testBuildSubPart1();
+    void testDoublyContractedProduct1();
+    void testDeterminant1();
+    void testEigenValues1();
+    void testEigenVectors1();
+    void testInverse1();
+    void testTrace1();
+    void testDeviator1();
+    void testMagnitude1();
+    void testMaxPerTuple1();
+    void testChangeNbOfComponents();
+    void testSortPerTuple1();
+    void testIsEqualWithoutConsideringStr1();
+    void testGetNodeIdsOfCell1();
+    void testGetEdgeRatioField1();
+    void testFillFromAnalytic3();
+    void testFieldDoubleOpEqual1();
+    void testAreaBary3D2();
+  };
+}
+
+#endif
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
index 589ce1895..297ae18c0 100644
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include "MEDCouplingBasicsTest.hxx"
+#include "MEDCouplingBasicsTest3.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingExtrudedMesh.hxx"
@@ -31,7 +31,7 @@
 
 using namespace ParaMEDMEM;
 
-void MEDCouplingBasicsTest::testGetMeasureFieldCMesh1()
+void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1()
 {
   MEDCouplingCMesh *m=MEDCouplingCMesh::New();
   DataArrayDouble *da=DataArrayDouble::New();
@@ -143,7 +143,7 @@ void MEDCouplingBasicsTest::testGetMeasureFieldCMesh1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFieldDoubleZipCoords1()
+void MEDCouplingBasicsTest3::testFieldDoubleZipCoords1()
 {
   MEDCouplingUMesh *m=build2DTargetMeshMergeNode_1();
   MEDCouplingFieldDouble *f=m->fillFromAnalytic(ON_NODES,2,"x*2.");
@@ -170,7 +170,7 @@ void MEDCouplingBasicsTest::testFieldDoubleZipCoords1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFieldDoubleZipConnectivity1()
+void MEDCouplingBasicsTest3::testFieldDoubleZipConnectivity1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   MEDCouplingUMesh *m2=build2DTargetMesh_1();
@@ -234,7 +234,7 @@ void MEDCouplingBasicsTest::testFieldDoubleZipConnectivity1()
   m6->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDaDoubleRenumber1()
+void MEDCouplingBasicsTest3::testDaDoubleRenumber1()
 {
   DataArrayDouble *a=DataArrayDouble::New();
   a->alloc(7,2);
@@ -273,7 +273,7 @@ void MEDCouplingBasicsTest::testDaDoubleRenumber1()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDaDoubleRenumberAndReduce1()
+void MEDCouplingBasicsTest3::testDaDoubleRenumberAndReduce1()
 {
   DataArrayDouble *a=DataArrayDouble::New();
   a->alloc(7,2);
@@ -312,7 +312,7 @@ void MEDCouplingBasicsTest::testDaDoubleRenumberAndReduce1()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDaDoubleRenumberInPlace1()
+void MEDCouplingBasicsTest3::testDaDoubleRenumberInPlace1()
 {
   DataArrayDouble *a=DataArrayDouble::New();
   a->alloc(7,2);
@@ -341,7 +341,7 @@ void MEDCouplingBasicsTest::testDaDoubleRenumberInPlace1()
   c->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDaDoubleRenumberR1()
+void MEDCouplingBasicsTest3::testDaDoubleRenumberR1()
 {
   DataArrayDouble *a=DataArrayDouble::New();
   a->alloc(7,2);
@@ -380,7 +380,7 @@ void MEDCouplingBasicsTest::testDaDoubleRenumberR1()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDaDoubleRenumberInPlaceR1()
+void MEDCouplingBasicsTest3::testDaDoubleRenumberInPlaceR1()
 {
   DataArrayDouble *a=DataArrayDouble::New();
   a->alloc(7,2);
@@ -409,7 +409,7 @@ void MEDCouplingBasicsTest::testDaDoubleRenumberInPlaceR1()
   c->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDaDoubleSelectByTupleId1()
+void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleId1()
 {
   DataArrayDouble *a=DataArrayDouble::New();
   a->alloc(7,2);
@@ -448,7 +448,7 @@ void MEDCouplingBasicsTest::testDaDoubleSelectByTupleId1()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDaDoubleGetMinMaxValues1()
+void MEDCouplingBasicsTest3::testDaDoubleGetMinMaxValues1()
 {
   DataArrayDouble *a=DataArrayDouble::New();
   a->alloc(9,1);
@@ -486,7 +486,7 @@ void MEDCouplingBasicsTest::testDaDoubleGetMinMaxValues1()
   a->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFieldDoubleGetMinMaxValues2()
+void MEDCouplingBasicsTest3::testFieldDoubleGetMinMaxValues2()
 {
   MEDCouplingUMesh *m1=0;
   MEDCouplingUMesh *m2=build3DExtrudedUMesh_1(m1);
@@ -531,7 +531,7 @@ void MEDCouplingBasicsTest::testFieldDoubleGetMinMaxValues2()
   m2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuildUnstructuredCMesh1()
+void MEDCouplingBasicsTest3::testBuildUnstructuredCMesh1()
 {
   MEDCouplingCMesh *m=MEDCouplingCMesh::New();
   DataArrayDouble *da=DataArrayDouble::New();
@@ -619,7 +619,7 @@ void MEDCouplingBasicsTest::testBuildUnstructuredCMesh1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDataArrayIntInvertO2NNO21()
+void MEDCouplingBasicsTest3::testDataArrayIntInvertO2NNO21()
 {
   const int arr1[6]={2,0,4,1,5,3};
   DataArrayInt *da=DataArrayInt::New();
@@ -656,7 +656,7 @@ void MEDCouplingBasicsTest::testDataArrayIntInvertO2NNO21()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testKeepSetSelectedComponent1()
+void MEDCouplingBasicsTest3::testKeepSetSelectedComponent1()
 {
   const double arr1[20]={1.,2.,3.,4., 11.,12.,13.,14., 21.,22.,23.,24., 31.,32.,33.,34., 41.,42.,43.,44.};
   DataArrayDouble *a1=DataArrayDouble::New();
@@ -747,7 +747,7 @@ void MEDCouplingBasicsTest::testKeepSetSelectedComponent1()
   a1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testKeepSetSelectedComponent2()
+void MEDCouplingBasicsTest3::testKeepSetSelectedComponent2()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   const double arr1[20]={1.,2.,3.,4., 11.,12.,13.,14., 21.,22.,23.,24., 31.,32.,33.,34., 41.,42.,43.,44.};
@@ -819,7 +819,7 @@ void MEDCouplingBasicsTest::testKeepSetSelectedComponent2()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIGetIdsEqual1()
+void MEDCouplingBasicsTest3::testDAIGetIdsEqual1()
 {
   const int tab1[7]={5,-2,-4,-2,3,2,-2};
   DataArrayInt *da=DataArrayInt::New();
@@ -834,7 +834,7 @@ void MEDCouplingBasicsTest::testDAIGetIdsEqual1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIGetIdsEqualList1()
+void MEDCouplingBasicsTest3::testDAIGetIdsEqualList1()
 {
   const int tab1[7]={5,-2,-4,-2,3,2,-2};
   DataArrayInt *da=DataArrayInt::New();
@@ -851,7 +851,7 @@ void MEDCouplingBasicsTest::testDAIGetIdsEqualList1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAFromNoInterlace1()
+void MEDCouplingBasicsTest3::testDAFromNoInterlace1()
 {
   const int tab1[15]={1,11,21,31,41,2,12,22,32,42,3,13,23,33,43};
   DataArrayInt *da=DataArrayInt::New();
@@ -874,7 +874,7 @@ void MEDCouplingBasicsTest::testDAFromNoInterlace1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAToNoInterlace1()
+void MEDCouplingBasicsTest3::testDAToNoInterlace1()
 {
   const int tab1[15]={1,2,3,11,12,13,21,22,23,31,32,33,41,42,43};
   DataArrayInt *da=DataArrayInt::New();
@@ -897,7 +897,7 @@ void MEDCouplingBasicsTest::testDAToNoInterlace1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIsUniform1()
+void MEDCouplingBasicsTest3::testDAIsUniform1()
 {
   const int tab1[5]={1,1,1,1,1};
   DataArrayInt *da=DataArrayInt::New();
@@ -918,7 +918,7 @@ void MEDCouplingBasicsTest::testDAIsUniform1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDADFromPolarToCart1()
+void MEDCouplingBasicsTest3::testDADFromPolarToCart1()
 {
   const double tab1[4]={2.,0.2,2.5,0.7};
   DataArrayDouble *da=DataArrayDouble::New();
@@ -932,7 +932,7 @@ void MEDCouplingBasicsTest::testDADFromPolarToCart1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDADFromCylToCart1()
+void MEDCouplingBasicsTest3::testDADFromCylToCart1()
 {
   const double tab1[6]={2.,0.2,4.,2.5,0.7,9.};
   DataArrayDouble *da=DataArrayDouble::New();
@@ -946,7 +946,7 @@ void MEDCouplingBasicsTest::testDADFromCylToCart1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDADFromSpherToCart1()
+void MEDCouplingBasicsTest3::testDADFromSpherToCart1()
 {
   const double tab1[6]={2.,0.2,0.3,2.5,0.7,0.8};
   DataArrayDouble *da=DataArrayDouble::New();
@@ -960,7 +960,7 @@ void MEDCouplingBasicsTest::testDADFromSpherToCart1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUnPolyze1()
+void MEDCouplingBasicsTest3::testUnPolyze1()
 {
   const int elts[8]={0,1,2,3,4,5,6,7};
   std::vector<int> eltsV(elts,elts+8);
@@ -1006,7 +1006,7 @@ void MEDCouplingBasicsTest::testUnPolyze1()
   mesh2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testConvertDegeneratedCells1()
+void MEDCouplingBasicsTest3::testConvertDegeneratedCells1()
 {
   MEDCouplingUMesh *mesh=build3DTargetMesh_1();
   int conn[32]={0,1,3,3,9,10,12,12, 0,1,3,4,9,9,9,9, 1,1,1,1,10,12,9,10, 10,11,12,9,1,1,1,1};
@@ -1038,7 +1038,7 @@ void MEDCouplingBasicsTest::testConvertDegeneratedCells1()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetNodeIdsNearPoints1()
+void MEDCouplingBasicsTest3::testGetNodeIdsNearPoints1()
 {
   MEDCouplingUMesh *mesh=build2DTargetMesh_1();
   DataArrayDouble *coords=mesh->getCoords();
@@ -1072,7 +1072,7 @@ void MEDCouplingBasicsTest::testGetNodeIdsNearPoints1()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFieldCopyTinyAttrFrom1()
+void MEDCouplingBasicsTest3::testFieldCopyTinyAttrFrom1()
 {
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
   f1->setName("f1");
@@ -1168,7 +1168,7 @@ void MEDCouplingBasicsTest::testFieldCopyTinyAttrFrom1()
 /*!
  * 1D -> 2D extrusion with rotation
  */
-void MEDCouplingBasicsTest::testExtrudedMesh5()
+void MEDCouplingBasicsTest3::testExtrudedMesh5()
 {
   const double coo1[4]={0.,1.,2.,3.5};
   DataArrayDouble *a=DataArrayDouble::New();
@@ -1229,7 +1229,7 @@ void MEDCouplingBasicsTest::testExtrudedMesh5()
 /*!
  * 1D -> 2D extrusion without rotation
  */
-void MEDCouplingBasicsTest::testExtrudedMesh6()
+void MEDCouplingBasicsTest3::testExtrudedMesh6()
 {
   const double coo1[4]={0.,1.,2.,3.5};
   DataArrayDouble *a=DataArrayDouble::New();
@@ -1280,7 +1280,7 @@ void MEDCouplingBasicsTest::testExtrudedMesh6()
 /*!
  * 2D -> 3D extrusion with rotation
  */
-void MEDCouplingBasicsTest::testExtrudedMesh7()
+void MEDCouplingBasicsTest3::testExtrudedMesh7()
 {
   const double coo1[4]={0.,1.,2.,3.5};
   DataArrayDouble *a=DataArrayDouble::New();
@@ -1341,7 +1341,7 @@ void MEDCouplingBasicsTest::testExtrudedMesh7()
   a->decrRef();
 }
 
-void MEDCouplingBasicsTest::testSimplexize1()
+void MEDCouplingBasicsTest3::testSimplexize1()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   std::vector<int> v(1);
@@ -1403,7 +1403,7 @@ void MEDCouplingBasicsTest::testSimplexize1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testSimplexize2()
+void MEDCouplingBasicsTest3::testSimplexize2()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   std::vector<int> v(1);
@@ -1432,7 +1432,7 @@ void MEDCouplingBasicsTest::testSimplexize2()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAMeld1()
+void MEDCouplingBasicsTest3::testDAMeld1()
 {
   DataArrayDouble *da1=DataArrayDouble::New();
   da1->alloc(7,2);
@@ -1510,7 +1510,7 @@ void MEDCouplingBasicsTest::testDAMeld1()
   da3->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFieldMeld1()
+void MEDCouplingBasicsTest3::testFieldMeld1()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -1571,7 +1571,7 @@ void MEDCouplingBasicsTest::testFieldMeld1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMergeNodes2()
+void MEDCouplingBasicsTest3::testMergeNodes2()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   MEDCouplingUMesh *m2=build2DTargetMesh_1();
@@ -1596,7 +1596,7 @@ void MEDCouplingBasicsTest::testMergeNodes2()
   m2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMergeField2()
+void MEDCouplingBasicsTest3::testMergeField2()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -1636,7 +1636,7 @@ void MEDCouplingBasicsTest::testMergeField2()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIBuildComplement1()
+void MEDCouplingBasicsTest3::testDAIBuildComplement1()
 {
   DataArrayInt *a=DataArrayInt::New();
   const int tab[4]={3,1,7,8};
@@ -1652,7 +1652,7 @@ void MEDCouplingBasicsTest::testDAIBuildComplement1()
   a->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIBuildUnion1()
+void MEDCouplingBasicsTest3::testDAIBuildUnion1()
 {
   DataArrayInt *a=DataArrayInt::New();
   const int tab1[4]={3,1,7,8};
@@ -1673,7 +1673,7 @@ void MEDCouplingBasicsTest::testDAIBuildUnion1()
   a->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIBuildIntersection1()
+void MEDCouplingBasicsTest3::testDAIBuildIntersection1()
 {
   DataArrayInt *a=DataArrayInt::New();
   const int tab1[4]={3,1,7,8};
@@ -1694,7 +1694,7 @@ void MEDCouplingBasicsTest::testDAIBuildIntersection1()
   a->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIDeltaShiftIndex1()
+void MEDCouplingBasicsTest3::testDAIDeltaShiftIndex1()
 {
   DataArrayInt *a=DataArrayInt::New();
   const int tab[7]={1,3,6,7,7,9,15};
@@ -1710,7 +1710,7 @@ void MEDCouplingBasicsTest::testDAIDeltaShiftIndex1()
   a->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDaDoubleSelectByTupleIdSafe1()
+void MEDCouplingBasicsTest3::testDaDoubleSelectByTupleIdSafe1()
 {
   DataArrayDouble *a=DataArrayDouble::New();
   a->alloc(7,2);
@@ -1755,7 +1755,7 @@ void MEDCouplingBasicsTest::testDaDoubleSelectByTupleIdSafe1()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testAreCellsIncludedIn1()
+void MEDCouplingBasicsTest3::testAreCellsIncludedIn1()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   const int pt[2]={1,3};
@@ -1773,7 +1773,7 @@ void MEDCouplingBasicsTest::testAreCellsIncludedIn1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIBuildSubstraction1()
+void MEDCouplingBasicsTest3::testDAIBuildSubstraction1()
 {
   DataArrayInt *a=DataArrayInt::New();
   const int aa[]={2,3,6,8,9};
@@ -1795,7 +1795,7 @@ void MEDCouplingBasicsTest::testDAIBuildSubstraction1()
   a->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuildOrthogonalField2()
+void MEDCouplingBasicsTest3::testBuildOrthogonalField2()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   DataArrayInt *d1=DataArrayInt::New();
@@ -1822,7 +1822,7 @@ void MEDCouplingBasicsTest::testBuildOrthogonalField2()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMInsertNextCell1()
+void MEDCouplingBasicsTest3::testUMInsertNextCell1()
 {
   double targetCoords[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 };
   int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
@@ -1848,7 +1848,7 @@ void MEDCouplingBasicsTest::testUMInsertNextCell1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFieldOperatorDivDiffComp1()
+void MEDCouplingBasicsTest3::testFieldOperatorDivDiffComp1()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   DataArrayInt *d1=DataArrayInt::New();
@@ -1889,7 +1889,7 @@ void MEDCouplingBasicsTest::testFieldOperatorDivDiffComp1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDARearrange1()
+void MEDCouplingBasicsTest3::testDARearrange1()
 {
   DataArrayInt *da1=DataArrayInt::New();
   da1->alloc(12,1);
@@ -1976,7 +1976,7 @@ void MEDCouplingBasicsTest::testDARearrange1()
   da2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetDifferentValues1()
+void MEDCouplingBasicsTest3::testGetDifferentValues1()
 {
   DataArrayInt *da1=DataArrayInt::New();
   const int arr[12]={1,2,3,2,2,3,5,1,5,5,2,2};
@@ -1989,7 +1989,7 @@ void MEDCouplingBasicsTest::testGetDifferentValues1()
   da1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIBuildPermutationArr1()
+void MEDCouplingBasicsTest3::testDAIBuildPermutationArr1()
 {
   DataArrayInt *a=DataArrayInt::New();
   const int vala[5]={4,5,6,7,8};
@@ -2032,7 +2032,7 @@ void MEDCouplingBasicsTest::testDAIBuildPermutationArr1()
   b->decrRef();
 }
 
-void MEDCouplingBasicsTest::testAreCellsIncludedIn2()
+void MEDCouplingBasicsTest3::testAreCellsIncludedIn2()
 {
   const char myName[]="Vitoo";
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
@@ -2051,7 +2051,7 @@ void MEDCouplingBasicsTest::testAreCellsIncludedIn2()
   tmp->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshGetPartBarycenterAndOwner1()
+void MEDCouplingBasicsTest3::testUMeshGetPartBarycenterAndOwner1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   const int part[3]={1,0,4};
@@ -2065,7 +2065,7 @@ void MEDCouplingBasicsTest::testUMeshGetPartBarycenterAndOwner1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshGetPartMeasureField1()
+void MEDCouplingBasicsTest3::testUMeshGetPartMeasureField1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   const int part[3]={1,0,4};
@@ -2079,7 +2079,7 @@ void MEDCouplingBasicsTest::testUMeshGetPartMeasureField1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshBuildPartOrthogonalField1()
+void MEDCouplingBasicsTest3::testUMeshBuildPartOrthogonalField1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   m1->changeSpaceDimension(3);
@@ -2094,7 +2094,7 @@ void MEDCouplingBasicsTest::testUMeshBuildPartOrthogonalField1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshGetTypesOfPart1()
+void MEDCouplingBasicsTest3::testUMeshGetTypesOfPart1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   const int part1[]={0,3,4};
@@ -2114,7 +2114,7 @@ void MEDCouplingBasicsTest::testUMeshGetTypesOfPart1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshKeepCellIdsByType1()
+void MEDCouplingBasicsTest3::testUMeshKeepCellIdsByType1()
 {
   MEDCouplingUMesh *m1=build2DTargetMesh_1();
   const int part1[3]={0,3,4};
@@ -2142,7 +2142,7 @@ void MEDCouplingBasicsTest::testUMeshKeepCellIdsByType1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIAggregateMulti1()
+void MEDCouplingBasicsTest3::testDAIAggregateMulti1()
 {
   DataArrayInt *a=DataArrayInt::New();
   a->setName("aa");
@@ -2170,7 +2170,7 @@ void MEDCouplingBasicsTest::testDAIAggregateMulti1()
   b->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMergeUMeshes2()
+void MEDCouplingBasicsTest3::testMergeUMeshes2()
 {
   MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
   MEDCouplingUMesh *m2=build3DSurfTargetMesh_1();
@@ -2222,7 +2222,7 @@ void MEDCouplingBasicsTest::testMergeUMeshes2()
   m3_2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuild0DMeshFromCoords1()
+void MEDCouplingBasicsTest3::testBuild0DMeshFromCoords1()
 {
   const double sourceCoords[12]={-0.3,-0.3,0., 0.7,-0.3,0., -0.3,0.7,0., 0.7,0.7,0.};
   DataArrayDouble *coo=DataArrayDouble::New();
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest3.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.hxx
new file mode 100644
index 000000000..057c1522b
--- /dev/null
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest3.hxx
@@ -0,0 +1,159 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef __MEDCOUPLINGBASICSTEST3_HXX__
+#define __MEDCOUPLINGBASICSTEST3_HXX__
+
+#include "MEDCouplingBasicsTest.hxx"
+
+#include <map>
+#include <vector>
+
+namespace ParaMEDMEM
+{
+  class DataArrayDouble;
+  class MEDCouplingUMesh;
+  class MEDCouplingFieldDouble;
+  class MEDCouplingMultiFields;
+
+  class MEDCouplingBasicsTest3 : public MEDCouplingBasicsTest
+  {
+    CPPUNIT_TEST_SUITE(MEDCouplingBasicsTest3);
+    CPPUNIT_TEST( testGetMeasureFieldCMesh1 );
+    CPPUNIT_TEST( testFieldDoubleZipCoords1 );
+    CPPUNIT_TEST( testFieldDoubleZipConnectivity1 );
+    CPPUNIT_TEST( testDaDoubleRenumber1 );
+    CPPUNIT_TEST( testDaDoubleRenumberAndReduce1 );
+    CPPUNIT_TEST( testDaDoubleRenumberInPlace1 );
+    CPPUNIT_TEST( testDaDoubleSelectByTupleId1 );
+    CPPUNIT_TEST( testDaDoubleRenumberR1 );
+    CPPUNIT_TEST( testDaDoubleRenumberInPlaceR1 );
+    CPPUNIT_TEST( testDaDoubleGetMinMaxValues1 );
+    CPPUNIT_TEST( testFieldDoubleGetMinMaxValues2 );
+    CPPUNIT_TEST( testBuildUnstructuredCMesh1 );
+    CPPUNIT_TEST( testDataArrayIntInvertO2NNO21 );
+    CPPUNIT_TEST( testKeepSetSelectedComponent1 );
+    CPPUNIT_TEST( testKeepSetSelectedComponent2 );
+    CPPUNIT_TEST( testDAIGetIdsEqual1 );
+    CPPUNIT_TEST( testDAIGetIdsEqualList1 );
+    CPPUNIT_TEST( testDAFromNoInterlace1 );
+    CPPUNIT_TEST( testDAToNoInterlace1 );
+    CPPUNIT_TEST( testDAIsUniform1 );
+    CPPUNIT_TEST( testDADFromPolarToCart1 );
+    CPPUNIT_TEST( testDADFromCylToCart1 );
+    CPPUNIT_TEST( testDADFromSpherToCart1 );
+    CPPUNIT_TEST( testUnPolyze1 );
+    CPPUNIT_TEST( testConvertDegeneratedCells1 );
+    CPPUNIT_TEST( testGetNodeIdsNearPoints1 );
+    CPPUNIT_TEST( testFieldCopyTinyAttrFrom1 );
+    CPPUNIT_TEST( testExtrudedMesh5 );
+    CPPUNIT_TEST( testExtrudedMesh6 );
+    CPPUNIT_TEST( testExtrudedMesh7 );
+    CPPUNIT_TEST( testSimplexize1 );
+    CPPUNIT_TEST( testSimplexize2 );
+    CPPUNIT_TEST( testDAMeld1 );
+    CPPUNIT_TEST( testFieldMeld1 );
+    CPPUNIT_TEST( testMergeNodes2 );
+    CPPUNIT_TEST( testMergeField2 );
+    CPPUNIT_TEST( testDAIBuildComplement1 );
+    CPPUNIT_TEST( testDAIBuildUnion1 );
+    CPPUNIT_TEST( testDAIBuildIntersection1 );
+    CPPUNIT_TEST( testDAIDeltaShiftIndex1 );
+    CPPUNIT_TEST( testDaDoubleSelectByTupleIdSafe1 );
+    CPPUNIT_TEST( testAreCellsIncludedIn1 );
+    CPPUNIT_TEST( testDAIBuildSubstraction1 );
+    CPPUNIT_TEST( testBuildOrthogonalField2 );
+    CPPUNIT_TEST( testUMInsertNextCell1 );
+    CPPUNIT_TEST( testFieldOperatorDivDiffComp1 );
+    CPPUNIT_TEST( testDARearrange1 );
+    CPPUNIT_TEST( testGetDifferentValues1 );
+    CPPUNIT_TEST( testDAIBuildPermutationArr1 );
+    CPPUNIT_TEST( testAreCellsIncludedIn2 );
+    CPPUNIT_TEST( testUMeshGetPartBarycenterAndOwner1 );
+    CPPUNIT_TEST( testUMeshGetPartMeasureField1 );
+    CPPUNIT_TEST( testUMeshBuildPartOrthogonalField1 );
+    CPPUNIT_TEST( testUMeshGetTypesOfPart1 );
+    CPPUNIT_TEST( testUMeshKeepCellIdsByType1 );
+    CPPUNIT_TEST( testDAIAggregateMulti1 );
+    CPPUNIT_TEST( testMergeUMeshes2 );
+    CPPUNIT_TEST( testBuild0DMeshFromCoords1 );
+    CPPUNIT_TEST_SUITE_END();
+  public:
+    void testGetMeasureFieldCMesh1();
+    void testFieldDoubleZipCoords1();
+    void testFieldDoubleZipConnectivity1();
+    void testDaDoubleRenumber1();
+    void testDaDoubleRenumberAndReduce1();
+    void testDaDoubleRenumberInPlace1();
+    void testDaDoubleSelectByTupleId1();
+    void testDaDoubleRenumberR1();
+    void testDaDoubleRenumberInPlaceR1();
+    void testDaDoubleGetMinMaxValues1();
+    void testFieldDoubleGetMinMaxValues2();
+    void testBuildUnstructuredCMesh1();
+    void testDataArrayIntInvertO2NNO21();
+    void testKeepSetSelectedComponent1();
+    void testKeepSetSelectedComponent2();
+    void testDAIGetIdsEqual1();
+    void testDAIGetIdsEqualList1();
+    void testDAFromNoInterlace1();
+    void testDAToNoInterlace1();
+    void testDAIsUniform1();
+    void testDADFromPolarToCart1();
+    void testDADFromCylToCart1();
+    void testDADFromSpherToCart1();
+    void testUnPolyze1();
+    void testConvertDegeneratedCells1();
+    void testGetNodeIdsNearPoints1();
+    void testFieldCopyTinyAttrFrom1();
+    void testExtrudedMesh5();
+    void testExtrudedMesh6();
+    void testExtrudedMesh7();
+    void testSimplexize1();
+    void testSimplexize2();
+    void testDAMeld1();
+    void testFieldMeld1();
+    void testMergeNodes2();
+    void testMergeField2();
+    void testDAIBuildComplement1();
+    void testDAIBuildUnion1();
+    void testDAIBuildIntersection1();
+    void testDAIDeltaShiftIndex1();
+    void testDaDoubleSelectByTupleIdSafe1();
+    void testAreCellsIncludedIn1();
+    void testDAIBuildSubstraction1();
+    void testBuildOrthogonalField2();
+    void testUMInsertNextCell1();
+    void testFieldOperatorDivDiffComp1();
+    void testDARearrange1();
+    void testGetDifferentValues1();
+    void testDAIBuildPermutationArr1();
+    void testAreCellsIncludedIn2();
+    void testUMeshGetPartBarycenterAndOwner1();
+    void testUMeshGetPartMeasureField1();
+    void testUMeshBuildPartOrthogonalField1();
+    void testUMeshGetTypesOfPart1();
+    void testUMeshKeepCellIdsByType1();
+    void testDAIAggregateMulti1();
+    void testMergeUMeshes2();
+    void testBuild0DMeshFromCoords1();
+  };
+}
+
+#endif
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx
index 252cdf096..7ed5a04fb 100644
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include "MEDCouplingBasicsTest.hxx"
+#include "MEDCouplingBasicsTest4.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingExtrudedMesh.hxx"
@@ -33,7 +33,7 @@
 
 using namespace ParaMEDMEM;
 
-void MEDCouplingBasicsTest::testDescriptionInMeshTimeUnit1()
+void MEDCouplingBasicsTest4::testDescriptionInMeshTimeUnit1()
 {
   static const char text1[]="totoTTEDD";
   MEDCouplingUMesh *m=build2DTargetMesh_1();
@@ -57,7 +57,7 @@ void MEDCouplingBasicsTest::testDescriptionInMeshTimeUnit1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMultiFields1()
+void MEDCouplingBasicsTest4::testMultiFields1()
 {
   MEDCouplingMultiFields *mfs=buildMultiFields_1();
   std::vector<MEDCouplingMesh *> ms=mfs->getMeshes();
@@ -79,7 +79,7 @@ void MEDCouplingBasicsTest::testMultiFields1()
   mfs->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFieldOverTime1()
+void MEDCouplingBasicsTest4::testFieldOverTime1()
 {
   std::vector<MEDCouplingFieldDouble *> fs=buildMultiFields_2();
   CPPUNIT_ASSERT_THROW(MEDCouplingFieldOverTime::New(fs),INTERP_KERNEL::Exception);
@@ -157,7 +157,7 @@ void MEDCouplingBasicsTest::testFieldOverTime1()
   fot->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAICheckAndPreparePermutation1()
+void MEDCouplingBasicsTest4::testDAICheckAndPreparePermutation1()
 {
   const int vals1[]={9,10,0,6,4,11,3,7};
   const int expect1[]={5,6,0,3,2,7,1,4};
@@ -190,7 +190,7 @@ void MEDCouplingBasicsTest::testDAICheckAndPreparePermutation1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIChangeSurjectiveFormat1()
+void MEDCouplingBasicsTest4::testDAIChangeSurjectiveFormat1()
 {
   const int vals1[8]={0,3,2,3,2,2,1,2};
   const int expected1[5]={0,1,2,6,8};
@@ -213,7 +213,7 @@ void MEDCouplingBasicsTest::testDAIChangeSurjectiveFormat1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshGetCellIdsLyingOnNodes1()
+void MEDCouplingBasicsTest4::testUMeshGetCellIdsLyingOnNodes1()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   const int nodeIds1[5]={1,2,3,4,6};
@@ -233,7 +233,7 @@ void MEDCouplingBasicsTest::testUMeshGetCellIdsLyingOnNodes1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshFindCellsIdsOnBoundary1()
+void MEDCouplingBasicsTest4::testUMeshFindCellsIdsOnBoundary1()
 {
   MEDCouplingUMesh *m=build3DSurfTargetMesh_1();
   DataArrayInt *da5=m->findCellsIdsOnBoundary();
@@ -244,7 +244,7 @@ void MEDCouplingBasicsTest::testUMeshFindCellsIdsOnBoundary1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMeshSetTime1()
+void MEDCouplingBasicsTest4::testMeshSetTime1()
 {
   MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
   MEDCouplingUMesh *m2=build3DSurfTargetMesh_1();
@@ -308,7 +308,7 @@ void MEDCouplingBasicsTest::testMeshSetTime1()
   b->decrRef();
 }
 
-void MEDCouplingBasicsTest::testApplyFuncTwo1()
+void MEDCouplingBasicsTest4::testApplyFuncTwo1()
 {
   MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -350,7 +350,7 @@ void MEDCouplingBasicsTest::testApplyFuncTwo1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testApplyFuncThree1()
+void MEDCouplingBasicsTest4::testApplyFuncThree1()
 {
   MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
   MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -385,7 +385,7 @@ void MEDCouplingBasicsTest::testApplyFuncThree1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFillFromAnalyticTwo1()
+void MEDCouplingBasicsTest4::testFillFromAnalyticTwo1()
 {
   MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
   CPPUNIT_ASSERT_THROW(m1->fillFromAnalytic2(ON_NODES,1,"y+z"),INTERP_KERNEL::Exception);
@@ -402,7 +402,7 @@ void MEDCouplingBasicsTest::testFillFromAnalyticTwo1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFillFromAnalyticThree1()
+void MEDCouplingBasicsTest4::testFillFromAnalyticThree1()
 {
   MEDCouplingUMesh *m1=build3DSurfTargetMesh_1();
   std::vector<std::string> vs(3);
@@ -419,7 +419,7 @@ void MEDCouplingBasicsTest::testFillFromAnalyticThree1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAUnitVar1()
+void MEDCouplingBasicsTest4::testDAUnitVar1()
 {
   DataArrayDouble *da=DataArrayDouble::New();
   da->alloc(1,3);
@@ -485,7 +485,7 @@ void MEDCouplingBasicsTest::testDAUnitVar1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGaussCoordinates1()
+void MEDCouplingBasicsTest4::testGaussCoordinates1()
 {
   //Testing 1D cell types
   MEDCouplingUMesh *m1=build1DMultiTypes_1();
@@ -621,7 +621,7 @@ void MEDCouplingBasicsTest::testGaussCoordinates1()
 /*!
  * Not activated test ! To be implemented !
  */
-void MEDCouplingBasicsTest::testQ1Localization1()
+void MEDCouplingBasicsTest4::testQ1Localization1()
 {
   MEDCouplingUMesh *m=buildHexa8Mesh_1();
   MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_NODES,ONE_TIME);
@@ -642,7 +642,7 @@ void MEDCouplingBasicsTest::testQ1Localization1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testP2Localization1()
+void MEDCouplingBasicsTest4::testP2Localization1()
 {
   MEDCouplingUMesh *m=MEDCouplingUMesh::New("testP2",2);
   const double coords[12]={0.,2.,3.5,0.,4.5,1.5,1.2,0.32,3.4,1.,2.1,2.4};
@@ -676,7 +676,7 @@ void MEDCouplingBasicsTest::testP2Localization1()
   f->decrRef();
 }
 
-void MEDCouplingBasicsTest::testP2Localization2()
+void MEDCouplingBasicsTest4::testP2Localization2()
 {
   MEDCouplingUMesh *m=MEDCouplingUMesh::New("testP2_2",3);
   const double coords[30]={0.33312787792955395, -0.35155740179580952, -0.03567564825034563, 1.307146326477638, -0.57234557776250305, -0.08608044208272235, 0.5551834466499993, 0.62324964668794192, -0.014638951108536295, 0.37761817224442129, -0.38324019806913578, 0.96283164472856886, 0.79494856035658679, -0.40628057809270046, 0.0021004190225864614, 1.023740446371799, 0.07665912970471335, -0.072889657161871096, 0.54564584619517376, 0.11132872093429744, 0.039647326652013051, 0.27164784387819052, -0.42018012100866675, 0.46563376500745146, 0.89501965094896418, -0.56148455362735061, 0.43337469695473035, 0.49118025152924394, 0.093884938060727313, 0.47216346905220891};
@@ -710,7 +710,7 @@ void MEDCouplingBasicsTest::testP2Localization2()
   f->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetValueOn2()
+void MEDCouplingBasicsTest4::testGetValueOn2()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME);
@@ -755,7 +755,7 @@ void MEDCouplingBasicsTest::testGetValueOn2()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIGetIdsNotEqual1()
+void MEDCouplingBasicsTest4::testDAIGetIdsNotEqual1()
 {
   DataArrayInt *d=DataArrayInt::New();
   const int vals1[10]={2,3,5,6,8,5,5,6,1,-5};
@@ -783,7 +783,7 @@ void MEDCouplingBasicsTest::testDAIGetIdsNotEqual1()
   d2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIComputeOffsets1()
+void MEDCouplingBasicsTest4::testDAIComputeOffsets1()
 {
   DataArrayInt *d=DataArrayInt::New();
   const int vals1[6]={3,5,1,2,0,8};
@@ -798,7 +798,7 @@ void MEDCouplingBasicsTest::testDAIComputeOffsets1()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshHexagonPrism1()
+void MEDCouplingBasicsTest4::testUMeshHexagonPrism1()
 {
   const double coords[36]={
     0.8660254037844386, 0.5, 0.0, 0.0, 1.0, 0.0, -0.8660254037844386, 0.5, 0.0, -0.8660254037844386, -0.5, 0.0, 0.0, -1.0, 0.0, 0.8660254037844386, -0.5, 0.0,
@@ -860,7 +860,7 @@ void MEDCouplingBasicsTest::testUMeshHexagonPrism1()
   mesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDADCheckIsMonotonic()
+void MEDCouplingBasicsTest4::testDADCheckIsMonotonic()
 {
   DataArrayDouble *da=DataArrayDouble::New();
   const double vals[4]={-1.,1.01,2.03,6.};
@@ -879,7 +879,7 @@ void MEDCouplingBasicsTest::testDADCheckIsMonotonic()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testCheckCoherencyDeeper1()
+void MEDCouplingBasicsTest4::testCheckCoherencyDeeper1()
 {
   MEDCouplingUMesh *m=build3DSourceMesh_1();
   m->checkCoherency();
@@ -922,7 +922,7 @@ void MEDCouplingBasicsTest::testCheckCoherencyDeeper1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUnPolyze2()
+void MEDCouplingBasicsTest4::testUnPolyze2()
 {
   MEDCouplingUMesh *m=MEDCouplingUMesh::New("jjj",3);
   DataArrayDouble *coo=DataArrayDouble::New();
@@ -957,7 +957,7 @@ void MEDCouplingBasicsTest::testUnPolyze2()
   m2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDACpyFrom1()
+void MEDCouplingBasicsTest4::testDACpyFrom1()
 {
   DataArrayDouble *d=DataArrayDouble::New();
   d->alloc(12,1);
@@ -997,7 +997,7 @@ void MEDCouplingBasicsTest::testDACpyFrom1()
   d4->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAITransformWithIndArr1()
+void MEDCouplingBasicsTest4::testDAITransformWithIndArr1()
 {
   const int tab1[4]={17,18,22,19};
   const int tab2[12]={0,1,1,3,3,0,1,3,2,2,3,0};
@@ -1019,7 +1019,7 @@ void MEDCouplingBasicsTest::testDAITransformWithIndArr1()
   d1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIBuildPermArrPerLevel1()
+void MEDCouplingBasicsTest4::testDAIBuildPermArrPerLevel1()
 {
   const int arr[12]={2,0,1,1,0,1,2,0,1,1,0,0};
   const int expected1[12]={10,0,5,6,1,7,11,2,8,9,3,4};
@@ -1035,7 +1035,7 @@ void MEDCouplingBasicsTest::testDAIBuildPermArrPerLevel1()
   da2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIOperations1()
+void MEDCouplingBasicsTest4::testDAIOperations1()
 {
   const int arr1[12]={-1,-2,4,7,3,2,6,6,4,3,0,1};
   DataArrayInt *da=DataArrayInt::New();
@@ -1114,7 +1114,7 @@ void MEDCouplingBasicsTest::testDAIOperations1()
   da->decrRef();
 }
 
-void MEDCouplingBasicsTest::testEmulateMEDMEMBDC1()
+void MEDCouplingBasicsTest4::testEmulateMEDMEMBDC1()
 {
   MEDCouplingUMesh *m1=0;
   MEDCouplingUMesh *m=buildPointe_1(m1);
@@ -1169,7 +1169,7 @@ void MEDCouplingBasicsTest::testEmulateMEDMEMBDC1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetLevArrPerCellTypes1()
+void MEDCouplingBasicsTest4::testGetLevArrPerCellTypes1()
 {
   MEDCouplingUMesh *m1=0;
   MEDCouplingUMesh *m=buildPointe_1(m1);
@@ -1208,7 +1208,7 @@ void MEDCouplingBasicsTest::testGetLevArrPerCellTypes1()
   m1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testSortCellsInMEDFileFrmt1()
+void MEDCouplingBasicsTest4::testSortCellsInMEDFileFrmt1()
 {
   MEDCouplingUMesh *m1=0;
   MEDCouplingUMesh *m=buildPointe_1(m1);
@@ -1231,7 +1231,7 @@ void MEDCouplingBasicsTest::testSortCellsInMEDFileFrmt1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testBuildPartAndReduceNodes1()
+void MEDCouplingBasicsTest4::testBuildPartAndReduceNodes1()
 {
   MEDCouplingMesh *m=build2DTargetMesh_1();
   const int arr[2]={1,0};
@@ -1248,7 +1248,7 @@ void MEDCouplingBasicsTest::testBuildPartAndReduceNodes1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAITransformWithIndArrR1()
+void MEDCouplingBasicsTest4::testDAITransformWithIndArrR1()
 {
   const int tab1[6]={2,4,5,3,6,7};
   const int tab2[12]={-1,-1,0,1,2,3,4,5,-1,-1,-1,-1};
@@ -1271,7 +1271,7 @@ void MEDCouplingBasicsTest::testDAITransformWithIndArrR1()
   d1->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAISplitByValueRange1()
+void MEDCouplingBasicsTest4::testDAISplitByValueRange1()
 {
   const int val1[9]={6,5,0,3,2,7,8,1,4};
   const int val2[3]={0,4,9};
@@ -1307,7 +1307,7 @@ void MEDCouplingBasicsTest::testDAISplitByValueRange1()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testUMeshSplitProfilePerType1()
+void MEDCouplingBasicsTest4::testUMeshSplitProfilePerType1()
 {
   const int val0[5]={2,0,1,3,4};
   MEDCouplingUMesh *m=build2DTargetMesh_1();
@@ -1432,7 +1432,7 @@ void MEDCouplingBasicsTest::testUMeshSplitProfilePerType1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIBuildExplicitArrByRanges1()
+void MEDCouplingBasicsTest4::testDAIBuildExplicitArrByRanges1()
 {
   DataArrayInt *d=DataArrayInt::New();
   d->alloc(3,1);
@@ -1455,7 +1455,7 @@ void MEDCouplingBasicsTest::testDAIBuildExplicitArrByRanges1()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testDAIComputeOffsets2()
+void MEDCouplingBasicsTest4::testDAIComputeOffsets2()
 {
   DataArrayInt *d=DataArrayInt::New();
   const int vals1[6]={3,5,1,2,0,8};
@@ -1470,7 +1470,7 @@ void MEDCouplingBasicsTest::testDAIComputeOffsets2()
   d->decrRef();
 }
 
-void MEDCouplingBasicsTest::testMergeField3()
+void MEDCouplingBasicsTest4::testMergeField3()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   m->getCoords()->setInfoOnComponent(0,"x [m]");
@@ -1498,7 +1498,7 @@ void MEDCouplingBasicsTest::testMergeField3()
   f2->decrRef();
 }
 
-void MEDCouplingBasicsTest::testGetDistributionOfTypes1()
+void MEDCouplingBasicsTest4::testGetDistributionOfTypes1()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   const int tab1[5]={2,0,1,3,4};
@@ -1515,7 +1515,7 @@ void MEDCouplingBasicsTest::testGetDistributionOfTypes1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testNorm2_1()
+void MEDCouplingBasicsTest4::testNorm2_1()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -1535,7 +1535,7 @@ void MEDCouplingBasicsTest::testNorm2_1()
   f->decrRef();
 }
 
-void MEDCouplingBasicsTest::testNormMax1()
+void MEDCouplingBasicsTest4::testNormMax1()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -1555,7 +1555,7 @@ void MEDCouplingBasicsTest::testNormMax1()
   f->decrRef();
 }
 
-void MEDCouplingBasicsTest::testFindAndCorrectBadOriented3DExtrudedCells1()
+void MEDCouplingBasicsTest4::testFindAndCorrectBadOriented3DExtrudedCells1()
 {
   const double coords[38*3]={0.0011180339887498999, -0.0011755705045849499, 0.0, -0.0012331070204200001, -0.0011755705045849499, 0.0, -0.00067557050458494599, -0.00145964954842536, 0.0, -0.00050000000000000001, -0.00086602540378443902, 0.0, 0.00140211303259031, -0.00061803398874989504, 0.0, 0.00086602540378443902, -0.00050000000000000001, 0.0, 0.001, 0.0, 0.0, 0.00034561537182258202, 0.000269164072574575, 0.0, 0.0, 0.001, 0.0, -0.00050000000000000001, 0.00086602540378443902, 0.0, -0.000269164072574575, 0.00034561537182258202, 0.0, -0.001, 0.0, 0.0, -0.00086602540378443902, -0.00050000000000000001, 0.0, -0.00034561537182258202, -0.000269164072574575, 0.0, 0.0, -0.001, 0.0, 0.00050000000000000001, -0.00086602540378443902, 0.0, 0.000269164072574575, -0.00034561537182258202, 0.0, 0.0015, -6.01853107621011e-36, 0.0, 0.00056049747291484397, -0.00145964954842536, 0.0, 0.0011180339887498999, -0.0011755705045849499, 0.00050000000000000001, -0.0012331070204200001, -0.0011755705045849499, 0.00050000000000000001, -0.00067557050458494599, -0.00145964954842536, 0.00050000000000000001, -0.00050000000000000001, -0.00086602540378443902, 0.00050000000000000001, 0.00140211303259031, -0.00061803398874989504, 0.00050000000000000001, 0.00086602540378443902, -0.00050000000000000001, 0.00050000000000000001, 0.001, 0.0, 0.00050000000000000001, 0.00034561537182258202, 0.000269164072574575, 0.00050000000000000001, 0.0, 0.001, 0.00050000000000000001, -0.00050000000000000001, 0.00086602540378443902, 0.00050000000000000001, -0.000269164072574575, 0.00034561537182258202, 0.00050000000000000001, -0.001, 0.0, 0.00050000000000000001, -0.00086602540378443902, -0.00050000000000000001, 0.00050000000000000001, -0.00034561537182258202, -0.000269164072574575, 0.00050000000000000001, 0.0, -0.001, 0.00050000000000000001, 0.00050000000000000001, -0.00086602540378443902, 0.00050000000000000001, 0.000269164072574575, -0.00034561537182258202, 0.00050000000000000001, 0.0015, -6.01853107621011e-36, 0.00050000000000000001, 0.00056049747291484397, -0.00145964954842536, 0.00050000000000000001};
   const int conn[56]={2, 1, 3, 21, 20, 22, 4, 0, 5, 23, 19, 24, 8, 9, 10, 27, 28, 29, 11, 12, 13, 30, 31, 32, 0, 18, 15, 5, 19, 37, 34, 24, 6, 17, 4, 5, 25, 36, 23, 24, 3, 14, 16, 13, 22, 33, 35, 32, 13, 16, 7, 10, 32, 35, 26, 29};
@@ -1587,7 +1587,7 @@ void MEDCouplingBasicsTest::testFindAndCorrectBadOriented3DExtrudedCells1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testConvertExtrudedPolyhedra1()
+void MEDCouplingBasicsTest4::testConvertExtrudedPolyhedra1()
 {
   const int conn[72]={1,2,3,4, 5,6,7,8,9,10,11,12, 13,14,15,16, 17,18,19,20,21,22, 23,24,25,26,27,28, 29,30,31,32,33,34,35,36,37,38, 39,40,41,42,43,44,45,46, 47,48,49,50,51,52,53,54,55,56,57,58, 59,60,61,62,63,64,65,66,67,68,69,70,71,72};
   MEDCouplingUMesh *m=MEDCouplingUMesh::New("Example",3);
@@ -1633,7 +1633,7 @@ void MEDCouplingBasicsTest::testConvertExtrudedPolyhedra1()
   m->decrRef();
 }
 
-void MEDCouplingBasicsTest::testNonRegressionCopyTinyStrings()
+void MEDCouplingBasicsTest4::testNonRegressionCopyTinyStrings()
 {
   MEDCouplingUMesh *m=build2DTargetMesh_1();
   MEDCouplingFieldDouble *f1=m->getMeasureField(true);
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.hxx
new file mode 100644
index 000000000..d4048eae2
--- /dev/null
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.hxx
@@ -0,0 +1,130 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef __MEDCOUPLINGBASICSTEST4_HXX__
+#define __MEDCOUPLINGBASICSTEST4_HXX__
+
+#include "MEDCouplingBasicsTest.hxx"
+
+#include <map>
+#include <vector>
+
+namespace ParaMEDMEM
+{
+  class DataArrayDouble;
+  class MEDCouplingUMesh;
+  class MEDCouplingFieldDouble;
+  class MEDCouplingMultiFields;
+
+  class MEDCouplingBasicsTest4 : public MEDCouplingBasicsTest
+  {
+    CPPUNIT_TEST_SUITE(MEDCouplingBasicsTest4);
+    CPPUNIT_TEST( testDescriptionInMeshTimeUnit1 );
+    CPPUNIT_TEST( testMultiFields1 );
+    CPPUNIT_TEST( testFieldOverTime1 );
+    CPPUNIT_TEST( testDAICheckAndPreparePermutation1 );
+    CPPUNIT_TEST( testDAIChangeSurjectiveFormat1 );
+    CPPUNIT_TEST( testUMeshGetCellIdsLyingOnNodes1 );
+    CPPUNIT_TEST( testUMeshFindCellsIdsOnBoundary1 );
+    CPPUNIT_TEST( testMeshSetTime1 );
+    CPPUNIT_TEST( testApplyFuncTwo1 );
+    CPPUNIT_TEST( testApplyFuncThree1 );
+    CPPUNIT_TEST( testFillFromAnalyticTwo1 );
+    CPPUNIT_TEST( testFillFromAnalyticThree1 );
+    CPPUNIT_TEST( testDAUnitVar1 );
+    CPPUNIT_TEST( testGaussCoordinates1 );
+    CPPUNIT_TEST( testP2Localization1 );
+    CPPUNIT_TEST( testP2Localization2 );
+    CPPUNIT_TEST( testGetValueOn2 );
+    CPPUNIT_TEST( testDAIGetIdsNotEqual1 );
+    CPPUNIT_TEST( testDAIComputeOffsets1 );
+    CPPUNIT_TEST( testUMeshHexagonPrism1 );
+    CPPUNIT_TEST( testDADCheckIsMonotonic );
+    CPPUNIT_TEST( testCheckCoherencyDeeper1 );
+    CPPUNIT_TEST( testUnPolyze2 );
+    CPPUNIT_TEST( testDACpyFrom1 );
+    CPPUNIT_TEST( testDAITransformWithIndArr1 );
+    CPPUNIT_TEST( testDAIBuildPermArrPerLevel1 );
+    CPPUNIT_TEST( testDAIOperations1 );
+    CPPUNIT_TEST( testEmulateMEDMEMBDC1 );
+    CPPUNIT_TEST( testGetLevArrPerCellTypes1 );
+    CPPUNIT_TEST( testSortCellsInMEDFileFrmt1 );
+    CPPUNIT_TEST( testBuildPartAndReduceNodes1 );
+    CPPUNIT_TEST( testDAITransformWithIndArrR1 );
+    CPPUNIT_TEST( testDAISplitByValueRange1 );
+    CPPUNIT_TEST( testUMeshSplitProfilePerType1 );
+    CPPUNIT_TEST( testDAIBuildExplicitArrByRanges1 );
+    CPPUNIT_TEST( testDAIComputeOffsets2 );
+    CPPUNIT_TEST( testMergeField3 );
+    CPPUNIT_TEST( testGetDistributionOfTypes1 );
+    CPPUNIT_TEST( testNorm2_1 );
+    CPPUNIT_TEST( testNormMax1 );
+    CPPUNIT_TEST( testFindAndCorrectBadOriented3DExtrudedCells1 );
+    CPPUNIT_TEST( testConvertExtrudedPolyhedra1 );
+    CPPUNIT_TEST( testNonRegressionCopyTinyStrings );
+    CPPUNIT_TEST_SUITE_END();
+  public:
+    void testDescriptionInMeshTimeUnit1();
+    void testMultiFields1();
+    void testFieldOverTime1();
+    void testDAICheckAndPreparePermutation1();
+    void testDAIChangeSurjectiveFormat1();
+    void testUMeshGetCellIdsLyingOnNodes1();
+    void testUMeshFindCellsIdsOnBoundary1();
+    void testMeshSetTime1();
+    void testApplyFuncTwo1();
+    void testApplyFuncThree1();
+    void testFillFromAnalyticTwo1();
+    void testFillFromAnalyticThree1();
+    void testDAUnitVar1();
+    void testGaussCoordinates1();
+    void testQ1Localization1();
+    void testP2Localization1();
+    void testP2Localization2();
+    void testGetValueOn2();
+    void testDAIGetIdsNotEqual1();
+    void testDAIComputeOffsets1();
+    void testUMeshHexagonPrism1();
+    void testDADCheckIsMonotonic();
+    void testCheckCoherencyDeeper1();
+    void testUnPolyze2();
+    void testDACpyFrom1();
+    void testDAITransformWithIndArr1();
+    void testDAIBuildPermArrPerLevel1();
+    void testDAIOperations1();
+    void testEmulateMEDMEMBDC1();
+    void testGetLevArrPerCellTypes1();
+    void testSortCellsInMEDFileFrmt1();
+    void testBuildPartAndReduceNodes1();
+    void testDAITransformWithIndArrR1();
+    void testDAISplitByValueRange1();
+    void testUMeshSplitProfilePerType1();
+    void testDAIBuildExplicitArrByRanges1();
+    void testDAIComputeOffsets2();
+    void testMergeField3();
+    void testGetDistributionOfTypes1();
+    void testNorm2_1();
+    void testNormMax1();
+    void testFindAndCorrectBadOriented3DExtrudedCells1();
+    void testConvertExtrudedPolyhedra1();
+    void testNonRegressionCopyTinyStrings();
+  };
+}
+
+#endif
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
index d56c498a3..e37858cc1 100644
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include "MEDCouplingBasicsTest.hxx"
+#include "MEDCouplingBasicsTestInterp.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
@@ -42,7 +42,7 @@ using namespace ParaMEDMEM;
 
 typedef std::vector<std::map<int,double> > IntersectionMatrix;
 
-void MEDCouplingBasicsTest::test2DInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -73,7 +73,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP0P0PL_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP0P0PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -99,7 +99,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP0P0PL_2()
+void MEDCouplingBasicsTestInterp::test2DInterpP0P0PL_2()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -130,7 +130,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0PL_2()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP0P0PL_3()
+void MEDCouplingBasicsTestInterp::test2DInterpP0P0PL_3()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -161,7 +161,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0PL_3()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP0P0PL_4()
+void MEDCouplingBasicsTestInterp::test2DInterpP0P0PL_4()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -196,7 +196,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0PL_4()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP0P1_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP0P1_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -232,7 +232,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P1_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP0P1PL_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP0P1PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -264,7 +264,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P1PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP0P1PL_2()
+void MEDCouplingBasicsTestInterp::test2DInterpP0P1PL_2()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -306,7 +306,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P1PL_2()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP1P0_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP1P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -339,7 +339,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P0_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP1P0PL_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP1P0PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -376,7 +376,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P0PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP1P0PL_2()
+void MEDCouplingBasicsTestInterp::test2DInterpP1P0PL_2()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -418,7 +418,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P0PL_2()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP1P1_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP1P1_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_2();
@@ -457,7 +457,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P1_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP1P1PL_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP1P1PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -491,7 +491,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P1PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
@@ -522,7 +522,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P0_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP0P0PL_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP0P0PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
@@ -549,7 +549,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P0PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP0P1_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP0P1_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
@@ -585,7 +585,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P1_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP0P1PL_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP0P1PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
@@ -617,7 +617,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P1PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP1P0_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP1P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
@@ -650,7 +650,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P0_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP1P0PL_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP1P0PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
@@ -687,7 +687,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P0PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP1P1_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP1P1_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_2();
@@ -726,7 +726,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P1_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP1P1PL_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP1P1PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
@@ -760,7 +760,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P1PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP0P0_2()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP0P0_2()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMeshPerm_1();
@@ -828,7 +828,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P0_2()
 /*!
  * Test of precision option implemented by Fabien that represents distance of "barycenter" to the other cell.
  */
-void MEDCouplingBasicsTest::test3DSurfInterpP0P0_3()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP0P0_3()
 {
   INTERP_KERNEL::Interpolation3DSurf myInterpolator;
   std::vector<std::map<int,double> > res;
@@ -918,7 +918,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P0_3()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
@@ -986,7 +986,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0P0PL_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP0P0PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
@@ -1032,7 +1032,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0P0PL_2()
+void MEDCouplingBasicsTestInterp::test3DInterpP0P0PL_2()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
@@ -1082,7 +1082,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0PL_2()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0P0PL_3()
+void MEDCouplingBasicsTestInterp::test3DInterpP0P0PL_3()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
@@ -1132,7 +1132,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0PL_3()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0P0PL_4()
+void MEDCouplingBasicsTestInterp::test3DInterpP0P0PL_4()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
@@ -1186,7 +1186,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0PL_4()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0P1_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP0P1_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DTargetMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSourceMesh_1();
@@ -1242,7 +1242,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P1_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0P1PL_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP0P1PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DTargetMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSourceMesh_1();
@@ -1276,7 +1276,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P1PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP1P0_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP1P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
@@ -1332,7 +1332,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P0_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP1P0PL_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP1P0PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
@@ -1380,7 +1380,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P0PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP1P1_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP1P1_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_2();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_2();
@@ -1430,7 +1430,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P1_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP1P1PL_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP1P1PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_2();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_2();
@@ -1457,7 +1457,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P1PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0P0Empty()
+void MEDCouplingBasicsTestInterp::test3DInterpP0P0Empty()
 {
   MEDCouplingUMesh *sourceMesh=MEDCouplingUMesh::New();
   sourceMesh->setMeshDimension(2);
@@ -1486,7 +1486,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0Empty()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::testInterpolationCC()
+void MEDCouplingBasicsTestInterp::testInterpolationCC()
 {
   double arr1[3] = { 0/2., 1/2., 2/2. };
   double arr2[4] = { 0/3, 1/3., 2/3., 3/3. };
@@ -1553,7 +1553,7 @@ void MEDCouplingBasicsTest::testInterpolationCC()
   mesh[1]->decrRef();
 }
 
-void MEDCouplingBasicsTest::testInterpolationCU1D()
+void MEDCouplingBasicsTestInterp::testInterpolationCU1D()
 {
   MEDCouplingCMesh* meshC = MEDCouplingCMesh::New();
   DataArrayDouble* coords = DataArrayDouble::New();
@@ -1591,7 +1591,7 @@ void MEDCouplingBasicsTest::testInterpolationCU1D()
   meshU->decrRef();
 }
 
-void MEDCouplingBasicsTest::testInterpolationCU2D()
+void MEDCouplingBasicsTestInterp::testInterpolationCU2D()
 {
   MEDCouplingCMesh* meshC = MEDCouplingCMesh::New();
   DataArrayDouble* coords = DataArrayDouble::New();
@@ -1660,7 +1660,7 @@ void MEDCouplingBasicsTest::testInterpolationCU2D()
   meshU->decrRef();
 }
 
-void MEDCouplingBasicsTest::testInterpolationCU3D()
+void MEDCouplingBasicsTestInterp::testInterpolationCU3D()
 {
   MEDCouplingCMesh* meshC = MEDCouplingCMesh::New();
   DataArrayDouble* coords = DataArrayDouble::New();
@@ -1752,7 +1752,7 @@ void MEDCouplingBasicsTest::testInterpolationCU3D()
   meshU->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP0IntegralUniform()
+void MEDCouplingBasicsTestInterp::test2DInterpP0IntegralUniform()
 {
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
   //
@@ -1805,7 +1805,7 @@ void MEDCouplingBasicsTest::test2DInterpP0IntegralUniform()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP0IntegralUniform()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP0IntegralUniform()
 {
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
   INTERP_KERNEL::Interpolation3DSurf myInterpolator;
@@ -1831,7 +1831,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0IntegralUniform()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP0IntegralUniform()
+void MEDCouplingBasicsTestInterp::test3DInterpP0IntegralUniform()
 {
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_1();
   INTERP_KERNEL::Interpolation3D myInterpolator;
@@ -1864,7 +1864,7 @@ void MEDCouplingBasicsTest::test3DInterpP0IntegralUniform()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP1IntegralUniform()
+void MEDCouplingBasicsTestInterp::test2DInterpP1IntegralUniform()
 {
   MEDCouplingUMesh *targetMesh=build2DSourceMesh_1();
   //
@@ -1888,7 +1888,7 @@ void MEDCouplingBasicsTest::test2DInterpP1IntegralUniform()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DInterpP1IntegralUniform()
+void MEDCouplingBasicsTestInterp::test3DInterpP1IntegralUniform()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_1();
   //
@@ -1923,7 +1923,7 @@ void MEDCouplingBasicsTest::test3DInterpP1IntegralUniform()
   sourceMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DInterpP1P0Bary_1()
+void MEDCouplingBasicsTestInterp::test2DInterpP1P0Bary_1()
 {
   MEDCouplingUMesh *sourceMesh=build2DSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build2DTargetMesh_1();
@@ -1965,7 +1965,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P0Bary_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DSurfInterpP1P0Bary_1()
+void MEDCouplingBasicsTestInterp::test3DSurfInterpP1P0Bary_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSurfSourceMesh_1();
   MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1();
@@ -2008,7 +2008,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P0Bary_1()
 }
 
 #include <iomanip>
-void MEDCouplingBasicsTest::test3DInterpP1P0Bary_1()
+void MEDCouplingBasicsTestInterp::test3DInterpP1P0Bary_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DSourceMesh_2();
   MEDCouplingUMesh *targetMesh=build3DTargetMesh_2();
@@ -2052,7 +2052,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P0Bary_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3DTo1DInterpP0P0PL_1()
+void MEDCouplingBasicsTestInterp::test3DTo1DInterpP0P0PL_1()
 {
   MEDCouplingUMesh *sourceMesh=build3DTargetMesh_1();
   MEDCouplingUMesh *targetMesh=build1DTargetMesh_1();
@@ -2079,7 +2079,7 @@ void MEDCouplingBasicsTest::test3DTo1DInterpP0P0PL_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test1DInterp_1()
+void MEDCouplingBasicsTestInterp::test1DInterp_1()
 {
   //      c1   c0    c2    - pay attention to cell order!
   // S: o---o------o---o
@@ -2144,7 +2144,7 @@ void MEDCouplingBasicsTest::test1DInterp_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DCurveInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test2DCurveInterpP0P0_1()
 {
   // coincident meshes
   MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0,0);
@@ -2167,7 +2167,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP0P0_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DCurveInterpP0P0_2()
+void MEDCouplingBasicsTestInterp::test2DCurveInterpP0P0_2()
 {
   // equal meshes shifted one from another along X by 0.5
   MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0.5,0);
@@ -2193,7 +2193,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP0P0_2()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DCurveInterpP0P1_1()
+void MEDCouplingBasicsTestInterp::test2DCurveInterpP0P1_1()
 {
   // coincident meshes
   MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0,0);
@@ -2219,7 +2219,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP0P1_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DCurveInterpP1P0_1()
+void MEDCouplingBasicsTestInterp::test2DCurveInterpP1P0_1()
 {
   // coincident meshes
   MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0,0);
@@ -2245,7 +2245,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP1P0_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2DCurveInterpP1P1_1()
+void MEDCouplingBasicsTestInterp::test2DCurveInterpP1P1_1()
 {
   // coincident meshes
   MEDCouplingUMesh *sourceMesh=build2DCurveMesh(0,0);
@@ -2270,7 +2270,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP1P1_1()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test2D1DBasicInterpP0P0()
+void MEDCouplingBasicsTestInterp::test2D1DBasicInterpP0P0()
 {
   MEDCouplingUMesh *sourceMesh=build2D1DSourceMesh();
   MEDCouplingUMesh *targetMesh=build2D1DTargetMesh();
@@ -2319,60 +2319,14 @@ void MEDCouplingBasicsTest::test2D1DBasicInterpP0P0()
   targetMesh->decrRef();
 }
 
-int MEDCouplingBasicsTest::countNonZero(const std::vector< std::map<int,double> >& matrix)
-{
-  int ret=0.;
-  for(std::vector< std::map<int,double> >::const_iterator iter=matrix.begin();iter!=matrix.end();iter++)
-    for(std::map<int,double>::const_iterator iter2=(*iter).begin();iter2!=(*iter).end();iter2++)
-      if (!INTERP_KERNEL::epsilonEqual((*iter2).second, 0.)) ret +=1;
-  return ret;
-}
-
-void MEDCouplingBasicsTest::test2D1DMeshesIntersection(MEDCouplingUMesh *sourceMesh,
-                                                       MEDCouplingUMesh *targetMesh,
-                                                       const double correctLength,
-                                                       const int correctDuplicateFacesNbr,
-                                                       const int correctTotalIntersectFacesNbr)
-{
-  MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation2D1D myInterpolator;
-  myInterpolator.setPrecision(1e-12);
-  const double prec = 1.0e-5;
-  IntersectionMatrix matrix;
-  myInterpolator.setIntersectionType(INTERP_KERNEL::Geometric2D);
-  myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,matrix,"P0P0");
-
-  std::cout.precision(16);
-
-  const double length = sumAll(matrix);
-  LOG(1, "length =  " << surf <<"  correctLength = " << correctLength );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(correctLength, length, prec * std::max(correctLength, length));
-
-  INTERP_KERNEL::Interpolation3D2D::DuplicateFacesType duplicateFaces = myInterpolator.retrieveDuplicateFaces();
-  int duplicateFacesNbr = duplicateFaces.size();
-  LOG(1, "duplicateFacesNbr =  " << duplicateFacesNbr <<"  correctDuplicateFacesNbr = " <<  correctDuplicateFacesNbr);
-  CPPUNIT_ASSERT_EQUAL(correctDuplicateFacesNbr, duplicateFacesNbr);
-
-  if (correctTotalIntersectFacesNbr >= 0)
-    {
-      int totalIntersectFacesNbr = countNonZero(matrix);
-      LOG(1, "totalIntersectFacesNbr =  " << totalIntersectFacesNbr <<"  correctTotalIntersectFacesNbr = " << correctTotalIntersectFacesNbr );
-      CPPUNIT_ASSERT_EQUAL(correctTotalIntersectFacesNbr, totalIntersectFacesNbr);
-    }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test2D1DSegQuadInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build2D1DSegSourceMesh();
   MEDCouplingUMesh *targetMesh=build2D1DQuadTargetMesh();
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 16., 0, 4);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_2()
+void MEDCouplingBasicsTestInterp::test2D1DSegQuadInterpP0P0_2()
 {
   const double shiftX = 3.;
   MEDCouplingUMesh *sourceMesh=build2D1DSegSourceMesh(shiftX);
@@ -2380,7 +2334,7 @@ void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_2()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 2. * 16., 4, 2 * 4);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_3()
+void MEDCouplingBasicsTestInterp::test2D1DSegQuadInterpP0P0_3()
 {
   const double shiftX = 1.5;
   const double inclinationX = 3.;
@@ -2389,7 +2343,7 @@ void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_3()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 20., 0, 4);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_4()
+void MEDCouplingBasicsTestInterp::test2D1DSegQuadInterpP0P0_4()
 {
   const double shiftX = 3.;
   const double inclinationX = 3.;
@@ -2398,7 +2352,7 @@ void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_4()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 2. * 20., 4, 2 * 4);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_5()
+void MEDCouplingBasicsTestInterp::test2D1DSegQuadInterpP0P0_5()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2407,7 +2361,7 @@ void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_5()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 12., 0, 3);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_6()
+void MEDCouplingBasicsTestInterp::test2D1DSegQuadInterpP0P0_6()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2416,14 +2370,14 @@ void MEDCouplingBasicsTest::test2D1DSegQuadInterpP0P0_6()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 10., 0, 2);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test2D1DSegTriInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build2D1DSegSourceMesh();
   MEDCouplingUMesh *targetMesh=build2D1DTriTargetMesh();
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 16., 0, 4);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_2()
+void MEDCouplingBasicsTestInterp::test2D1DSegTriInterpP0P0_2()
 {
   const double shiftX = 3.;
   MEDCouplingUMesh *sourceMesh=build2D1DSegSourceMesh(shiftX);
@@ -2431,7 +2385,7 @@ void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_2()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 2. * 16., 4, 2 * 4);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_3()
+void MEDCouplingBasicsTestInterp::test2D1DSegTriInterpP0P0_3()
 {
   const double shiftX = 1.5;
   const double inclinationX = 3.;
@@ -2440,7 +2394,7 @@ void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_3()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 20., 0, 8);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_4()
+void MEDCouplingBasicsTestInterp::test2D1DSegTriInterpP0P0_4()
 {
   const double shiftX = 3.;
   const double inclinationX = 3.;
@@ -2449,7 +2403,7 @@ void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_4()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 2. * 20., 4, 8);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_5()
+void MEDCouplingBasicsTestInterp::test2D1DSegTriInterpP0P0_5()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2458,7 +2412,7 @@ void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_5()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 12., 0, 6);
 }
 
-void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_6()
+void MEDCouplingBasicsTestInterp::test2D1DSegTriInterpP0P0_6()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2467,7 +2421,7 @@ void MEDCouplingBasicsTest::test2D1DSegTriInterpP0P0_6()
   test2D1DMeshesIntersection(sourceMesh, targetMesh, 20., 2, 4);
 }
 
-void MEDCouplingBasicsTest::test3D2DBasicInterpP0P0()
+void MEDCouplingBasicsTestInterp::test3D2DBasicInterpP0P0()
 {
   MEDCouplingUMesh *sourceMesh=build3D2DSourceMesh();
   MEDCouplingUMesh *targetMesh=build3D2DTargetMesh();
@@ -2535,56 +2489,14 @@ void MEDCouplingBasicsTest::test3D2DBasicInterpP0P0()
   targetMesh->decrRef();
 }
 
-void MEDCouplingBasicsTest::test3D2DMeshesIntersection(MEDCouplingUMesh *sourceMesh,
-                                                       MEDCouplingUMesh *targetMesh,
-                                                       const double correctSurf,
-                                                       const int correctDuplicateFacesNbr,
-                                                       const int correctTotalIntersectFacesNbr)
-{
-  MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh);
-  MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh);
-  INTERP_KERNEL::Interpolation3D2D myInterpolator;
-  myInterpolator.setPrecision(1e-12);
-  const double prec = 1.0e-5;
-  IntersectionMatrix matrix;
-  INTERP_KERNEL::SplittingPolicy sp[] = { INTERP_KERNEL::PLANAR_FACE_5, INTERP_KERNEL::PLANAR_FACE_6, INTERP_KERNEL::GENERAL_24, INTERP_KERNEL::GENERAL_48 };
-  for ( size_t i = 0; i < sizeof(sp)/sizeof(sp[0]); ++i )
-  {
-    myInterpolator.setSplittingPolicy( sp[i] );
-    matrix.clear();
-    myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,matrix,"P0P0");
-
-    std::cout.precision(16);
-
-    const double surf = sumAll(matrix);
-    LOG(1, "surf =  " << surf <<"  correctSurf = " << correctSurf );
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(correctSurf, surf, prec * std::max(correctSurf, surf));
-
-    INTERP_KERNEL::Interpolation3D2D::DuplicateFacesType duplicateFaces = myInterpolator.retrieveDuplicateFaces();
-    int duplicateFacesNbr = duplicateFaces.size();
-    LOG(1, "duplicateFacesNbr =  " << duplicateFacesNbr <<"  correctDuplicateFacesNbr = " <<  correctDuplicateFacesNbr);
-    CPPUNIT_ASSERT_EQUAL(correctDuplicateFacesNbr, duplicateFacesNbr);
-
-    if (correctTotalIntersectFacesNbr >= 0)
-      {
-        int totalIntersectFacesNbr = countNonZero(matrix);
-        LOG(1, "totalIntersectFacesNbr =  " << totalIntersectFacesNbr <<"  correctTotalIntersectFacesNbr = " << correctTotalIntersectFacesNbr );
-        CPPUNIT_ASSERT_EQUAL(correctTotalIntersectFacesNbr, totalIntersectFacesNbr);
-      }
-  }
-  //clean up
-  sourceMesh->decrRef();
-  targetMesh->decrRef();
-}
-
-void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test3D2DQuadHexaInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build3D2DQuadSourceMesh();
   MEDCouplingUMesh *targetMesh=build3D2DHexaTargetMesh();
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 240., 0, 20);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_2()
+void MEDCouplingBasicsTestInterp::test3D2DQuadHexaInterpP0P0_2()
 {
   const double shiftX = 3.;
   MEDCouplingUMesh *sourceMesh=build3D2DQuadSourceMesh(shiftX);
@@ -2592,7 +2504,7 @@ void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_2()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 2. * 240., 20, 2 * 20);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_3()
+void MEDCouplingBasicsTestInterp::test3D2DQuadHexaInterpP0P0_3()
 {
   const double shiftX = 1.5;
   const double inclinationX = 3.;
@@ -2601,7 +2513,7 @@ void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_3()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 300., 0, 20);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_4()
+void MEDCouplingBasicsTestInterp::test3D2DQuadHexaInterpP0P0_4()
 {
   const double shiftX = 3.;
   const double inclinationX = 3.;
@@ -2610,7 +2522,7 @@ void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_4()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 2. * 300., 20, 2 * 20);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_5()
+void MEDCouplingBasicsTestInterp::test3D2DQuadHexaInterpP0P0_5()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2619,7 +2531,7 @@ void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_5()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 180., 0, 15);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_6()
+void MEDCouplingBasicsTestInterp::test3D2DQuadHexaInterpP0P0_6()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2628,14 +2540,14 @@ void MEDCouplingBasicsTest::test3D2DQuadHexaInterpP0P0_6()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 150., 0, 10);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test3D2DTriHexaInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build3D2DTriSourceMesh();
   MEDCouplingUMesh *targetMesh=build3D2DHexaTargetMesh();
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 240., 0, 40);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_2()
+void MEDCouplingBasicsTestInterp::test3D2DTriHexaInterpP0P0_2()
 {
   const double shiftX = 3.;
   MEDCouplingUMesh *sourceMesh=build3D2DTriSourceMesh(shiftX);
@@ -2643,7 +2555,7 @@ void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_2()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 2. * 240., 40, 2 * 40);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_3()
+void MEDCouplingBasicsTestInterp::test3D2DTriHexaInterpP0P0_3()
 {
   const double shiftX = 1.5;
   const double inclinationX = 3.;
@@ -2652,7 +2564,7 @@ void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_3()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 300., 0, 40);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_4()
+void MEDCouplingBasicsTestInterp::test3D2DTriHexaInterpP0P0_4()
 {
   const double shiftX = 3.;
   const double inclinationX = 3.;
@@ -2661,7 +2573,7 @@ void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_4()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 2. * 300., 40, 2 * 40);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_5()
+void MEDCouplingBasicsTestInterp::test3D2DTriHexaInterpP0P0_5()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2670,7 +2582,7 @@ void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_5()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 180., 0, 30);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_6()
+void MEDCouplingBasicsTestInterp::test3D2DTriHexaInterpP0P0_6()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2679,14 +2591,14 @@ void MEDCouplingBasicsTest::test3D2DTriHexaInterpP0P0_6()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 150., 0, 20);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test3D2DQuadTetraInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build3D2DQuadSourceMesh();
   MEDCouplingUMesh *targetMesh=build3D2DTetraTargetMesh();
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 240., 20, 40);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_2()
+void MEDCouplingBasicsTestInterp::test3D2DQuadTetraInterpP0P0_2()
 {
   const double shiftX = 3.;
   MEDCouplingUMesh *sourceMesh=build3D2DQuadSourceMesh(shiftX);
@@ -2694,7 +2606,7 @@ void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_2()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 2. * 240., 20, 2 * 40);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_3()
+void MEDCouplingBasicsTestInterp::test3D2DQuadTetraInterpP0P0_3()
 {
   const double shiftX = 1.5;
   const double inclinationX = 3.;
@@ -2703,7 +2615,7 @@ void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_3()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 300., 0, 100);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_4()
+void MEDCouplingBasicsTestInterp::test3D2DQuadTetraInterpP0P0_4()
 {
   const double shiftX = 3.;
   const double inclinationX = 3.;
@@ -2712,7 +2624,7 @@ void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_4()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 2. * 300., 20, 2 * 40);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_5()
+void MEDCouplingBasicsTestInterp::test3D2DQuadTetraInterpP0P0_5()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2721,7 +2633,7 @@ void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_5()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 180., 0, 45);
 }
 
-void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_6()
+void MEDCouplingBasicsTestInterp::test3D2DQuadTetraInterpP0P0_6()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2730,14 +2642,14 @@ void MEDCouplingBasicsTest::test3D2DQuadTetraInterpP0P0_6()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 150., 0, 30);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_1()
+void MEDCouplingBasicsTestInterp::test3D2DTriTetraInterpP0P0_1()
 {
   MEDCouplingUMesh *sourceMesh=build3D2DTriSourceMesh();
   MEDCouplingUMesh *targetMesh=build3D2DTetraTargetMesh();
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 240., 0, 40);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_2()
+void MEDCouplingBasicsTestInterp::test3D2DTriTetraInterpP0P0_2()
 {
   const double shiftX = 3.;
   MEDCouplingUMesh *sourceMesh=build3D2DTriSourceMesh(shiftX);
@@ -2745,7 +2657,7 @@ void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_2()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 2. * 240., 40, 40 + 80);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_3()
+void MEDCouplingBasicsTestInterp::test3D2DTriTetraInterpP0P0_3()
 {
   const double shiftX = 1.5;
   const double inclinationX = 3.;
@@ -2754,7 +2666,7 @@ void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_3()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 300., 0);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_4()
+void MEDCouplingBasicsTestInterp::test3D2DTriTetraInterpP0P0_4()
 {
   const double shiftX = 3.;
   const double inclinationX = 3.;
@@ -2763,7 +2675,7 @@ void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_4()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 2. * 300., 40, 40 + 80);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_5()
+void MEDCouplingBasicsTestInterp::test3D2DTriTetraInterpP0P0_5()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
@@ -2772,7 +2684,7 @@ void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_5()
   test3D2DMeshesIntersection(sourceMesh, targetMesh, 180., 0);
 }
 
-void MEDCouplingBasicsTest::test3D2DTriTetraInterpP0P0_6()
+void MEDCouplingBasicsTestInterp::test3D2DTriTetraInterpP0P0_6()
 {
   const double shiftX = 9.;
   const double inclinationX = 3.;
diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.hxx
new file mode 100644
index 000000000..671cac720
--- /dev/null
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.hxx
@@ -0,0 +1,235 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef __MEDCOUPLINGBASICSTESTINTERP_HXX__
+#define __MEDCOUPLINGBASICSTESTINTERP_HXX__
+
+#include "MEDCouplingBasicsTest.hxx"
+
+#include <map>
+#include <vector>
+
+namespace ParaMEDMEM
+{
+  class DataArrayDouble;
+  class MEDCouplingUMesh;
+  class MEDCouplingFieldDouble;
+  class MEDCouplingMultiFields;
+
+  class MEDCouplingBasicsTestInterp : public MEDCouplingBasicsTest
+  {
+    CPPUNIT_TEST_SUITE(MEDCouplingBasicsTestInterp);
+    CPPUNIT_TEST( test2DInterpP0P0_1 );
+    CPPUNIT_TEST( test2DInterpP0P0PL_1 );
+    CPPUNIT_TEST( test2DInterpP0P0PL_2 );
+    CPPUNIT_TEST( test2DInterpP0P0PL_3 );
+    CPPUNIT_TEST( test2DInterpP0P0PL_4 );
+    CPPUNIT_TEST( test2DInterpP0P1_1 );
+    CPPUNIT_TEST( test2DInterpP0P1PL_1 );
+    CPPUNIT_TEST( test2DInterpP0P1PL_2 );
+    CPPUNIT_TEST( test2DInterpP1P0_1 );
+    CPPUNIT_TEST( test2DInterpP1P0PL_1 );
+    CPPUNIT_TEST( test2DInterpP1P0PL_2 );
+    CPPUNIT_TEST( test2DInterpP1P1_1 );
+    CPPUNIT_TEST( test2DInterpP1P1PL_1 );
+    CPPUNIT_TEST( test3DSurfInterpP0P0_1 );
+    CPPUNIT_TEST( test3DSurfInterpP0P0PL_1 );
+    CPPUNIT_TEST( test3DSurfInterpP0P1_1 );
+    CPPUNIT_TEST( test3DSurfInterpP0P1PL_1 );
+    CPPUNIT_TEST( test3DSurfInterpP1P0_1 );
+    CPPUNIT_TEST( test3DSurfInterpP1P0PL_1 );
+    CPPUNIT_TEST( test3DSurfInterpP1P1_1 );
+    CPPUNIT_TEST( test3DSurfInterpP1P1PL_1 );
+    CPPUNIT_TEST( test3DSurfInterpP0P0_2 );
+    CPPUNIT_TEST( test3DSurfInterpP0P0_3 );
+
+    CPPUNIT_TEST( testInterpolationCC );
+    CPPUNIT_TEST( testInterpolationCU1D );
+    CPPUNIT_TEST( testInterpolationCU2D );
+    CPPUNIT_TEST( testInterpolationCU3D );
+
+    CPPUNIT_TEST( test3DInterpP0P0_1 );
+    CPPUNIT_TEST( test3DInterpP0P0PL_1 );
+    CPPUNIT_TEST( test3DInterpP0P0PL_2 );
+    CPPUNIT_TEST( test3DInterpP0P0PL_3 );
+    CPPUNIT_TEST( test3DInterpP0P0PL_4 );
+    CPPUNIT_TEST( test3DInterpP0P1_1 );
+    CPPUNIT_TEST( test3DInterpP0P1PL_1 );
+    CPPUNIT_TEST( test3DInterpP1P0_1 );
+    CPPUNIT_TEST( test3DInterpP1P0PL_1 );
+    CPPUNIT_TEST( test3DInterpP1P1_1 );
+    CPPUNIT_TEST( test3DInterpP1P1PL_1 );
+    CPPUNIT_TEST( test3DInterpP0P0Empty );
+    CPPUNIT_TEST( test2DInterpP0IntegralUniform );
+    CPPUNIT_TEST( test3DSurfInterpP0IntegralUniform );
+    CPPUNIT_TEST( test3DInterpP0IntegralUniform );
+    CPPUNIT_TEST( test2DInterpP1IntegralUniform );
+    CPPUNIT_TEST( test3DInterpP1IntegralUniform );
+    CPPUNIT_TEST( test2DInterpP1P0Bary_1 );
+    CPPUNIT_TEST( test3DSurfInterpP1P0Bary_1 );
+    CPPUNIT_TEST( test3DInterpP1P0Bary_1 );
+    CPPUNIT_TEST( test3DTo1DInterpP0P0PL_1 );
+
+    CPPUNIT_TEST( test2D1DBasicInterpP0P0 );
+    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_1 );
+    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_2 );
+    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_3 );
+    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_4 );
+    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_5 );
+    CPPUNIT_TEST( test2D1DSegQuadInterpP0P0_6 );
+    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_1 );
+    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_2 );
+    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_3 );
+    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_4 );
+    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_5 );
+    CPPUNIT_TEST( test2D1DSegTriInterpP0P0_6 );
+    CPPUNIT_TEST( test3D2DBasicInterpP0P0 );
+    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_1 );
+    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_2 );
+    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_3 );
+    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_4 );
+    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_5 );
+    CPPUNIT_TEST( test3D2DQuadHexaInterpP0P0_6 );
+    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_1 );
+    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_2 );
+    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_3 );
+    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_4 );
+    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_5 );
+    CPPUNIT_TEST( test3D2DTriHexaInterpP0P0_6 );
+    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_1 );
+    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_2 );
+    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_3 );
+    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_4 );
+    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_5 );
+    CPPUNIT_TEST( test3D2DQuadTetraInterpP0P0_6 );
+    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_1 );
+    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_2 );
+    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_3 );
+    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_4 );
+    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_5 );
+    CPPUNIT_TEST( test3D2DTriTetraInterpP0P0_6 );
+
+    CPPUNIT_TEST( test1DInterp_1 );
+    CPPUNIT_TEST( test2DCurveInterpP0P0_1 );
+    CPPUNIT_TEST( test2DCurveInterpP0P0_2 );
+    CPPUNIT_TEST( test2DCurveInterpP0P1_1 );
+    CPPUNIT_TEST( test2DCurveInterpP1P0_1 );
+    CPPUNIT_TEST( test2DCurveInterpP1P1_1 );
+    CPPUNIT_TEST_SUITE_END();
+  public:
+    void test2DInterpP0P0_1();
+    void test2DInterpP0P0PL_1();
+    void test2DInterpP0P0PL_2();
+    void test2DInterpP0P0PL_3();
+    void test2DInterpP0P0PL_4();
+    void test2DInterpP0P1_1();
+    void test2DInterpP0P1PL_1();
+    void test2DInterpP0P1PL_2();
+    void test2DInterpP1P0_1();
+    void test2DInterpP1P0PL_1();
+    void test2DInterpP1P0PL_2();
+    void test2DInterpP1P1_1();
+    void test2DInterpP1P1PL_1();
+    void test3DSurfInterpP0P0_1();
+    void test3DSurfInterpP0P0PL_1();
+    void test3DSurfInterpP0P1_1();
+    void test3DSurfInterpP0P1PL_1();
+    void test3DSurfInterpP1P0_1();
+    void test3DSurfInterpP1P0PL_1();
+    void test3DSurfInterpP1P1_1();
+    void test3DSurfInterpP1P1PL_1();
+    void test3DSurfInterpP0P0_2();
+    void test3DSurfInterpP0P0_3();
+    void test3DInterpP0P0_1();
+    void test3DInterpP0P0PL_1();
+    void test3DInterpP0P0PL_2();
+    void test3DInterpP0P0PL_3();
+    void test3DInterpP0P0PL_4();
+    void test3DInterpP0P1_1();
+    void test3DInterpP0P1PL_1();
+    void test3DInterpP1P0_1();
+    void test3DInterpP1P0PL_1();
+    void test3DInterpP1P1_1();
+    void test3DInterpP1P1PL_1();
+
+    void testInterpolationCC();
+    void testInterpolationCU1D();
+    void testInterpolationCU2D();
+    void testInterpolationCU3D();
+
+    void test3DInterpP0P0Empty();
+    void test2DInterpP0IntegralUniform();
+    void test3DSurfInterpP0IntegralUniform();
+    void test3DInterpP0IntegralUniform();
+    void test2DInterpP1IntegralUniform();
+    void test3DInterpP1IntegralUniform();
+    void test2DInterpP1P0Bary_1();
+    void test3DSurfInterpP1P0Bary_1();
+    void test3DInterpP1P0Bary_1();
+    void test3DTo1DInterpP0P0PL_1();
+
+    void test2D1DBasicInterpP0P0();
+    void test2D1DSegQuadInterpP0P0_1();
+    void test2D1DSegQuadInterpP0P0_2();
+    void test2D1DSegQuadInterpP0P0_3();
+    void test2D1DSegQuadInterpP0P0_4();
+    void test2D1DSegQuadInterpP0P0_5();
+    void test2D1DSegQuadInterpP0P0_6();
+    void test2D1DSegTriInterpP0P0_1();
+    void test2D1DSegTriInterpP0P0_2();
+    void test2D1DSegTriInterpP0P0_3();
+    void test2D1DSegTriInterpP0P0_4();
+    void test2D1DSegTriInterpP0P0_5();
+    void test2D1DSegTriInterpP0P0_6();
+    void test3D2DBasicInterpP0P0();
+    void test3D2DQuadHexaInterpP0P0_1();
+    void test3D2DQuadHexaInterpP0P0_2();
+    void test3D2DQuadHexaInterpP0P0_3();
+    void test3D2DQuadHexaInterpP0P0_4();
+    void test3D2DQuadHexaInterpP0P0_5();
+    void test3D2DQuadHexaInterpP0P0_6();
+    void test3D2DTriHexaInterpP0P0_1();
+    void test3D2DTriHexaInterpP0P0_2();
+    void test3D2DTriHexaInterpP0P0_3();
+    void test3D2DTriHexaInterpP0P0_4();
+    void test3D2DTriHexaInterpP0P0_5();
+    void test3D2DTriHexaInterpP0P0_6();
+    void test3D2DQuadTetraInterpP0P0_1();
+    void test3D2DQuadTetraInterpP0P0_2();
+    void test3D2DQuadTetraInterpP0P0_3();
+    void test3D2DQuadTetraInterpP0P0_4();
+    void test3D2DQuadTetraInterpP0P0_5();
+    void test3D2DQuadTetraInterpP0P0_6();
+    void test3D2DTriTetraInterpP0P0_1();
+    void test3D2DTriTetraInterpP0P0_2();
+    void test3D2DTriTetraInterpP0P0_3();
+    void test3D2DTriTetraInterpP0P0_4();
+    void test3D2DTriTetraInterpP0P0_5();
+    void test3D2DTriTetraInterpP0P0_6();
+
+    void test1DInterp_1();
+    void test2DCurveInterpP0P0_1();
+    void test2DCurveInterpP0P0_2();
+    void test2DCurveInterpP0P1_1();
+    void test2DCurveInterpP1P0_1();
+    void test2DCurveInterpP1P1_1();
+  };
+}
+
+#endif
diff --git a/src/MEDCoupling/Test/Makefile.am b/src/MEDCoupling/Test/Makefile.am
index 1297cde3a..6a4575890 100755
--- a/src/MEDCoupling/Test/Makefile.am
+++ b/src/MEDCoupling/Test/Makefile.am
@@ -27,7 +27,8 @@ TestMEDCoupling_LDFLAGS = @CPPUNIT_LIBS@ ../libmedcoupling.la ../../INTERP_KERNE
 
 dist_TestMEDCoupling_SOURCES = TestMEDCoupling.cxx MEDCouplingBasicsTest.hxx MEDCouplingBasicsTest0.cxx MEDCouplingBasicsTest1.cxx \
 	MEDCouplingBasicsTest2.cxx MEDCouplingBasicsTest3.cxx MEDCouplingBasicsTestInterp.cxx MEDCouplingBasicsTestData1.hxx       \
-	MEDCouplingBasicsTest4.cxx
+	MEDCouplingBasicsTest4.cxx MEDCouplingBasicsTest1.hxx MEDCouplingBasicsTest2.hxx MEDCouplingBasicsTest3.hxx                \
+	MEDCouplingBasicsTest4.hxx MEDCouplingBasicsTestInterp.hxx
 
 TestMEDCouplingRemapper_CPPFLAGS=@CPPUNIT_INCLUDES@ @PTHREAD_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../../INTERP_KERNEL/Bases -I$(srcdir)/../../INTERP_KERNELTest -I$(srcdir)/../../INTERP_KERNEL -I$(srcdir)/../../INTERP_KERNEL/Geometric2D
 
diff --git a/src/MEDCoupling/Test/TestMEDCoupling.cxx b/src/MEDCoupling/Test/TestMEDCoupling.cxx
index a2008a6a0..d65006d77 100644
--- a/src/MEDCoupling/Test/TestMEDCoupling.cxx
+++ b/src/MEDCoupling/Test/TestMEDCoupling.cxx
@@ -17,8 +17,16 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include "MEDCouplingBasicsTest.hxx"
+#include "MEDCouplingBasicsTest1.hxx"
+#include "MEDCouplingBasicsTest2.hxx"
+#include "MEDCouplingBasicsTest3.hxx"
+#include "MEDCouplingBasicsTest4.hxx"
+#include "MEDCouplingBasicsTestInterp.hxx"
 
-CPPUNIT_TEST_SUITE_REGISTRATION( ParaMEDMEM::MEDCouplingBasicsTest );
+CPPUNIT_TEST_SUITE_REGISTRATION( ParaMEDMEM::MEDCouplingBasicsTest1 );
+CPPUNIT_TEST_SUITE_REGISTRATION( ParaMEDMEM::MEDCouplingBasicsTest2 );
+CPPUNIT_TEST_SUITE_REGISTRATION( ParaMEDMEM::MEDCouplingBasicsTest3 );
+CPPUNIT_TEST_SUITE_REGISTRATION( ParaMEDMEM::MEDCouplingBasicsTest4 );
+CPPUNIT_TEST_SUITE_REGISTRATION( ParaMEDMEM::MEDCouplingBasicsTestInterp );
 
 #include "BasicMainTest.hxx"