diff --git a/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp b/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp
index cbd8895d80..969808b02b 100644
--- a/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp
+++ b/src/tests/src/libs/antares/study/thermal-price-definition/thermal-price-definition.cpp
@@ -150,7 +150,7 @@ BOOST_AUTO_TEST_SUITE(s)
 BOOST_FIXTURE_TEST_CASE(ThermalClusterList_loadFromFolder_basic, FixtureFull)
 {
     clusterList.loadFromFolder(*study, folder, area);
-    auto cluster = clusterList.mapping["some cluster"];
+    auto cluster = clusterList.find("some cluster");
 
     BOOST_CHECK(cluster->startupCost == 70000.0);
     BOOST_CHECK(cluster->costgeneration == useCostTimeseries);
@@ -161,7 +161,7 @@ BOOST_FIXTURE_TEST_CASE(ThermalClusterList_loadFromFolder_basic, FixtureFull)
 BOOST_FIXTURE_TEST_CASE(checkCo2_checkCO2CostColumnNumber_OK, FixtureFull)
 {
     area->thermal.list.loadFromFolder(*study, folder, area);
-    auto cluster = area->thermal.list.mapping["some cluster"];
+    auto cluster = area->thermal.list.find("some cluster");
 
     cluster->series.timeSeries.reset(3, 8760);
 
@@ -176,7 +176,7 @@ BOOST_FIXTURE_TEST_CASE(checkCo2_checkCO2CostColumnNumber_OK, FixtureFull)
 BOOST_FIXTURE_TEST_CASE(checkCo2_checkCO2CostColumnNumber_KO, FixtureFull)
 {
     area->thermal.list.loadFromFolder(*study, folder, area);
-    auto cluster = area->thermal.list.mapping["some cluster"];
+    auto cluster = area->thermal.list.find("some cluster");
 
     cluster->series.timeSeries.reset(3, 8760);
 
@@ -192,7 +192,7 @@ BOOST_FIXTURE_TEST_CASE(checkCo2_checkCO2CostColumnNumber_KO, FixtureFull)
 BOOST_FIXTURE_TEST_CASE(checkFuelAndCo2_checkColumnNumber_OK, FixtureFull)
 {
     area->thermal.list.loadFromFolder(*study, folder, area);
-    auto cluster = area->thermal.list.mapping["some cluster"];
+    auto cluster = area->thermal.list.find("some cluster");
 
     cluster->series.timeSeries.reset(3, 8760);
 
@@ -208,7 +208,7 @@ BOOST_FIXTURE_TEST_CASE(checkFuelAndCo2_checkColumnNumber_OK, FixtureFull)
 BOOST_FIXTURE_TEST_CASE(ThermalCluster_costGenManualCalculationOfMarketBidAndMarginalCostPerHour, FixtureFull)
 {
     clusterList.loadFromFolder(*study, folder, area);
-    auto cluster = clusterList.mapping["some cluster"];
+    auto cluster = clusterList.find("some cluster");
 
     cluster->costgeneration = Data::setManually;
     cluster->ComputeCostTimeSeries();
@@ -223,11 +223,11 @@ BOOST_FIXTURE_TEST_CASE(ThermalCluster_costGenTimeSeriesCalculationOfMarketBidAn
     TimeSeriesFile co2("CO2Cost.txt", 8760);
 
     clusterList.loadFromFolder(*study, folder, area);
-    auto cluster = clusterList.mapping["some cluster"];
+    auto cluster = clusterList.find("some cluster");
 
     cluster->modulation.reset(1, 8760);
     cluster->ecoInput.loadFromFolder(*study, folder);
-    fillThermalEconomicTimeSeries(cluster.get());
+    fillThermalEconomicTimeSeries(cluster);
 
     cluster->ComputeCostTimeSeries();
 
@@ -238,7 +238,7 @@ BOOST_FIXTURE_TEST_CASE(ThermalCluster_costGenTimeSeriesCalculationOfMarketBidAn
 BOOST_FIXTURE_TEST_CASE(computeMarketBidCost, FixtureFull)
 {
     clusterList.loadFromFolder(*study, folder, area);
-    auto cluster = clusterList.mapping["some cluster"];
+    auto cluster = clusterList.find("some cluster");
 
     BOOST_CHECK_CLOSE(cluster->computeMarketBidCost(1, 2, 1), 24.12, 0.001);
 }