hestia-earth-models 0.74.2__py3-none-any.whl → 0.74.4__py3-none-any.whl

hestia_earth/models/utils/cropResidue.py

@@ -27,3 +27,8 @@ def get_crop_residue_burnt_value(cycle: dict):
     ])
     data_complete = _is_term_type_complete(cycle, TermTermType.CROPRESIDUE)
     return 0 if len(value) == 0 and data_complete else list_sum(value, default=None)
+
+
+def sum_above_ground_crop_residue(cycle: dict):
+    products = [p for p in cycle.get('products', []) if p.get('term', {}).get('@id') in crop_residue_product_ids()]
+    return list_sum(value=flatten([v.get('value') or [] for v in products]), default=0)

hestia_earth/models/version.py

@@ -1 +1 @@
-VERSION = '0.74.2'
+VERSION = '0.74.4'

{hestia_earth_models-0.74.2.dist-info → hestia_earth_models-0.74.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hestia-earth-models
-Version: 0.74.2
+Version: 0.74.4
 Summary: HESTIA's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
 Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
 Author: HESTIA Team

{hestia_earth_models-0.74.2.dist-info → hestia_earth_models-0.74.4.dist-info}/RECORD

@@ -5,7 +5,7 @@ hestia_earth/models/cache_sites.py,sha256=XpXnkYt823PQzrswgP__L4CT8xZG_n7a41CIHK
 hestia_earth/models/log.py,sha256=LQ6nRMc5q8-xs8DsAx9h8drWhWLkqDG9dFlG9OzFbeA,3780
 hestia_earth/models/preload_requests.py,sha256=vK_G1UzhNMhYy7ymnCtHUz_vv3cfApCSKqv29VREEBQ,1943
 hestia_earth/models/requirements.py,sha256=eU4yT443fx7BnaokhrLB_PCizJI7Y6m4auyo8vQauNg,17363
-hestia_earth/models/version.py,sha256=TJLHftkfaFBxlcBKsi-schtBBNtrImlbSk4KZk-ApYk,19
+hestia_earth/models/version.py,sha256=9UrfDoiXqrGUjBFfAlsBA8zSqgKE4oTF72ANo452dU8,19
 hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
 hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=1ngl8pdxeNhlVV8keAeWRwGorr_1uFXM9EoPUWx-uSc,4382
 hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=queToXuzq0tQ9_XuUJ2pJgSywXmbt9uX3ZoIKgqkROM,2660
@@ -37,13 +37,14 @@ hestia_earth/models/cml2001Baseline/terrestrialAcidificationPotentialIncludingFa
 hestia_earth/models/cml2001NonBaseline/__init__.py,sha256=vI8wp8Og_e8DiJqYYvp33YoI3t4ffAC31LWlnV20JTg,419
 hestia_earth/models/cml2001NonBaseline/eutrophicationPotentialIncludingFateAverageEurope.py,sha256=lcgyRHY08KCBFPERJNqV4DYGEJCvyHBDnJXD0kEkVqM,1097
 hestia_earth/models/cml2001NonBaseline/terrestrialAcidificationPotentialExcludingFate.py,sha256=xcrxfs9UoV_EWvV-XzMt35oPWCUsTzqg2SGA3j2MFIw,1091
-hestia_earth/models/config/Cycle.json,sha256=jnCp-cI4Bcg0REa6hW9f9lHrVzmiFp6s2SuRrjM7HLw,60340
-hestia_earth/models/config/ImpactAssessment.json,sha256=8RtgFdfFd0t8gb6sM4iyfHFE2dKgMld5Qg-cykapabY,60300
+hestia_earth/models/config/Cycle.json,sha256=CifX2AMdnGKf4iq51exXVVio9xwNeONkRyvUbCRcEaM,60950
+hestia_earth/models/config/ImpactAssessment.json,sha256=-05Z4xEPA1-VSj8NjS95pPSq6F55zzvOLoVUMy3f-rw,60550
 hestia_earth/models/config/Site.json,sha256=4DPSziHnDIngyub3Of8OvDEKa446q3Yx48R2Eobqk24,14374
 hestia_earth/models/config/__init__.py,sha256=7ZqOGd4dO2Stonte6fbktVZqbY7vp8Ls_LifgofCu8I,3009
 hestia_earth/models/config/run-calculations.json,sha256=e3nJ4M6CP1iFzfv8ou_ZUFbFxYkDxJgwuNDXTm4PBDc,615
 hestia_earth/models/config/trigger-calculations.json,sha256=3dmn2bRuj6QEtSTOLdIy31ho7thgUXyDsnqZzPV9rAQ,623
 hestia_earth/models/cycle/__init__.py,sha256=VowO3kOHb0LpURsljNaJsYO7s6vgjhul6bF_85UjUEI,406
+hestia_earth/models/cycle/aboveGroundCropResidueTotal.py,sha256=VU4Xm5ZQ4u1uZNq445DUXwW15JXWwQl4hhRZ6mXjin4,1506
 hestia_earth/models/cycle/cycleDuration.py,sha256=UON8NjmfPpU2z0sRYmhytjv-zlGewbAzdl5OCVGWDc0,2925
 hestia_earth/models/cycle/endDate.py,sha256=lRJza_G41eC-48uRtn5qcx9V1u90T6dVIYuypNaEvDY,1499
 hestia_earth/models/cycle/otherSitesArea.py,sha256=ZBuoYG9YyEnwrUsORw5RDPB56JZMSSY_GHApeJdYBAs,1492
@@ -66,7 +67,7 @@ hestia_earth/models/cycle/completeness/animalFeed.py,sha256=_qUJcQ2ggdy0fBCBkHme
 hestia_earth/models/cycle/completeness/cropResidue.py,sha256=7SNfYvP4erJ2keem3DHdOzuzzuAsrj15iffacWNgJHE,2653
 hestia_earth/models/cycle/completeness/electricityFuel.py,sha256=ZXljdjAxYgu75GdHioYjNYTgF97LClEP_1g3hFcvJYU,1927
 hestia_earth/models/cycle/completeness/excreta.py,sha256=wgrinfKnsXMG4I01g0iyFIpz2Ir-T69YB00pgrM_zvY,821
-hestia_earth/models/cycle/completeness/freshForage.py,sha256=UBBPlixmiffDGck-XvJ7wGiJeRA1L8Wm0qrzXUbe5KA,2222
+hestia_earth/models/cycle/completeness/freshForage.py,sha256=4gKLpZN_WxYU9W6VNpRshSu5oJktBVzbU_7XPhUKByY,2224
 hestia_earth/models/cycle/completeness/material.py,sha256=cF33MJkVBUnoicmecdsR78Snrv1Zng097aUeEfYDfdc,1185
 hestia_earth/models/cycle/completeness/seed.py,sha256=O4OygpPOeXHbn_32rdUk8m1BcZiQ6QpmvV463UOCmKY,1763
 hestia_earth/models/cycle/completeness/soilAmendment.py,sha256=RQPq1Y5VWJbz50tKFtcW54DdQ1YT48mQOteidW8sFcQ,1226
@@ -113,16 +114,18 @@ hestia_earth/models/ecoinventV3AndEmberClimate/utils.py,sha256=6niH2MArBK4KFzW-P
 hestia_earth/models/edip2003/__init__.py,sha256=nyB0CI2gNmRAXj-203aJHQMmETYhcY-dHbMABOhJ7YI,409
 hestia_earth/models/edip2003/ozoneDepletionPotential.py,sha256=YkBct4eDUidGukaVdd2iaEouq_FckuG8l_7pgBQgCBw,1033
 hestia_earth/models/emepEea2019/__init__.py,sha256=l90-pWrqIzt1ap1WNk0gF4iZeF5_TSG62hE83bIi4rQ,412
-hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=TPzbKxV-AZ9yx_tJNGhuNsfRJQNfH4a0JEtPGLKc-tA,1833
-hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=HwagFnpCAeAqf-xm-J2AlVfbkFcC4j9VffOQJcYWlGk,1839
+hestia_earth/models/emepEea2019/co2ToAirFuelCombustion.py,sha256=f59-XXhUlPw8L80Q9TATkNZf5Pw9LJlofZWfVJNIL9E,814
+hestia_earth/models/emepEea2019/fuelCombustion_utils.py,sha256=IA7qsye4esAOpcpwvkRMHdQHgsjhkSxd325lQp67N_M,4103
+hestia_earth/models/emepEea2019/n2OToAirFuelCombustionDirect.py,sha256=6IJSNDMXSeuf9_XGmEll8LxusYnEzVR3WadoVj999j8,860
 hestia_earth/models/emepEea2019/nh3ToAirExcreta.py,sha256=DssSjl_Kug9jE5laqJs9X4xOdOrJBnsXSnk-uA_anyE,2153
+hestia_earth/models/emepEea2019/nh3ToAirFuelCombustion.py,sha256=wbruN-aO3Cj8FCaHbXxlom2AYm_7Jef113EbkXHhj4w,814
 hestia_earth/models/emepEea2019/nh3ToAirInorganicFertiliser.py,sha256=7G0_S0G6X9slTykxs6CDb68DvtXB7yfq1iSKg0ReXS8,6036
-hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=OlrCPBuOBGlvPh_ufO8fFzSvxvkJduX7tlqzEab6qzs,1833
+hestia_earth/models/emepEea2019/noxToAirFuelCombustion.py,sha256=hJv7vGM2JlKv6E4w2OnwIcjLIt67FFVBPplhGi0X-qw,814
 hestia_earth/models/emepEea2019/pm10ToAirAnimalHousing.py,sha256=7LhOEQokWMWEPspYSQO3PtsmWkygbVAonj_Nq6JAL6c,1384
 hestia_earth/models/emepEea2019/pm25ToAirAnimalHousing.py,sha256=IzGQrRv9Pk0o1Vq18HRWZ10jhmjFG59ijfn_VYAUJIA,1384
-hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=OC53aE0uCmUxgZcqQjyhjjFPZ5U5Rdfv8l8wYihcYY4,1833
+hestia_earth/models/emepEea2019/so2ToAirFuelCombustion.py,sha256=uJWbJJ2LK-DKLLwJJpJigkMy79xR-Q4nZpY7gthP-Mg,814
 hestia_earth/models/emepEea2019/tspToAirAnimalHousing.py,sha256=TaT5GyYK6MyJQHKApBe-u4fMjqXXdmuBEtUcRYnkhac,1381
-hestia_earth/models/emepEea2019/utils.py,sha256=MWIH4jTwzXMMvfX5FBpnb5sdGvSUSrCkPnMkXGfEpcQ,5603
+hestia_earth/models/emepEea2019/utils.py,sha256=zbnpTZbq8OrcqnVKRUIEdqet69sEfnYNuQUNXw7mflY,2955
 hestia_earth/models/emissionNotRelevant/__init__.py,sha256=yAunIZI_4nGV0khRiGhbZAmXmMiuICzEH-pvzWX1lpM,3000
 hestia_earth/models/environmentalFootprintV3_1/__init__.py,sha256=tF2WrWiV1Wzi2vnRiNXdfPWfmVxgVu9w9-7eA6PA7-s,473
 hestia_earth/models/environmentalFootprintV3_1/environmentalFootprintSingleOverallScore.py,sha256=i7Er5qYAj14MuiUvWSTi6OjQ4P7pwrslQxSFUYGM0zg,5718
@@ -209,11 +212,12 @@ hestia_earth/models/hestia/histosol.py,sha256=IexiWTSlSJYGjrdpYmRooW6v8LjhYATPQ8
 hestia_earth/models/hestia/inorganicFertiliser.py,sha256=We4PBaTXyGwEQTfhX0-J8Xt03p-FB9i9j3tEK5JQ8uE,9026
 hestia_earth/models/hestia/irrigatedTypeUnspecified.py,sha256=VdYzfYxcRzWv21qxRkDn9HBid7-Bt_CgIv4iyXJH03g,1929
 hestia_earth/models/hestia/landCover.py,sha256=1pm_F79ANQHi8oeKkV24koiaSGCNRtzYBk3f38k-Bpk,39463
+hestia_earth/models/hestia/landOccupationDuringCycle.py,sha256=F3JwyptK9RgiCWgbB3J_Znj9UXfXejUE-3vgb0ZgYW8,8324
 hestia_earth/models/hestia/landTransformation100YearAverageDuringCycle.py,sha256=hF7_DDvrs7swH6ott_ihgYx13UzEKHH6pccYCtzrN8o,1069
 hestia_earth/models/hestia/landTransformation20YearAverageDuringCycle.py,sha256=05SCH6ZjEV3mIleRusBg677zu0xgu5YK0f9FCddgNPg,1067
 hestia_earth/models/hestia/liveAnimal.py,sha256=d7HuUi40c-7TN1kecdRuqbht8PAe7x4ps0NhSuWG34Q,3868
 hestia_earth/models/hestia/longFallowRatio.py,sha256=LkJaER1VNDI5351-oC8tru-LgiPK3sNMg0NhB5ic9RE,1690
-hestia_earth/models/hestia/management.py,sha256=p-FNJe99QVD398gmrIVVrAbFK4mfYN4FKNHCssd2Nq0,11175
+hestia_earth/models/hestia/management.py,sha256=nvbqjxR4spBVh9IzzduRp5BStDd7wyKTpkkJenUYObo,13447
 hestia_earth/models/hestia/materialAndSubstrate.py,sha256=abmM_7FOY5yaNb2yZEm-ncI4wFFcbzaebtnG9XWEA6M,5130
 hestia_earth/models/hestia/milkYield.py,sha256=__3AdxRTUTWwS_GsqxFpPGklmTnnpADiN0khlRCMAss,5541
 hestia_earth/models/hestia/netPrimaryProduction.py,sha256=TXBw7qkTYlvViMrM027FejVpwyqnzJ8VazsbWakwd70,1870
@@ -270,7 +274,7 @@ hestia_earth/models/impact_assessment/product/economicValueShare.py,sha256=ssyuA
 hestia_earth/models/impact_assessment/product/value.py,sha256=NaqKctYbXtbxLqJ8DougTDEDygDVvMZpwc9cLPD6TXE,1182
 hestia_earth/models/ipcc2006/__init__.py,sha256=ReUFPLqIyp16QEOGaiHmz41QbuwYBQYDKVtw6KuRDIA,409
 hestia_earth/models/ipcc2006/aboveGroundCropResidueRemoved.py,sha256=WnFcVr6X5RUVk0wKnBb4CaJSCr-DaweVjnXKFAa6kdg,2761
-hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py,sha256=Xwf4a4P88r0vlQFFQBhir_g58xeF6WbqNW42CIu7Rpc,3558
+hestia_earth/models/ipcc2006/aboveGroundCropResidueTotal.py,sha256=t7dgnt-paH32EvCLMK4qUN2Dwa4YkqhI_lpPiGdv82w,3959
 hestia_earth/models/ipcc2006/belowGroundCropResidue.py,sha256=aT5wUhda6OOsEX_FszRLJAohJxpRCd5RxEUWK49HEhI,4287
 hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionDirect.py,sha256=_2oTngpspikbFwgFTtOWs-SgEVF8LzznvITGITTtol4,2913
 hestia_earth/models/ipcc2006/n2OToAirCropResidueDecompositionIndirect.py,sha256=kf4WjdMzs6d8h433LFuUH9LJKJ_aMHTqEHDToGY5-Xk,2315
@@ -287,7 +291,7 @@ hestia_earth/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=VJ16KIGQQHybzZ
 hestia_earth/models/ipcc2013IncludingFeedbacks/gwp100.py,sha256=HR2vnOc64mg_fxe9m5NmqxBZ8-aFuKb44gmItyuRL1s,1041
 hestia_earth/models/ipcc2019/__init__.py,sha256=LdRpu8KbEc-MroIwXfKDjfj-xbgmfUYgctjKVvtpRfQ,409
 hestia_earth/models/ipcc2019/aboveGroundBiomass.py,sha256=T50NcJoyGrHYUSzJBXJKAOVUWHvFwUeUCZxuDZKqoO0,20416
-hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=lT2QVV5c2LvQqZRfPEvFT_bMTayMXgIsFLnx8I6iYzw,3089
+hestia_earth/models/ipcc2019/aboveGroundCropResidueTotal.py,sha256=GSI-FmYZuOE12iUyrtIFeo3ctDrw_P0jjZwWvwG4Ffc,3468
 hestia_earth/models/ipcc2019/belowGroundBiomass.py,sha256=WN3R5kUIc5Ij4HxMFcTGKeNRoPChRY6ws0x3nQNeEMw,19421
 hestia_earth/models/ipcc2019/belowGroundCropResidue.py,sha256=qbfsLBPaMIt4oQzYAzbsZdkJozTbwuztNr48TLYC5-Y,3507
 hestia_earth/models/ipcc2019/biocharOrganicCarbonPerHa.py,sha256=6zZOhhDIJVfvvsJfoyBtZsM4akWizQUciVnKHlufMnA,13414
@@ -348,7 +352,7 @@ hestia_earth/models/ipcc2019/animal/hoursWorkedPerDay.py,sha256=BBByUzgM7OymWnuU
 hestia_earth/models/ipcc2019/animal/liveweightGain.py,sha256=TXEKI0PZFDj7zlg_pmgfwhRT0LS1x1hEswulQYD7Dkg,956
 hestia_earth/models/ipcc2019/animal/liveweightPerHead.py,sha256=86HRowJnTbwHKDKU0rGaco2-8B1wIQ4nIe_KNqzdXsk,965
 hestia_earth/models/ipcc2019/animal/milkYieldPerAnimal.py,sha256=p7o3qvQbgq3QWqp4rW8NoyINkSFMQ9QOn9auf7e6gww,2602
-hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=jaQC4zz893oR2FSKmnKl9Lh7WrSyD9oJvezKqXUuUbE,12239
+hestia_earth/models/ipcc2019/animal/pastureGrass.py,sha256=d-Pp44VSRkYknpc3EDRhnY-5kVGzRwJ00h1WtLMsGCM,12263
 hestia_earth/models/ipcc2019/animal/pregnancyRateTotal.py,sha256=zib2AW3WJTL4NRYN4a0rRiqSJ5PZLRtwDYia7gigQFY,968
 hestia_earth/models/ipcc2019/animal/trueProteinContent.py,sha256=fgV0u4sEtLmCk-vUHF6mM03uy1w9nVPDzmxSkLXgPBo,1010
 hestia_earth/models/ipcc2019/animal/utils.py,sha256=49wX3K5fLDLc33MQJLsGefJ9vlGRwfkNXabc8CGgPQ4,4435
@@ -459,7 +463,7 @@ hestia_earth/models/linkedImpactAssessment/utils.py,sha256=DM6ZUnw23KH0oMKS3jA5q
 hestia_earth/models/mocking/__init__.py,sha256=9VX50c-grz-snfd-7MBS0KfF7AadtbKuj7kK6PqtsgE,687
 hestia_earth/models/mocking/build_mock_search.py,sha256=p15ccEUmkmLp1RiGNznxMz3OFHbI8P1-29ExuohiQN8,1355
 hestia_earth/models/mocking/mock_search.py,sha256=ccFe_WrI73JElFmxp4hPNLCX7eeU--lBC1JFR901KJY,1069
-hestia_earth/models/mocking/search-results.json,sha256=48q0iTf14osDO5yt7xICLl6vynLU2o3kslRueq7kJpI,162835
+hestia_earth/models/mocking/search-results.json,sha256=nTy4mQnzN5lYKpw2BX-rEwAjeQdjKuf8y3oIMAJML54,162832
 hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
 hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=oXillpppAas1q9GKmODxe1YXyno3EzV-j12xhzkqtTc,2404
 hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=_pQMPSvI--Xm00H6vXDA4ct_pQXKRGrLE2f-2tQE6y4,2323
@@ -611,7 +615,7 @@ hestia_earth/models/utils/cache_sources.py,sha256=MBkrPpjwNiC4ApDjeYVHZjWBbpvAer
 hestia_earth/models/utils/completeness.py,sha256=iRG4uviOAQQ4T2Nr4LlelPVTS_F1felGZNJYxek_JG8,1239
 hestia_earth/models/utils/constant.py,sha256=DmB3VVuoh7Pz2QDBJqiUG6yAML2i0fOy1BPuPHmhT1w,3442
 hestia_earth/models/utils/crop.py,sha256=GbYwrz3Zd4JU-cwUBijc8GeAK0XgurV3ubwcFIgxhcU,2721
-hestia_earth/models/utils/cropResidue.py,sha256=1orh-dhBo2p7HZVjMTTFo8XeFv-razhv5SdtuHPQ1bY,1252
+hestia_earth/models/utils/cropResidue.py,sha256=uEXMnP7qxuH5xFNABlwWeQ-q5jsWfyik-9x1OKgNFHA,1506
 hestia_earth/models/utils/cropResidueManagement.py,sha256=nIDFjf39rDD10UHSVudfDyu-EiL261g8jyrgS-2aDKw,347
 hestia_earth/models/utils/currency.py,sha256=f_ArJANb--pZq4LL49SXQ1AMX_oKroqwBXKRRQqZwsM,578
 hestia_earth/models/utils/cycle.py,sha256=J8ATBSDkhkEPRMRC0ufO8eC_JeGCpkpdvSz2xSTAg-8,16220
@@ -700,6 +704,7 @@ tests/models/cml2001NonBaseline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 tests/models/cml2001NonBaseline/test_eutrophicationPotentialIncludingFateAverageEurope.py,sha256=Snt0zwI1fF2_ome79rTRZjl5Oc8dZfbcqX8lXwxabVs,910
 tests/models/cml2001NonBaseline/test_terrestrialAcidificationPotentialExcludingFate.py,sha256=zytN80ZmXjLBSiXPj_G0aaMyMx1aVukJaGouZQDMLBs,907
 tests/models/cycle/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/models/cycle/test_aboveGroundCropResidueTotal.py,sha256=rsPafhuiPU7bGs3ltoLfNKxn0W8Cvwb8e81YeXmBhlQ,654
 tests/models/cycle/test_completeness.py,sha256=Ku1ZSApGaACkXe3ae14yP01C4GssHMwlPG_UPrSytPo,1625
 tests/models/cycle/test_cycleDuration.py,sha256=2KExiliuOa7_j88rJuPObJKZqq0xsRnFAb0ZEqc5KEM,846
 tests/models/cycle/test_endDate.py,sha256=6JijuD_-Rih-o-k5DMP1T6fEXgc7F9GhjYLojYJmVKA,1013
@@ -764,14 +769,15 @@ tests/models/ecoinventV3AndEmberClimate/test_cycle.py,sha256=sHCrAGyJ6GCOjlElFpH
 tests/models/edip2003/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/edip2003/test_ozoneDepletionPotential.py,sha256=z0kimdTxzSr8_K5eScbkxq2SB9nbBp41IHqVNR4Nh4Y,688
 tests/models/emepEea2019/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/models/emepEea2019/test_co2ToAirFuelCombustion.py,sha256=SrCx1-mW0s-flisF9Zf6W_A8VtJ67sWga8pGgS713b8,1135
-tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py,sha256=dTkrj2i5QibBuHaCgV8n2dB02y0nJAwhR35WcOquHOQ,1141
+tests/models/emepEea2019/test_co2ToAirFuelCombustion.py,sha256=r2WNtK-vT3xPmX3HFKRIFJdO_P02Kh7E_UzhUfsaqGU,1178
+tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py,sha256=hf048kpFbnWECPbfX8jBuTM_SuIzeIXzhMo_oWEnwlo,1184
 tests/models/emepEea2019/test_nh3ToAirExcreta.py,sha256=lTPftCJinvokmgUcUikl8hN_axFa8OyCTXvL0PaSRFg,1111
+tests/models/emepEea2019/test_nh3ToAirFuelCombustion.py,sha256=I6TSbWMhOBYOpl2ytozgmVljtsPqLEQs0cWg6lZRF60,1178
 tests/models/emepEea2019/test_nh3ToAirInorganicFertiliser.py,sha256=f623Pp6XTt9YPDr2QymAJEQ_yfx0_TZGndmawD8ZX98,2134
-tests/models/emepEea2019/test_noxToAirFuelCombustion.py,sha256=iFVQVYImXxB5JE8b38UAUG4q8grfbniZi1cWdLQoViE,1135
+tests/models/emepEea2019/test_noxToAirFuelCombustion.py,sha256=9d7xsCThu0sS8nU7DymCB6Gp1CzMxRPY1FJZEiBjiVk,1178
 tests/models/emepEea2019/test_pm10ToAirAnimalHousing.py,sha256=xGlQeJkdP638zbHivxAqvliZCRpcogMFZYVCMWw6j3c,715
 tests/models/emepEea2019/test_pm25ToAirAnimalHousing.py,sha256=cs3UaJ7ucCryOaQy0sbL9AiuC8l_N7uywmPZHcr3pC0,715
-tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=RkC_ux5bxo6bIdcXIG_97uRstWXBnmZO3DOW4IfgRx0,1135
+tests/models/emepEea2019/test_so2ToAirFuelCombustion.py,sha256=qG3AGLK5fNUJI1L_94fslHuiD6Z_YtmAjuDt5Q_4eOs,1178
 tests/models/emepEea2019/test_tspToAirAnimalHousing.py,sha256=4MNDsxIeUk5_3IvZwEZslxgoPNyQN9OQFDNY3uGNX6E,714
 tests/models/emepEea2019/test_utils.py,sha256=MUIeHgcCHLhbYWgleKIiKqO2Q4RX321J53YpOt9cogA,7060
 tests/models/environmentalFootprintV3_1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -779,7 +785,7 @@ tests/models/environmentalFootprintV3_1/test_environmentalFootprintSingleOverall
 tests/models/environmentalFootprintV3_1/test_freshwaterEcotoxicityPotentialCtue.py,sha256=WE-DcerljCjXMYE4f3Sv5ZCVHP0oTjbWkOGuvaa4p10,926
 tests/models/environmentalFootprintV3_1/test_marineEutrophicationPotential.py,sha256=kY_pu_7SjSZl_l41mttMn4BpKl13TTV9jQYSHFMNXhI,968
 tests/models/environmentalFootprintV3_1/test_photochemicalOzoneCreationPotentialHumanHealthNmvocEq.py,sha256=Z4KGhYmnao0J1rC_jY9P_8Lu9UKe-_RyrdO5k56EIsg,1022
-tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py,sha256=TJptYKhplwbwiDObmPMBJweDgtwvIUdwBzNwAPCpbTc,1265
+tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py,sha256=r_v3s06SLUcI2EUUiZc0H3NWv6OMxiZnNbIHyTBgXAw,1264
 tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandOccupation.py,sha256=67YdlYnvVWFDZ3avHSz3bpCLkHAwYfU3j4ZNcwN5DK0,6162
 tests/models/environmentalFootprintV3_1/test_soilQualityIndexLandTransformation.py,sha256=xRTBMfQ1Qxs_NIoEFtshM_uzAAcFb80k1qGuFLJa2Dw,7650
 tests/models/environmentalFootprintV3_1/test_soilQualityIndexTotalLandUseEffects.py,sha256=ugM3qfvCuNQbzF5IPkEQQYF2V4IHxg3GQsXWqU9wqFE,2614
@@ -858,7 +864,8 @@ tests/models/hestia/test_freshWater.py,sha256=v2UD69csKrniKP3MXkOEHxQeE6O3-lvIVi
 tests/models/hestia/test_histosol.py,sha256=7g-3wQPZok2O8mExcnKZxO_T2Ye_h3UHv3HG3Kn8orM,888
 tests/models/hestia/test_inorganicFertiliser.py,sha256=v2Zs1Ig-ChOaq9gXuurcBt12izkH2bRUUuzW6rh3rqQ,643
 tests/models/hestia/test_irrigatedTypeUnspecified.py,sha256=bluZADFagxfXW4QyI0CIJzG97D2V33w333Z9Vwjqo0M,2015
-tests/models/hestia/test_landCover.py,sha256=ekZsv-l8xMXJu384sO2UE8TbU0bUXvW3r5KMcuKwJDs,10216
+tests/models/hestia/test_landCover.py,sha256=YM7iH4FYKdJ_GBKKKr2ZR4v3s-vqFv4tiTHjHdaqNMQ,10216
+tests/models/hestia/test_landOccupationDuringCycle.py,sha256=pJmLUrC1CDFFhVE-00jz_eNF6XL9o71IC_w-lM3-vTA,2254
 tests/models/hestia/test_landTransformation100YearAverageDuringCycle.py,sha256=3qa4rWUFqP1VM5-vm_182rhiBYJDxPqJwWtBqJ5K028,956
 tests/models/hestia/test_landTransformation20YearAverageDuringCycle.py,sha256=bUByojQuVeuCfko1_2YtNJi1PT9yktHlcbPi_p-MPvk,1001
 tests/models/hestia/test_liveAnimal.py,sha256=3K9cL1fwr6LlBl1_D8zIaeCOuiExqkDEU7BXx1JK_dk,2139
@@ -914,7 +921,7 @@ tests/models/impact_assessment/product/test_economicValueShare.py,sha256=JbWlwBZ
 tests/models/impact_assessment/product/test_value.py,sha256=EFQFHM7OE4K9NrlhOaKj-opkv6HO8rSvS1L5Ux4jLmU,988
 tests/models/ipcc2006/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2006/test_aboveGroundCropResidueRemoved.py,sha256=5F7eU4qWYfTZAzjUsuUOE5rA2vZ0x6e6Bm10PgmG9Zg,1177
-tests/models/ipcc2006/test_aboveGroundCropResidueTotal.py,sha256=FrSR1xBTRtJ99pXAklXLtDRC00FSW1vXSAvQNeBoXTQ,1725
+tests/models/ipcc2006/test_aboveGroundCropResidueTotal.py,sha256=U5WQG7KYcCfJips2mghw7UtL87mmQUaAyKxN9tYD6fk,1887
 tests/models/ipcc2006/test_belowGroundCropResidue.py,sha256=cFqLDFy5pcgOyzKC9l-RClEP6CWCdVNnq48S90SITVM,1720
 tests/models/ipcc2006/test_n2OToAirCropResidueDecompositionDirect.py,sha256=pgUznkTiyLwhMVHzFE40wzwvtY40OsPQp1QWTsaPDqU,1815
 tests/models/ipcc2006/test_n2OToAirCropResidueDecompositionIndirect.py,sha256=cxn5rX_pZqbl7m8rhJARuyjG2P5O-BQbufeEcTmO06k,1357
@@ -930,7 +937,7 @@ tests/models/ipcc2013IncludingFeedbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 tests/models/ipcc2013IncludingFeedbacks/test_gwp100.py,sha256=4HydDKiZDpxtgqgjpAg4cTVQu-jM-_tdDdJFmNNrwSc,875
 tests/models/ipcc2019/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/models/ipcc2019/test_aboveGroundBiomass.py,sha256=zzsE1zr8qYWgc1EWNrCZggjkJyIoVwbkfE9c1MVn7uA,7608
-tests/models/ipcc2019/test_aboveGroundCropResidueTotal.py,sha256=HrTsqm1r5c5di5JONu7P4_95JMp1kbDuKfQjWLE0Jhs,2573
+tests/models/ipcc2019/test_aboveGroundCropResidueTotal.py,sha256=GMp6NCg1v4AjiwntN1C575BhxgZv_e_EG5Hv1buGKrA,1798
 tests/models/ipcc2019/test_belowGroundBiomass.py,sha256=Cu41RM63R-xti0qi_mLD0J5TClo61OkjsR4FI3caNxs,7579
 tests/models/ipcc2019/test_belowGroundCropResidue.py,sha256=no71pfxgOhn_tEWc_EwuWvlKRtHFqlIqNIvnP7cj0Tc,2568
 tests/models/ipcc2019/test_biocharOrganicCarbonPerHa.py,sha256=8Y5dwe_ZHSKxijLn3CMA6U5uQxHeBXYWsd93nPT16d4,3825
@@ -1272,8 +1279,8 @@ tests/orchestrator/strategies/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 tests/orchestrator/strategies/run/test_add_blank_node_if_missing.py,sha256=K4xg4UAXfNhSaLyknKVPO7MGBF44Z_gD7CuZ_pe28gU,3512
 tests/orchestrator/strategies/run/test_add_key_if_missing.py,sha256=hKwvk1ohcBVnQUCTiDhRW99J0xEa29BpwFi1KC0yWLE,329
 tests/orchestrator/strategies/run/test_always.py,sha256=w5-Dhp6yLzgZGAeMRz3OrqZbbAed9gZ1O266a3z9k7w,134
-hestia_earth_models-0.74.2.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
-hestia_earth_models-0.74.2.dist-info/METADATA,sha256=HFxqpoBHCAy0-p3g7SRQO9QwBFyPVtyd8Kmg-E-nJZg,4075
-hestia_earth_models-0.74.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hestia_earth_models-0.74.2.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
-hestia_earth_models-0.74.2.dist-info/RECORD,,
+hestia_earth_models-0.74.4.dist-info/LICENSE,sha256=TD25LoiRJsA5CPUNrcyt1PXlGcbUGFMAeZoBcfCrCNE,1154
+hestia_earth_models-0.74.4.dist-info/METADATA,sha256=u58F9YX_7d58HTQ6IVVLLIlpn2Cgtdm4Pjjg5-C2uew,4075
+hestia_earth_models-0.74.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hestia_earth_models-0.74.4.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
+hestia_earth_models-0.74.4.dist-info/RECORD,,

tests/models/cycle/test_aboveGroundCropResidueTotal.py

@@ -0,0 +1,20 @@
+import json
+from unittest.mock import patch
+
+from tests.utils import fixtures_path, fake_new_product
+from hestia_earth.models.cycle.aboveGroundCropResidueTotal import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}._new_product", side_effect=fake_new_product)
+def test_run_crop(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/emepEea2019/test_co2ToAirFuelCombustion.py

@@ -2,7 +2,8 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.emepEea2019.co2ToAirFuelCombustion import MODEL, TERM_ID, run
+from hestia_earth.models.emepEea2019 import MODEL
+from hestia_earth.models.emepEea2019.co2ToAirFuelCombustion import TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 model_utils_path = f"hestia_earth.models.{MODEL}.utils"

tests/models/emepEea2019/test_n2OToAirFuelCombustionDirect.py

@@ -2,7 +2,8 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.emepEea2019.n2OToAirFuelCombustionDirect import MODEL, TERM_ID, run
+from hestia_earth.models.emepEea2019 import MODEL
+from hestia_earth.models.emepEea2019.n2OToAirFuelCombustionDirect import TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 model_utils_path = f"hestia_earth.models.{MODEL}.utils"

tests/models/emepEea2019/test_nh3ToAirFuelCombustion.py

@@ -0,0 +1,34 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_emission
+
+from hestia_earth.models.emepEea2019 import MODEL
+from hestia_earth.models.emepEea2019.nh3ToAirFuelCombustion import TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+model_utils_path = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
+def test_run(*args):
+    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{model_utils_path}._new_emission", side_effect=fake_new_emission)
+def test_run_data_complete(*args):
+    with open(f"{fixtures_folder}/no-input-data-complete/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/no-input-data-complete/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/emepEea2019/test_noxToAirFuelCombustion.py

@@ -2,7 +2,8 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.emepEea2019.noxToAirFuelCombustion import MODEL, TERM_ID, run
+from hestia_earth.models.emepEea2019 import MODEL
+from hestia_earth.models.emepEea2019.noxToAirFuelCombustion import TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 model_utils_path = f"hestia_earth.models.{MODEL}.utils"

tests/models/emepEea2019/test_so2ToAirFuelCombustion.py

@@ -2,7 +2,8 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_emission
 
-from hestia_earth.models.emepEea2019.so2ToAirFuelCombustion import MODEL, TERM_ID, run
+from hestia_earth.models.emepEea2019 import MODEL
+from hestia_earth.models.emepEea2019.so2ToAirFuelCombustion import TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 model_utils_path = f"hestia_earth.models.{MODEL}.utils"

tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py

@@ -1,7 +1,6 @@
 import json
 import os
 from unittest.mock import patch
-
 from pytest import mark
 
 from hestia_earth.models.environmentalFootprintV3_1 import MODEL_FOLDER

tests/models/hestia/test_landCover.py

@@ -270,7 +270,7 @@ def test_get_ratio_between_land_use_types():
         first_land_use_term="Arable land",
         second_land_use_term="Permanent crops"
     )
-    assert result == (3800.0, 58.843)
+    assert result == (3800.0, 57.417)
 
 
 @pytest.mark.parametrize("subfolder", _folders)

tests/models/hestia/test_landOccupationDuringCycle.py

@@ -0,0 +1,68 @@
+import json
+from os.path import isfile
+from pytest import mark
+from unittest.mock import patch, MagicMock
+
+from hestia_earth.models.hestia.landOccupationDuringCycle import MODEL, TERM_ID, run, _should_run
+
+from tests.utils import fixtures_path, fake_new_indicator
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+def _load_fixture(file_name: str, default=None):
+    path = f"{fixtures_folder}/{file_name}.jsonld"
+    if isfile(path):
+        with open(path, encoding="utf-8") as f:
+            return json.load(f)
+    return default
+
+
+# subfolder, should_run
+PARAMS_SHOULD_RUN = [
+    ("arable", True),
+    ("permanent", True),
+    ("animal", True),
+    ("animal-multi-country", True),
+    ("arable-missing-evs", False),              # no economicValueShare on product
+    ("arable-zero-evs", True),                  # economicValueShare is `0` -> run, with 0% allocated
+    ("animal-missing-other-site-data", False),  # mis-matched `otherSites` and `otherSitesDuration`
+    ("animal-missing-site-data", False),        # closes #1341
+    ("poore-nemecek-2018-orchard", True),       # ensure model returns the same value as deprecated one
+    ("poore-nemecek-2018-cereal", True)         # ensure model returns the same value as deprecated one
+]
+IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
+
+
+@mark.parametrize("subfolder, expected", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
+def test_should_run(
+    subfolder: str,
+    expected: bool
+):
+    impact = _load_fixture(f"{subfolder}/impact-assessment", {})
+    cycle = _load_fixture(f"{subfolder}/cycle", {})
+
+    impact["cycle"] = cycle
+
+    result, *args = _should_run(impact)
+    assert result == expected
+
+
+PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
+
+
+@mark.parametrize("subfolder", PARAMS_RUN)
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run(
+    _mock_new_indicator: MagicMock,
+    subfolder: str
+):
+    impact = _load_fixture(f"{subfolder}/impact-assessment", {})
+    cycle = _load_fixture(f"{subfolder}/cycle", {})
+    expected = _load_fixture(f"{subfolder}/result", {})
+
+    impact["cycle"] = cycle
+
+    result = run(impact)
+    assert result == expected

tests/models/ipcc2006/test_aboveGroundCropResidueTotal.py

@@ -1,5 +1,7 @@
-from unittest.mock import patch
+import os
 import json
+from unittest.mock import patch
+from pytest import mark
 from hestia_earth.schema import TermTermType
 
 from tests.utils import fixtures_path, fake_new_product
@@ -7,6 +9,7 @@ from hestia_earth.models.ipcc2006.aboveGroundCropResidueTotal import MODEL, TERM
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 
 @patch(f"{class_path}._is_term_type_incomplete", return_value=True)
@@ -32,14 +35,14 @@ def test_should_run(*args):
     assert not should_run
 
 
-@patch(f"{class_path}._is_term_type_incomplete", return_value=True)
+@mark.parametrize("folder", _folders)
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
-def test_run(*args):
-    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+def test_run_crop(mock_new_product, folder: str):
+    with open(f"{fixtures_folder}/{folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
     value = run(cycle)
-    assert value == expected
+    assert value == expected, folder

tests/models/ipcc2019/test_aboveGroundCropResidueTotal.py

@@ -1,15 +1,15 @@
-from unittest.mock import patch
+import os
 import json
-
+from unittest.mock import patch
+from pytest import mark
 from hestia_earth.schema import TermTermType
-from tests.utils import fixtures_path, fake_new_product
 
-from hestia_earth.models.ipcc2019.aboveGroundCropResidueTotal import (
-    MODEL, TERM_ID, run, _should_run, _should_run_product
-)
+from tests.utils import fixtures_path, fake_new_product
+from hestia_earth.models.ipcc2019.aboveGroundCropResidueTotal import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 CROP_RESIDUE_TERM = {
     'termType': TermTermType.CROPRESIDUE.value
@@ -19,7 +19,11 @@ CROP_RESIDUE_TERM = {
 @patch('hestia_earth.models.utils.completeness.download_term', return_value=CROP_RESIDUE_TERM)
 @patch(f"{class_path}._should_run_product", return_value=True)
 def test_should_run(*args):
-    crop_product = {'term': {'termType': TermTermType.CROP.value}}
+    crop_product = {
+        'term': {'termType': TermTermType.CROP.value, '@id': 'wheatGrain'},
+        'value': [10],
+        'properties': [{'term': {'@id': 'dryMatter'}, 'value': 10}]
+    }
     cycle = {'products': []}
 
     # no crops => no run
@@ -33,45 +37,15 @@ def test_should_run(*args):
     assert should_run is True
 
 
-@patch('hestia_earth.models.utils.completeness.download_term', return_value=CROP_RESIDUE_TERM)
-@patch(f"{class_path}.get_yield_dm", return_value=None)
-def test_should_run_product(mock_get_yield_dm, *args):
-    product = {'term': {'@id': 'maizeGrain'}}
-
-    # with a dryMatter property => no run
-    product['properties'] = [{'term': {'@id': 'dryMatter'}, 'value': 10}]
-    assert not _should_run_product(product)
-
-    # with a value => no run
-    product['value'] = [10]
-    assert not _should_run_product(product)
-
-    # with a lookup value => run
-    mock_get_yield_dm.return_value = 10
-    assert _should_run_product(product) is True
-
-
-@patch('hestia_earth.models.utils.completeness.download_term', return_value=CROP_RESIDUE_TERM)
-@patch(f"{class_path}._new_product", side_effect=fake_new_product)
-def test_run_crop(*args):
-    with open(f"{fixtures_folder}/crop/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
-
-    with open(f"{fixtures_folder}/crop/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
-
-    value = run(cycle)
-    assert value == expected
-
-
+@mark.parametrize("folder", _folders)
 @patch('hestia_earth.models.utils.completeness.download_term', return_value=CROP_RESIDUE_TERM)
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
-def test_run_forage(*args):
-    with open(f"{fixtures_folder}/forage/cycle.jsonld", encoding='utf-8') as f:
+def test_run_crop(mock_new_product, mock_download_term, folder: str):
+    with open(f"{fixtures_folder}/{folder}/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/forage/result.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
     value = run(cycle)
-    assert value == expected
+    assert value == expected, folder