hestia-earth-models 0.64.14__py3-none-any.whl → 0.65.1__py3-none-any.whl

tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py

@@ -2,7 +2,7 @@ from functools import reduce
 import json
 from os.path import isfile
 from pytest import mark
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 from hestia_earth.models.ipcc2019.co2ToAirBelowGroundBiomassStockChange import MODEL, run
 
@@ -10,8 +10,26 @@ from tests.utils import fake_new_emission, fixtures_path, order_list
 
 class_path = f"hestia_earth.models.{MODEL}.co2ToAirBelowGroundBiomassStockChange"
 utils_path = f"hestia_earth.models.{MODEL}.co2ToAirCarbonStockChange_utils"
+biomass_utils_path = f"hestia_earth.models.{MODEL}.biomass_utils"
+term_path = "hestia_earth.models.utils.term"
 fixtures_folder = f"{fixtures_path}/{MODEL}/co2ToAirBelowGroundBiomassStockChange"
 
+COVER_CROP_PROPERTY_TERM_IDS = [
+    "catchCrop",
+    "coverCrop",
+    "groundCover",
+    "longFallowCrop",
+    "shortFallowCrop"
+]
+
+
+def _load_fixture(path: str, default=None):
+    if isfile(path):
+        with open(path, encoding="utf-8") as f:
+            return json.load(f)
+    return default
+
+
 RUN_SCENARIOS = [
     ("no-overlapping-cycles", 3),
     ("overlapping-cycles", 4),
@@ -21,18 +39,11 @@ RUN_SCENARIOS = [
     ("non-consecutive-biomass-measurements", 1),  # Closes issue #827
     ("multiple-method-classifications", 5),       # Closes issue #764
     ("non-soil-based-gohac-system", 3),           # Closes issue #848
-    ("with-gapfilled-start-date-end-date", 1)     # Closes issue #972
+    ("with-gapfilled-start-date-end-date", 1),    # Closes issue #972
+    ("forest-to-orchard-with-ground-cover", 3)    # Closes issue #989
 ]
 """List of (subfolder: str, num_cycles: int)."""
 
-
-def _load_fixture(path: str, default=None):
-    if isfile(path):
-        with open(path, encoding="utf-8") as f:
-            return json.load(f)
-    return default
-
-
 RUN_PARAMS = reduce(
     lambda params, scenario: params + [(scenario[0], scenario[1], i) for i in range(scenario[1])],
     RUN_SCENARIOS,
@@ -47,7 +58,18 @@ RUN_IDS = [f"{param[0]}, cycle{param[2]}" for param in RUN_PARAMS]
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 @patch(f"{utils_path}.related_cycles")
 @patch(f"{utils_path}._get_site")
-def test_run(_get_site_mock, related_cycles_mock, _new_emission_mock, subfolder, num_cycles, cycle_index):
+@patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{term_path}.search")
+def test_run(
+    search_mock: MagicMock,
+    get_cover_crop_property_terms_mock: MagicMock,
+    get_site_mock: MagicMock,
+    related_cycles_mock: MagicMock,
+    _new_emission_mock: MagicMock,
+    subfolder: str,
+    num_cycles: int,
+    cycle_index: int
+):
     """
     Test `run` function for each cycle in each scenario.
     """
@@ -59,25 +81,39 @@ def test_run(_get_site_mock, related_cycles_mock, _new_emission_mock, subfolder,
         _load_fixture(f"{fixtures_folder}/{subfolder}/cycle{i}.jsonld") for i in range(num_cycles)
     ]
 
-    _get_site_mock.return_value = site
+    get_site_mock.return_value = site
     related_cycles_mock.return_value = cycles
 
     result = run(cycle)
     assert order_list(result) == order_list(expected)
 
+    assert get_cover_crop_property_terms_mock.call_count <= 1  # assert the API call is only requested once
+    search_mock.assert_not_called()                            # assert the API call is properly mocked
+
 
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 @patch(f"{utils_path}.related_cycles")
 @patch(f"{utils_path}._get_site")
-def test_run_empty(_get_site_mock, related_cycles_mock, _new_emission_mock):
+@patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{term_path}.search")
+def test_run_empty(
+    search_mock: MagicMock,
+    get_cover_crop_property_terms_mock: MagicMock,
+    get_site_mock: MagicMock,
+    related_cycles_mock: MagicMock,
+    _new_emission_mock: MagicMock
+):
     """
     Test `run` function for each cycle in each scenario.
     """
     CYCLE = {}
     EXPECTED = []
 
-    _get_site_mock.return_value = {}
+    get_site_mock.return_value = {}
     related_cycles_mock.return_value = [CYCLE]
 
     result = run(CYCLE)
     assert result == EXPECTED
+
+    assert get_cover_crop_property_terms_mock.call_count <= 1  # assert the API call is only requested once
+    search_mock.assert_not_called()                            # assert the API call is properly mocked

tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py

@@ -2,7 +2,7 @@ from functools import reduce
 import json
 from os.path import isfile
 from pytest import mark
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 from hestia_earth.models.ipcc2019.co2ToAirSoilOrganicCarbonStockChange import MODEL, run
 
@@ -11,9 +11,17 @@ from tests.utils import fake_new_emission, fixtures_path, order_list
 class_path = f"hestia_earth.models.{MODEL}.co2ToAirSoilOrganicCarbonStockChange"
 utils_path = f"hestia_earth.models.{MODEL}.co2ToAirCarbonStockChange_utils"
 soc_utils_path = f"hestia_earth.models.{MODEL}.organicCarbonPerHa_utils"
-term_folder = "hestia_earth.models.utils.term"
+soc_tier_1_utils_path = f"hestia_earth.models.{MODEL}.organicCarbonPerHa_tier_1_utils"
+term_path = "hestia_earth.models.utils.term"
 fixtures_folder = f"{fixtures_path}/{MODEL}/co2ToAirSoilOrganicCarbonStockChange"
 
+COVER_CROP_PROPERTY_TERM_IDS = [
+    "catchCrop",
+    "coverCrop",
+    "groundCover",
+    "longFallowCrop",
+    "shortFallowCrop"
+]
 
 IRRIGATED_TERM_IDS = [
     "rainfedDeepWater",
@@ -38,6 +46,14 @@ UPLAND_RICE_LAND_COVER_TERM_IDS = [
     "ricePlantUpland"
 ]
 
+
+def _load_fixture(path: str, default=None):
+    if isfile(path):
+        with open(path, encoding="utf-8") as f:
+            return json.load(f)
+    return default
+
+
 RUN_SCENARIOS = [
     ("no-overlapping-cycles", 3),
     ("overlapping-cycles", 4),
@@ -47,18 +63,11 @@ RUN_SCENARIOS = [
     ("non-consecutive-organic-carbon-measurements", 1),  # Closes issue #827
     ("multiple-method-classifications", 5),              # Closes issue #764
     ("non-soil-based-gohac-system", 3),                  # Closes issue #848
-    ("with-gapfilled-start-date-end-date", 1)            # Closes issue #972
+    ("with-gapfilled-start-date-end-date", 1),           # Closes issue #972
+    ("forest-to-orchard-with-ground-cover", 3)           # Closes issue #989
 ]
 """List of (subfolder: str, num_cycles: int)."""
 
-
-def _load_fixture(path: str, default=None):
-    if isfile(path):
-        with open(path, encoding="utf-8") as f:
-            return json.load(f)
-    return default
-
-
 RUN_PARAMS = reduce(
     lambda params, scenario: params + [(scenario[0], scenario[1], i) for i in range(scenario[1])],
     RUN_SCENARIOS,
@@ -73,19 +82,21 @@ RUN_IDS = [f"{param[0]}, cycle{param[2]}" for param in RUN_PARAMS]
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 @patch(f"{utils_path}.related_cycles")
 @patch(f"{utils_path}._get_site")
-@patch(f"{soc_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{soc_tier_1_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
 @patch(f"{soc_utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
-@patch(f"{term_folder}.search")
+@patch(f"{soc_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{term_path}.search")
 def test_run(
-    search_mock,
-    get_irrigated_terms_mock,
-    get_upland_rice_land_cover_terms_mock,
-    _get_site_mock,
-    related_cycles_mock,
-    _new_emission_mock,
-    subfolder,
-    num_cycles,
-    cycle_index
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock: MagicMock,
+    get_site_mock: MagicMock,
+    related_cycles_mock: MagicMock,
+    _new_emission_mock: MagicMock,
+    subfolder: str,
+    num_cycles: int,
+    cycle_index: int
 ):
     """
     Test `run` function for each cycle in each scenario.
@@ -98,33 +109,43 @@ def test_run(
         _load_fixture(f"{fixtures_folder}/{subfolder}/cycle{i}.jsonld") for i in range(num_cycles)
     ]
 
-    _get_site_mock.return_value = site
+    get_site_mock.return_value = site
     related_cycles_mock.return_value = cycles
 
     result = run(cycle)
+    assert order_list(result) == order_list(expected)
 
-    # Ensure that API calls to retrieve term IDs are properly cached.
-    get_irrigated_terms_mock.call_count <= 1
-    get_upland_rice_land_cover_terms_mock.call_count <= 1
-
-    # Ensure that the property and term utils are properly mocked.
+    # assert the API calls are properly mocked
     search_mock.assert_not_called()
 
-    assert order_list(result) == order_list(expected)
-
 
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 @patch(f"{utils_path}.related_cycles")
 @patch(f"{utils_path}._get_site")
-def test_run_empty(_get_site_mock, related_cycles_mock, _new_emission_mock):
+@patch(f"{soc_tier_1_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{soc_utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{soc_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{term_path}.search")
+def test_run_empty(
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock: MagicMock,
+    get_site_mock: MagicMock,
+    related_cycles_mock: MagicMock,
+    _new_emission_mock: MagicMock
+):
     """
     Test `run` function for each cycle in each scenario.
     """
     CYCLE = {}
     EXPECTED = []
 
-    _get_site_mock.return_value = {}
+    get_site_mock.return_value = {}
     related_cycles_mock.return_value = [CYCLE]
 
     result = run(CYCLE)
     assert result == EXPECTED
+
+    # assert the API calls are properly mocked
+    search_mock.assert_not_called()

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -10,8 +10,8 @@ from hestia_earth.models.ipcc2019.organicCarbonPerHa_utils import sample_constan
 from tests.utils import fake_new_measurement, fixtures_path
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
-tier_1_path = f"hestia_earth.models.{MODEL}.{TERM_ID}_tier_1_utils"
-tier_2_path = f"hestia_earth.models.{MODEL}.{TERM_ID}_tier_2_utils"
+tier_1_utils_path = f"hestia_earth.models.{MODEL}.{TERM_ID}_tier_1_utils"
+tier_2_utils_path = f"hestia_earth.models.{MODEL}.{TERM_ID}_tier_2_utils"
 utils_path = f"hestia_earth.models.{MODEL}.{TERM_ID}_utils"
 term_path = "hestia_earth.models.utils.term"
 property_path = "hestia_earth.models.utils.property"
@@ -109,6 +109,8 @@ PARAMS_SHOULD_RUN = [
     ("tier-1/cropland-polar", False),                                # Closes issue 794
     ("tier-1/cropland-with-system-increasing-c-input", True),        # Closes issue 851
     ("tier-1/with-gapfilled-start-date-end-date", False),            # Closes issue 972
+    ("tier-1/forest-to-orchard-with-ground-cover", True),            # Closes 989
+    ("tier-1/forest-to-other-with-ground-cover", True),              # Closes 989
     ("tier-2/with-generalised-monthly-measurements", False),         # Closes issue 600
     ("tier-2/with-incomplete-climate-data", False),                  # Closes issue 599
     ("tier-2/with-initial-soc", True),
@@ -125,27 +127,28 @@ PARAMS_SHOULD_RUN = [
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 
 
-# TODO: update mocks
 @mark.parametrize("subfolder, should_run", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
-@patch(f"{term_path}.search")
-@patch(f"{property_path}.download_hestia")
-@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
-@patch(f"{utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
-@patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
-@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{tier_2_utils_path}.related_cycles")
+@patch(f"{tier_2_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{tier_2_utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
+@patch(f"{tier_1_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{tier_1_utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
 @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{tier_2_path}.related_cycles")
+@patch(f"{term_path}.search")
+@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
+@patch(f"{property_path}.download_hestia")
 def test_should_run(
-    mock_related_cycles: MagicMock,
-    mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
-    mock_get_irrigated_terms: MagicMock,
-    mock_get_residue_removed_or_burnt_terms: MagicMock,
-    mock_get_upland_rice_crop_terms: MagicMock,
-    mock_get_upland_rice_land_cover_terms: MagicMock,
-    _mock_find_term_property: MagicMock,
-    mock_download_hestia: MagicMock,
-    mock_search: MagicMock,
+    download_hestia_mock: MagicMock,
+    _find_term_property_mock: MagicMock,
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _get_residue_removed_or_burnt_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock_t1: MagicMock,
+    _get_upland_rice_crop_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock_t2: MagicMock,
+    related_cycles_mock: MagicMock,
     subfolder: str,
     should_run: bool
 ):
@@ -155,7 +158,7 @@ def test_should_run(
         with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
             return json.load(f)
 
-    mock_related_cycles.return_value = (
+    related_cycles_mock.return_value = (
         load_cycles_from_file() if isfile(f"{folder}/cycles.jsonld") else []
     )
 
@@ -163,75 +166,68 @@ def test_should_run(
         site = json.load(f)
 
     result, _ = _should_run(site)
-
-    # Ensure that API calls to retrieve term IDs are properly cached.
-    mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_irrigated_terms.call_count <= 1
-    mock_get_residue_removed_or_burnt_terms.call_count <= 1
-    mock_get_upland_rice_crop_terms.call_count <= 1
-    mock_get_upland_rice_land_cover_terms.call_count <= 1
+    assert result == should_run
 
     # Ensure that the property and term utils are properly mocked.
-    mock_download_hestia.assert_not_called()
-    mock_search.assert_not_called()
-
-    assert result == should_run
+    download_hestia_mock.assert_not_called()
+    search_mock.assert_not_called()
 
 
+@patch(f"{tier_2_utils_path}.related_cycles", return_value=[])
 @patch(f"{term_path}.search")
 @patch(f"{property_path}.download_hestia")
-@patch(f"{tier_2_path}.related_cycles", return_value=[])
 def test_should_run_no_data(
-    _mock_related_cycles: MagicMock,
-    mock_download_hestia: MagicMock,
-    mock_search: MagicMock
+    download_hestia_mock: MagicMock,
+    search_mock: MagicMock,
+    _related_cycles_mock: MagicMock
 ):
     SITE = {}
     EXPECTED = []
 
     result = run(SITE)
 
-    mock_download_hestia.assert_not_called()
-    mock_search.assert_not_called()
+    download_hestia_mock.assert_not_called()
+    search_mock.assert_not_called()
     assert result == EXPECTED
 
 
 PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
 
 
-# TODO: update mocks
 @mark.parametrize("subfolder", PARAMS_RUN)
-@patch(f"{term_path}.search")
-@patch(f"{property_path}.download_hestia")
-@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
-@patch(f"{utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
-@patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
-@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{tier_2_utils_path}.related_cycles")
+@patch(f"{tier_2_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{tier_2_utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
+@patch(f"{tier_2_utils_path}.calc_descriptive_stats", side_effect=fake_calc_descriptive_stats)
+@patch(f"{tier_2_utils_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{tier_2_utils_path}._get_sample_func", return_value=sample_constant)
+@patch(f"{tier_1_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{tier_1_utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{tier_1_utils_path}.calc_descriptive_stats", side_effect=fake_calc_descriptive_stats)
+@patch(f"{tier_1_utils_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{tier_1_utils_path}._get_sample_func", return_value=sample_constant)
 @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{tier_2_path}.related_cycles")
-@patch(f"{tier_2_path}.calc_descriptive_stats", side_effect=fake_calc_descriptive_stats)
-@patch(f"{tier_2_path}._new_measurement", side_effect=fake_new_measurement)
-@patch(f"{tier_2_path}._get_sample_func", return_value=sample_constant)
-@patch(f"{tier_1_path}.calc_descriptive_stats", side_effect=fake_calc_descriptive_stats)
-@patch(f"{tier_1_path}._new_measurement", side_effect=fake_new_measurement)
-@patch(f"{tier_1_path}._get_sample_func", return_value=sample_constant)
+@patch(f"{term_path}.search")
+@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
+@patch(f"{property_path}.download_hestia")
 def test_run(
-    _mock_get_sample_func_t1: MagicMock,
-    _mock_new_measurement_t1: MagicMock,
-    _mock_calc_descriptive_stats_t1: MagicMock,
-    _mock_get_sample_func_t2: MagicMock,
-    _mock_new_measurement_t2: MagicMock,
+    download_hestia_mock: MagicMock,
+    _find_term_property_mock: MagicMock,
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _get_sample_func_mock_t1: MagicMock,
+    _new_measurement_mock_t1: MagicMock,
+    _calc_descriptive_stats_mock_t1: MagicMock,
+    _get_residue_removed_or_burnt_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock_t1: MagicMock,
+    _get_sample_func_mock_t2: MagicMock,
+    _new_measurement_mock_t2: MagicMock,
     _mock_calc_descriptive_stats_t2: MagicMock,
-    mock_related_cycles: MagicMock,
-    mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
-    mock_get_irrigated_terms: MagicMock,
-    mock_get_residue_removed_or_burnt_terms: MagicMock,
-    mock_get_upland_rice_crop_terms: MagicMock,
-    mock_get_upland_rice_land_cover_terms: MagicMock,
-    _mock_find_term_property: MagicMock,
-    mock_download_hestia: MagicMock,
-    mock_search: MagicMock,
+    _get_upland_rice_crop_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock_t2: MagicMock,
+    related_cycles_mock: MagicMock,
     subfolder: str
 ):
     folder = f"{fixtures_folder}/{subfolder}"
@@ -240,7 +236,7 @@ def test_run(
         with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
             return json.load(f)
 
-    mock_related_cycles.return_value = (
+    related_cycles_mock.return_value = (
         load_cycles_from_file() if isfile(f"{folder}/cycles.jsonld") else []
     )
 
@@ -253,18 +249,11 @@ def test_run(
     with patch(f"{class_path}.ITERATIONS", ITERATIONS):
         result = run(site)
 
-    # Ensure that API calls to retrieve term IDs are properly cached.
-    mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_irrigated_terms.call_count <= 1
-    mock_get_residue_removed_or_burnt_terms.call_count <= 1
-    mock_get_upland_rice_crop_terms.call_count <= 1
-    mock_get_upland_rice_land_cover_terms.call_count <= 1
+    assert order_list(result) == order_list(expected)
 
     # Ensure that the property and term utils are properly mocked.
-    mock_download_hestia.assert_not_called()
-    mock_search.assert_not_called()
-
-    assert order_list(result) == order_list(expected)
+    download_hestia_mock.assert_not_called()
+    search_mock.assert_not_called()
 
 
 PARAMS_RUN_WITH_STATS = [
@@ -276,31 +265,32 @@ PARAMS_RUN_WITH_STATS = [
 ]
 
 
-# TODO: update mocks
 @mark.parametrize("subfolder", PARAMS_RUN_WITH_STATS)
-@patch(f"{term_path}.search")
-@patch(f"{property_path}.download_hestia")
-@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
-@patch(f"{utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
-@patch(f"{utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
-@patch(f"{utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{tier_2_utils_path}.related_cycles")
+@patch(f"{tier_2_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{tier_2_utils_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
+@patch(f"{tier_2_utils_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{tier_1_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{tier_1_utils_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{tier_1_utils_path}._new_measurement", side_effect=fake_new_measurement)
 @patch(f"{utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
 @patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
-@patch(f"{tier_2_path}.related_cycles")
-@patch(f"{tier_2_path}._new_measurement", side_effect=fake_new_measurement)
-@patch(f"{tier_1_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{term_path}.search")
+@patch(f"{property_path}.find_term_property", side_effect=fake_find_term_property)
+@patch(f"{property_path}.download_hestia")
 def test_run_with_stats(
-    _mock_new_measurement_t1: MagicMock,
-    _mock_new_measurement_t2: MagicMock,
-    mock_related_cycles: MagicMock,
-    mock_get_cover_crop_property_terms: MagicMock,  # utils mocks
-    mock_get_irrigated_terms: MagicMock,
-    mock_get_residue_removed_or_burnt_terms: MagicMock,
-    mock_get_upland_rice_crop_terms: MagicMock,
-    mock_get_upland_rice_land_cover_terms: MagicMock,
-    _mock_find_term_property: MagicMock,
-    mock_download_hestia: MagicMock,
-    mock_search: MagicMock,
+    download_hestia_mock: MagicMock,
+    _find_term_property_mock: MagicMock,
+    search_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
+    _get_irrigated_terms_mock: MagicMock,
+    _new_measurement_mock_t1: MagicMock,
+    _get_residue_removed_or_burnt_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock_t1: MagicMock,
+    _new_measurement_mock_t2: MagicMock,
+    _get_upland_rice_crop_terms_mock: MagicMock,
+    _get_upland_rice_land_cover_terms_mock_t2: MagicMock,
+    related_cycles_mock: MagicMock,
     subfolder: str
 ):
     folder = f"{fixtures_folder}/{subfolder}"
@@ -309,7 +299,7 @@ def test_run_with_stats(
         with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
             return json.load(f)
 
-    mock_related_cycles.return_value = (
+    related_cycles_mock.return_value = (
         load_cycles_from_file() if isfile(f"{folder}/cycles.jsonld") else []
     )
 
@@ -322,15 +312,8 @@ def test_run_with_stats(
     with patch(f"{class_path}.ITERATIONS", ITERATIONS):
         result = run(site)
 
-    # Ensure that API calls to retrieve term IDs are properly cached.
-    mock_get_cover_crop_property_terms.call_count <= 1
-    mock_get_irrigated_terms.call_count <= 1
-    mock_get_residue_removed_or_burnt_terms.call_count <= 1
-    mock_get_upland_rice_crop_terms.call_count <= 1
-    mock_get_upland_rice_land_cover_terms.call_count <= 1
+    assert order_list(result) == order_list(expected)
 
     # Ensure that the property and term utils are properly mocked.
-    mock_download_hestia.assert_not_called()
-    mock_search.assert_not_called()
-
-    assert order_list(result) == order_list(expected)
+    download_hestia_mock.assert_not_called()
+    search_mock.assert_not_called()