PolicyEngine · MaxGhenis · May 12, 2026 · May 12, 2026 · May 12, 2026 · May 12, 2026
diff --git a/changelog.d/remove-reported-snap-and-ssi-disabled.changed b/changelog.d/remove-reported-snap-and-ssi-disabled.changed
@@ -0,0 +1 @@
+Remove the reported SNAP simulation switch and public SNAP/TANF-reported variables, and make SSI disability depend on modeled disability rather than reported SSI receipt.
diff --git a/changelog.d/remove-reported-spm-inputs.changed b/changelog.d/remove-reported-spm-inputs.changed
@@ -0,0 +1 @@
+Remove public reported-variable paths for WIC, school meals, state income tax, SALT, and SPM tax inputs; include ACP/EBB directly in net income, and rename remaining data-backed SPM housing and energy subsidy inputs without the reported suffix.
diff --git a/changelog.d/remove-social-security-retirement-reported.changed b/changelog.d/remove-social-security-retirement-reported.changed
@@ -0,0 +1 @@
+Make social_security_retirement the canonical input variable and remove the separate reported Social Security retirement variable and parameter.
diff --git a/policyengine_us/parameters/gov/ed/pell_grant/efc/simplified/benefits.yaml b/policyengine_us/parameters/gov/ed/pell_grant/efc/simplified/benefits.yaml
@@ -4,7 +4,7 @@ values:
     - snap
     - school_meal_net_subsidy
     - tanf
-    - spm_unit_wic
+    - wic
     - medicaid
     - ssi
 metadata:

diff --git a/policyengine_us/parameters/gov/fcc/acp/categorical_eligibility.yaml b/policyengine_us/parameters/gov/fcc/acp/categorical_eligibility.yaml
@@ -6,7 +6,7 @@ values:
     - lifeline # fcc.gov/acp
     - free_school_meals # 47 USC 1752(a)(6)(B)
     - reduced_price_school_meals # 47 USC 1752(a)(6)(B)
-    - spm_unit_pell_grant # 47 USC 1752(a)(6)(C)
+    - pell_grant # 47 USC 1752(a)(6)(C)
     # Also a broadband provider's existing low-income program.
     - wic # 47 USC 1752(a)(6)(E)
 metadata:

diff --git a/policyengine_us/parameters/gov/fcc/ebb/categorical_eligibility.yaml b/policyengine_us/parameters/gov/fcc/ebb/categorical_eligibility.yaml
@@ -7,7 +7,7 @@ values:
     - is_lifeline_eligible
     - free_school_meals
     - reduced_price_school_meals
-    - spm_unit_pell_grant
+    - pell_grant
     # At least one household member, since 2020-02-29.
     # This documents also limits this criterion by income:
     # https://www.fcc.gov/document/fcc-emergency-broadband-benefit-program-fact-sheet

diff --git a/policyengine_us/parameters/gov/household/household_benefits.yaml b/policyengine_us/parameters/gov/household/household_benefits.yaml
@@ -7,7 +7,9 @@ values:
     - wic
     - free_school_meals
     - reduced_price_school_meals
-    - spm_unit_broadband_subsidy
+    # Broadband subsidies.
+    - acp
+    - ebb
     - tanf
     - high_efficiency_electric_home_rebate
     - residential_efficiency_electrification_rebate
@@ -30,7 +32,9 @@ values:
     - wic
     - free_school_meals
     - reduced_price_school_meals
-    - spm_unit_broadband_subsidy
+    # Broadband subsidies.
+    - acp
+    - ebb
     - tanf
     - high_efficiency_electric_home_rebate
     - residential_efficiency_electrification_rebate

diff --git a/policyengine_us/parameters/gov/simulation/reported_broadband_subsidy.yaml b/policyengine_us/parameters/gov/simulation/reported_broadband_subsidy.yaml
diff --git a/policyengine_us/parameters/gov/simulation/reported_snap.yaml b/policyengine_us/parameters/gov/simulation/reported_snap.yaml
diff --git a/policyengine_us/parameters/gov/simulation/reported_social_security_retirement.yaml b/policyengine_us/parameters/gov/simulation/reported_social_security_retirement.yaml
diff --git a/policyengine_us/parameters/gov/states/wa/dcyf/eceap/income_sources.yaml b/policyengine_us/parameters/gov/states/wa/dcyf/eceap/income_sources.yaml
@@ -3,8 +3,8 @@ description: Washington counts these income sources when determining family inco
 values:
   2021-07-25:
     - market_income
-    - tanf_reported
-    - ssi_reported
+    - tanf
+    - ssi
     - social_security
     - child_support_received
     - unemployment_compensation

diff --git a/policyengine_us/parameters/simulation/disabled_programs.yaml b/policyengine_us/parameters/simulation/disabled_programs.yaml
@@ -1,9 +1,8 @@
-description: Programs which are not simulated, and instead taken from reported values.
+description: Programs which are not simulated, and instead taken from input data.
 values:
   0000-01-01:
   - spm_unit_capped_housing_subsidy
   - spm_unit_energy_subsidy
-  - spm_unit_wic
 metadata:
   unit: list
   label: Disabled programs
diff --git a/policyengine_us/parameters/simulation/reported_state_income_tax.yaml b/policyengine_us/parameters/simulation/reported_state_income_tax.yaml
diff --git a/policyengine_us/reforms/congress/tlaib/boost/boost_middle_class_tax_credit.py b/policyengine_us/reforms/congress/tlaib/boost/boost_middle_class_tax_credit.py
@@ -58,7 +58,9 @@ def formula(household, period, parameters):
                 "wic",
                 "free_school_meals",
                 "reduced_price_school_meals",
-                "spm_unit_broadband_subsidy",
+                # Broadband subsidies.
+                "acp",
+                "ebb",
                 "tanf",
                 "high_efficiency_electric_home_rebate",
                 "residential_efficiency_electrification_rebate",
@@ -101,7 +103,9 @@ def formula(spm_unit, period, parameters):
                 "wic",
                 "free_school_meals",
                 "reduced_price_school_meals",
-                "spm_unit_broadband_subsidy",
+                # Broadband subsidies.
+                "acp",
+                "ebb",
                 "spm_unit_energy_subsidy",
                 "tanf",
                 "high_efficiency_electric_home_rebate",

diff --git a/...e_us/reforms/congress/tlaib/economic_dignity_for_all_agenda/edaa_end_child_poverty_act.py b/...e_us/reforms/congress/tlaib/economic_dignity_for_all_agenda/edaa_end_child_poverty_act.py
@@ -122,7 +122,9 @@ def formula(spm_unit, period, parameters):
                 "wic",
                 "free_school_meals",
                 "reduced_price_school_meals",
-                "spm_unit_broadband_subsidy",
+                # Broadband subsidies.
+                "acp",
+                "ebb",
                 "spm_unit_energy_subsidy",
                 "tanf",
                 "high_efficiency_electric_home_rebate",

diff --git a/policyengine_us/reforms/congress/tlaib/end_child_poverty_act.py b/policyengine_us/reforms/congress/tlaib/end_child_poverty_act.py
@@ -92,7 +92,9 @@ class household_benefits(Variable):
             "wic",
             "free_school_meals",
             "reduced_price_school_meals",
-            "spm_unit_broadband_subsidy",
+            # Broadband subsidies.
+            "acp",
+            "ebb",
             "tanf",
             "high_efficiency_electric_home_rebate",
             "residential_efficiency_electrification_rebate",
@@ -126,7 +128,9 @@ def formula(spm_unit, period, parameters):
                 "wic",
                 "free_school_meals",
                 "reduced_price_school_meals",
-                "spm_unit_broadband_subsidy",
+                # Broadband subsidies.
+                "acp",
+                "ebb",
                 "spm_unit_energy_subsidy",
                 "tanf",
                 "high_efficiency_electric_home_rebate",

diff --git a/policyengine_us/reforms/federal/__init__.py b/policyengine_us/reforms/federal/__init__.py
@@ -2,4 +2,3 @@
     create_abolish_federal_income_tax_reform,
 )
 from .abolish_payroll_tax import create_abolish_payroll_tax_reform
-from .reported_state_income_tax import create_reported_state_income_tax_reform
diff --git a/policyengine_us/reforms/federal/reported_state_income_tax.py b/policyengine_us/reforms/federal/reported_state_income_tax.py
diff --git a/policyengine_us/reforms/reforms.py b/policyengine_us/reforms/reforms.py
@@ -14,7 +14,6 @@
 from .congress.wyden_smith import create_ctc_expansion_reform
 from .federal import create_abolish_federal_income_tax_reform
 from .federal import create_abolish_payroll_tax_reform
-from .federal import create_reported_state_income_tax_reform
 from .biden.budget_2025 import (
     create_medicare_and_investment_tax_increase_reform,
 )
@@ -283,9 +282,6 @@ def create_structural_reforms_from_parameters(parameters, period):
         parameters, period
     )
     abolish_payroll_tax = create_abolish_payroll_tax_reform(parameters, period)
-    reported_state_income_tax = create_reported_state_income_tax_reform(
-        parameters, period
-    )
     capital_gains_tax_increase = create_capital_gains_tax_increase_reform(
         parameters, period
     )
@@ -465,7 +461,6 @@ def create_structural_reforms_from_parameters(parameters, period):
         ctc_expansion,
         abolish_federal_income_tax,
         abolish_payroll_tax,
-        reported_state_income_tax,
         medicare_and_investment_tax_increase,
         capital_gains_tax_increase,
         halve_joint_eitc_phase_out_rate,

diff --git a/policyengine_us/tests/core/test_run_selective_tests.py b/policyengine_us/tests/core/test_run_selective_tests.py
@@ -18,6 +18,17 @@ def test_changed_yaml_tests_are_selected_directly():
     assert "policyengine_us/tests/run_selective_tests.py" not in test_paths
 
 
+def test_runner_unit_test_is_not_treated_as_infrastructure():
+    runner = SelectiveTestRunner()
+
+    assert runner.is_test_infrastructure_file(
+        "policyengine_us/tests/run_selective_tests.py"
+    )
+    assert not runner.is_test_infrastructure_file(
+        "policyengine_us/tests/core/test_run_selective_tests.py"
+    )
+
+
 def test_limit_test_paths_prefers_directly_changed_tests_for_broad_changes():
     runner = SelectiveTestRunner()
     runner.max_test_targets = 1
@@ -90,3 +101,28 @@ def test_limit_test_paths_keeps_direct_tests_when_deferring_slow_directory():
         "policyengine_us/tests/policy/contrib/ssa",
         "policyengine_us/tests/policy/contrib/ssa/test_trustees_core_thresholds.py",
     }
+
+
+def test_limit_test_paths_ignores_deleted_direct_tests():
+    runner = SelectiveTestRunner()
+
+    deleted_test = (
+        "policyengine_us/tests/policy/baseline/gov/ssa/social_security/"
+        "social_security_retirement_reported.yaml"
+    )
+    existing_test = (
+        "policyengine_us/tests/policy/baseline/gov/ssa/social_security/"
+        "social_security_retirement.yaml"
+    )
+    changed_files = {
+        deleted_test,
+        existing_test,
+        "policyengine_us/variables/gov/ssa/ss/social_security_retirement.py",
+    }
+
+    limited_paths = runner.limit_test_paths(
+        runner.map_files_to_tests(changed_files), changed_files
+    )
+
+    assert deleted_test not in limited_paths
+    assert existing_test in limited_paths
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Remove the reported SNAP simulation switch and public SNAP/TANF-reported variables, and make SSI disability depend on modeled disability rather than reported SSI receipt.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Remove public reported-variable paths for WIC, school meals, state income tax, SALT, and SPM tax inputs; include ACP/EBB directly in net income, and rename remaining data-backed SPM housing and energy subsidy inputs without the reported suffix.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Make social_security_retirement the canonical input variable and remove the separate reported Social Security retirement variable and parameter.