diff --git a/changelog.d/backdate-snap-bbce.added.md b/changelog.d/backdate-snap-bbce.added.md
new file mode 100644
index 00000000000..29494c1542f
--- /dev/null
+++ b/changelog.d/backdate-snap-bbce.added.md
@@ -0,0 +1 @@
+Backdate TANF non-cash BBCE parameters to FY2016 and fix CO BBCE bug.
diff --git a/policyengine_us/parameters/gov/hhs/tanf/non_cash/asset_limit.yaml b/policyengine_us/parameters/gov/hhs/tanf/non_cash/asset_limit.yaml
index 660ea617b62..92a6c4439f3 100644
--- a/policyengine_us/parameters/gov/hhs/tanf/non_cash/asset_limit.yaml
+++ b/policyengine_us/parameters/gov/hhs/tanf/non_cash/asset_limit.yaml
@@ -6,125 +6,127 @@ AL:
   # limit.
   # This is not yet modeled.
   # Other states with this rule are marked with a *.
-  2020-07-01: .inf
+  2015-10-01: .inf
 AK:
   # Alaska is not in the list, indicating it has not elected to BBCE.
   # Non-BBCE states are entered as negative infinity asset limit.
-  2020-07-01: -.inf
+  2015-10-01: -.inf
+  2025-07-01: .inf
 AZ:
-  2020-07-01: .inf
+  2015-10-01: .inf
 AR:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: -.inf # Non-BBCE.
 CA: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 CO: # *
-  2020-07-01: -.inf # Non-BBCE.
-  # May have changed prior to 2022-11-30.
-  2022-11-30:
-    value: .inf
-    metadata:
-      reference:
-        - title: Code of Colorado Regulations | Rule Manual Volume 4, SNAP | 4.206(C)(2)(b) (page 35)
-          href: https://www.sos.state.co.us/CCR/GenerateRulePdf.do?ruleVersionId=10492&fileName=10%20CCR%202506-1
+  2015-10-01: .inf
+  # https://www.sos.state.co.us/CCR/GenerateRulePdf.do?ruleVersionId=10492&fileName=10%20CCR%202506-1
 CT:
-  2020-07-01: .inf
+  2015-10-01: .inf
 DE:
-  2020-07-01: .inf
+  2015-10-01: .inf
 DC:
-  2020-07-01: .inf
+  2015-10-01: .inf
 FL: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 GA: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 GU:
-  2020-07-01: .inf
+  2015-10-01: .inf
 HI:
-  2020-07-01: .inf
+  2015-10-01: .inf
 ID:
-  2020-07-01: 5_000
+  2015-10-01: 5_000
 IL: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 IN:
-  2020-07-01: 5_000
+  2015-10-01: -.inf
+  2018-01-01: 5_000
 IA:
-  2020-07-01: .inf
+  2015-10-01: .inf
 KS:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: -.inf # Non-BBCE.
 KY: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 LA:
-  2020-07-01: .inf
+  2015-10-01: -.inf
+  2020-04-01: .inf
 ME:
-  2020-07-01: .inf
+  2015-10-01: .inf
 MD:
-  2020-07-01: .inf
+  2015-10-01: .inf
 MA: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 MI:
-  2020-07-01: 15_000
+  2015-10-01: 5_000
+  2019-12-01: 15_000
   2023-07-01: .inf
 MN:
-  2020-07-01: .inf
+  2015-10-01: .inf
 MS:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: .inf
+  2019-07-01: -.inf # Non-BBCE.
 MT:
-  2020-07-01: .inf
+  2015-10-01: .inf
 NE:
-  2020-07-01: 25_000 # For liquid assets (not modeled).
+  2015-10-01: 25_000 # For liquid assets (not modeled).
 NV:
-  2020-07-01: .inf
+  2015-10-01: .inf
 NH:
   # Only households with at least one dependent child and a specified relative to that child.
   # (Not currently modeled.)
-  2020-07-01: .inf
+  2015-10-01: .inf
 NJ:
-  2020-07-01: .inf
+  2015-10-01: .inf
 NM:
-  2020-07-01: .inf
+  2015-10-01: .inf
 NY: # *
   # Only for households with dependent care expenses or earned income (not currently implemented).
-  2020-07-01: .inf
+  2015-10-01: .inf
 NC:
-  2020-07-01: .inf
+  2015-10-01: .inf
 ND:
-  2020-07-01: .inf
+  2015-10-01: .inf
 OH: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 OK:
-  2020-07-01: .inf
+  2015-10-01: .inf
 OR:
-  2020-07-01: .inf
+  2015-10-01: .inf
 PA: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 RI: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 SC: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 TX:
-  2020-07-01: 5_000 # Excludes 1 vehicle up to $15,000 & includes excess vehicle value (not modeled).
+  2015-10-01: 5_000 # Excludes 1 vehicle up to $15,000 & includes excess vehicle value (not modeled).
 UT:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: -.inf # Non-BBCE.
 VT:
-  2020-07-01: .inf
+  2015-10-01: .inf
 VI: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 VA:
-  2020-07-01: .inf
+  2015-10-01: -.inf # Non-BBCE per ERS data through Sep 2020.
+  2021-07-01: .inf
 WA:
-  2020-07-01: .inf
+  2015-10-01: .inf
 WV: # *
-  2020-07-01: .inf
+  2015-10-01: .inf
 WI:
-  2020-07-01: .inf
+  2015-10-01: .inf
 WY:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: -.inf # Non-BBCE.
 
 metadata:
   label: TANF non-cash asset limit for SNAP BBCE
   unit: currency-USD
+  period: year
   reference:
-    - title: "USDA: Broad-based Categorical Eligibility"
-      href: https://fns-prod.azureedge.net/sites/default/files/resource-files/BBCE%20States%20Chart%20(July%202020).pdf
-      date: 2020-07-01
+    - title: USDA Broad-based Categorical Eligibility
+      href: https://www.fns.usda.gov/snap/broad-based-categorical-eligibility
+    - title: USDA ERS SNAP Policy Database (bbce_asset/bbce_a_amt columns, Jan 1996 - Dec 2020)
+      href: https://www.ers.usda.gov/data-products/snap-policy-data-sets
   breakdown:
   - state_code
diff --git a/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/gross.yaml b/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/gross.yaml
index 0d35156b487..68c9f0dcc77 100644
--- a/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/gross.yaml
+++ b/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/gross.yaml
@@ -1,137 +1,138 @@
 description: Gross income limit as a percent of the poverty line for TANF non-cash benefit used for SNAP BBCE, by state.
 
 AL:
-  2020-07-01: 1.3
+  2015-10-01: 1.3
 AK:
   # Alaska is not in the list, indicating it has not elected to BBCE.
-  # Non-BBCE states are entered as negative .infinity asset limit.
-  2020-07-01: -.inf
+  # Non-BBCE states are entered as negative .infinity gross income limit.
+  2015-10-01: -.inf
   2025-07-01: 2
 AZ:
-  2020-07-01: 1.85
+  2015-10-01: 1.85
 AR:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: -.inf # Non-BBCE.
 CA:
-  2020-07-01: 2
+  2015-10-01: 2
 CO:
-  2020-07-01: -.inf # Non-BBCE.
-  # Maybe have changed prior to 2022-11-30.
-  2022-11-30:
-    value: 2
-    metadata:
-      reference:
-        - title: Code of Colorado Regulations | Rule Manual Volume 4, SNAP | 4.206(C)(2)(a)(1) (page 34)
-          href: https://www.sos.state.co.us/CCR/GenerateRulePdf.do?ruleVersionId=10492&fileName=10%20CCR%202506-1
+  2015-10-01: 1.3
+  2018-06-01: 2
+  # https://www.sos.state.co.us/CCR/GenerateRulePdf.do?ruleVersionId=10492&fileName=10%20CCR%202506-1
 CT:
-  2020-07-01: 1.85
+  2015-10-01: 1.85
   2022-10-01: 2
 DE:
-  2020-07-01: 2
+  2015-10-01: 2
 DC:
-  2020-07-01: 2
+  2015-10-01: 2
 FL:
-  2020-07-01: 2
+  2015-10-01: 2
 GA:
-  2020-07-01: 1.3
+  2015-10-01: 1.3
 GU:
-  2020-07-01: 1.65
+  2015-10-01: 1.65
 HI:
-  2020-07-01: 2
+  2015-10-01: 2
 ID:
-  2020-07-01: 1.3
+  2015-10-01: 1.3
 IL:
-  2020-07-01: 1.65
+  2015-10-01: 1.3
+  2016-01-01: 1.65
 IN:
-  2020-07-01: 1.3
+  2015-10-01: -.inf
+  2018-01-01: 1.3
 IA:
-  2020-07-01: 1.6
+  2015-10-01: 1.6
 KS:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: -.inf # Non-BBCE.
 KY:
-  2020-07-01: 2
+  2015-10-01: 1.3
+  2020-05-01: 2
 LA:
-  2020-07-01: 1.3
+  2015-10-01: -.inf
+  2020-04-01: 1.3
   2022-07-01: 2
 ME:
-  2020-07-01: 1.85
+  2015-10-01: 1.85
   2024-07-01: 2 
 MD:
-  2020-07-01: 2
+  2015-10-01: 2
 MA:
-  2020-07-01: 2
+  2015-10-01: 2
 MI:
-  2020-07-01: 2
+  2015-10-01: 2
 MN:
-  2020-07-01: 1.65
+  2015-10-01: 1.65
   2022-09-01: 2
 MO:
-  2020-07-01: -.inf # Non-BBCE
+  2015-10-01: -.inf # Non-BBCE
 MS:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: 1.3
+  2019-07-01: -.inf # Non-BBCE.
 MT:
-  2020-07-01: 2
+  2015-10-01: 2
 NE:
-  2020-07-01: 1.3
+  2015-10-01: 1.3
   2021-06-01: 1.65
 NV:
-  2020-07-01: 2
+  2015-10-01: 2
 NH:
   # Only households with at least one dependent child and a specified relative to that child.
   # (Not currently modeled.) - criteria removed in 2023
-  2020-07-01: 1.85
+  2015-10-01: 1.85
   2023-01-01: 2
 NJ:
-  2020-07-01: 1.85
+  2015-10-01: 1.85
 NM:
-  2020-07-01: 1.65
+  2015-10-01: 1.65
   2024-10-01: 2
   # https://www.hca.nm.gov/2024/09/23/governor-expands-snap-access-increases-benefits-for-new-mexicans/
 NY:
   # 150% for those with earned income.
   # 200% for those with dependent care expenses, not currently entered.
-  2020-07-01: 1.5
+  2015-10-01: 1.5
 NC:
-  2020-07-01: 2
+  2015-10-01: 2
 ND:
-  2020-07-01: 2
+  2015-10-01: 2
 OH:
-  2020-07-01: 1.3
+  2015-10-01: 1.3
 OK:
-  2020-07-01: 1.3
+  2015-10-01: 1.3
 OR:
-  2020-07-01: 1.85
+  2015-10-01: 1.85
   2022-01-01: 2
 PA:
-  2020-07-01: 1.6
+  2015-10-01: 1.6
   # https://www.snapscreener.com/blog/pennsylvania-snap-increase
   2022-10-01: 2
 RI:
-  2020-07-01: 1.85
+  2015-10-01: 1.85
 SC:
-  2020-07-01: 1.3
+  2015-10-01: 1.3
 SD:
-  2020-07-01: -.inf  # Non-BBCE.
+  2015-10-01: -.inf  # Non-BBCE.
 TX:
-  2020-07-01: 1.65
+  2015-10-01: 1.65
 TN:
-  2020-07-01: -.inf # Non-BBCE
+  2015-10-01: -.inf # Non-BBCE
 UT:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: -.inf # Non-BBCE.
 VT:
-  2020-07-01: 1.85
+  2015-10-01: 1.85
 VI:
-  2020-07-01: 1.75
+  2015-10-01: 1.75
 VA:
-  2020-07-01: 1.3
+  2015-10-01: -.inf # Non-BBCE per ERS data through Sep 2020.
   2021-07-01: 2
 WA:
-  2020-07-01: 2
+  2015-10-01: 2
 WV:
-  2020-07-01: 2
+  2015-10-01: 1.3
+  2018-07-01: 2
 WI:
-  2020-07-01: 2
+  2015-10-01: 2
 WY:
-  2020-07-01: -.inf # Non-BBCE.
+  2015-10-01: -.inf # Non-BBCE.
 
 metadata:
   unit: /1
@@ -140,5 +141,7 @@ metadata:
   reference:
     - title: USDA Broad-Based Categorical Eligibility (BBCE)
       href: https://www.fns.usda.gov/snap/broad-based-categorical-eligibility
+    - title: USDA ERS SNAP Policy Database (bbce_inclmt column, Jan 1996 - Dec 2020)
+      href: https://www.ers.usda.gov/data-products/snap-policy-data-sets
   breakdown:
   - state_code
diff --git a/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/net_applies/hheod.yaml b/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/net_applies/hheod.yaml
index 78bb7a8404b..85355ff472d 100644
--- a/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/net_applies/hheod.yaml
+++ b/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/net_applies/hheod.yaml
@@ -1,102 +1,108 @@
 description: Whether the SNAP net income limit applies to elderly/disabled households seeking BBCE.
 # Non-BBCE states skipped.
 AL:
-  2020-07-01: true
+  2015-10-01: true
 AZ:
-  2020-07-01: false
+  2015-10-01: false
 CA:
-  2020-07-01: true
+  2015-10-01: true
 CO:
-  2020-07-01: true
+  2015-10-01: true
   2024-07-01: false
 CT:
-  2020-07-01: false
+  2015-10-01: false
 DC:
-  2020-07-01: false
+  2015-10-01: false
 DE:
-  2020-07-01: false
+  2015-10-01: false
 FL:
-  2020-07-01: false
+  2015-10-01: false
 GA:
-  2020-07-01: false
+  2015-10-01: false
 GU:
-  2020-07-01: false
+  2015-10-01: false
 HI:
-  2020-07-01: false
+  2015-10-01: false
   2022-07-01: true
 IA:
-  2020-07-01: false
+  2015-10-01: false
 ID:
-  2020-07-01: false
+  2015-10-01: false
   2024-07-01: true
 IL:
-  2020-07-01: false
+  2015-10-01: false
 IN:
-  2020-07-01: true
+  2018-01-01: true
 KY:
-  2020-07-01: false
+  2015-10-01: false
 LA:
-  2020-07-01: true
+  2020-04-01: true
 MA:
-  2020-07-01: false
+  2015-10-01: false
 MD:
-  2020-07-01: false
+  2015-10-01: false
 ME:
-  2020-07-01: false
+  2015-10-01: false
 MI:
-  2020-07-01: false
+  2015-10-01: false
 MN:
-  2020-07-01: false
+  2015-10-01: false
   2024-07-01: true
+MS:
+  2015-10-01: false
 MT:
-  2020-07-01: false
+  2015-10-01: false
 NC:
-  2020-07-01: false
+  2015-10-01: false
 ND:
-  2020-07-01: true
+  2015-10-01: true
 NE:
-  2020-07-01: true
+  2015-10-01: true
 NH:
-  2020-07-01: false
+  2015-10-01: false
 NJ:
-  2020-07-01: false
+  2015-10-01: false
 NM:
-  2020-07-01: false
+  2015-10-01: false
 NV:
-  2020-07-01: false
+  2015-10-01: false
 NY:
-  2020-07-01: false
+  2015-10-01: false
 OH:
-  2020-07-01: false
+  2015-10-01: false
 OK:
-  2020-07-01: true
+  2015-10-01: true
 OR:
-  2020-07-01: false
+  2015-10-01: false
 PA:
-  2020-07-01: false
+  2015-10-01: false
 RI:
-  2020-07-01: true
+  2015-10-01: true
 SC:
-  2020-07-01: false
+  2015-10-01: false
 TX:
-  2020-07-01: false
+  2015-10-01: false
 VA:
-  2020-07-01: false
+  2021-07-01: false
 VI:
-  2020-07-01: false
+  2015-10-01: false
 VT:
-  2020-07-01: false
+  2015-10-01: false
 WA:
-  2020-07-01: false
+  2015-10-01: false
 WI:
-  2020-07-01: false
+  2015-10-01: false
 WV:
-  2020-07-01: false
+  2015-10-01: false
 
 metadata:
+  unit: bool
+  period: year
   label: SNAP net income limit for elderly/disabled BBCE households
   reference:
     - title: SNAP Screener SNAP Eligibility Parameters
       href: https://www.snapscreener.com/?p=table
+    - title: USDA ERS SNAP Policy Database (bbce_elddisinclmt column, Jan 1996 - Dec 2020)
+      href: https://www.ers.usda.gov/data-products/snap-policy-data-sets
   breakdown:
   - state_code
diff --git a/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/net_applies/non_hheod.yaml b/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/net_applies/non_hheod.yaml
index be083b7dfcc..bd3e7e648b3 100644
--- a/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/net_applies/non_hheod.yaml
+++ b/policyengine_us/parameters/gov/hhs/tanf/non_cash/income_limit/net_applies/non_hheod.yaml
@@ -1,100 +1,106 @@
 description: Whether the SNAP net income limit applies to non-elderly/disabled households seeking BBCE.
 # Non-BBCE states skipped.
 AL:
-  2020-07-01: false
+  2015-10-01: false
 AZ:
-  2020-07-01: false
+  2015-10-01: false
 CA:
-  2020-07-01: true
+  2015-10-01: true
 CO:
-  2020-07-01: true
+  2015-10-01: true
   2024-07-01: false
 CT:
-  2020-07-01: false
+  2015-10-01: false
 DC:
-  2020-07-01: false
+  2015-10-01: false
 DE:
-  2020-07-01: false
+  2015-10-01: false
 FL:
-  2020-07-01: false
+  2015-10-01: false
 GA:
-  2020-07-01: false
+  2015-10-01: false
 GU:
-  2020-07-01: false
+  2015-10-01: false
 HI:
-  2020-07-01: false
+  2015-10-01: false
   2022-07-01: true
 IA:
-  2020-07-01: false
+  2015-10-01: false
 ID:
-  2020-07-01: false
+  2015-10-01: false
 IL:
-  2020-07-01: false
+  2015-10-01: false
 IN:
-  2020-07-01: true
+  2018-01-01: true
 KY:
-  2020-07-01: false
+  2015-10-01: false
 LA:
-  2020-07-01: true
+  2020-04-01: true
 MA:
-  2020-07-01: false
+  2015-10-01: false
 MD:
-  2020-07-01: false
+  2015-10-01: false
 ME:
-  2020-07-01: false
+  2015-10-01: false
 MI:
-  2020-07-01: false
+  2015-10-01: false
 MN:
-  2020-07-01: false
+  2015-10-01: false
+MS:
+  2015-10-01: false
 MT:
-  2020-07-01: false
+  2015-10-01: false
 NC:
-  2020-07-01: false
+  2015-10-01: false
 ND:
-  2020-07-01: true
+  2015-10-01: true
 NE:
-  2020-07-01: false
+  2015-10-01: false
 NH:
-  2020-07-01: false
+  2015-10-01: false
 NJ:
-  2020-07-01: false
+  2015-10-01: false
 NM:
-  2020-07-01: false
+  2015-10-01: false
 NV:
-  2020-07-01: false
+  2015-10-01: false
 NY:
-  2020-07-01: false
+  2015-10-01: false
 OH:
-  2020-07-01: false
+  2015-10-01: false
 OK:
-  2020-07-01: false
+  2015-10-01: false
 OR:
-  2020-07-01: false
+  2015-10-01: false
 PA:
-  2020-07-01: false
+  2015-10-01: false
 RI:
-  2020-07-01: true
+  2015-10-01: true
 SC:
-  2020-07-01: false
+  2015-10-01: false
 TX:
-  2020-07-01: false
+  2015-10-01: false
 VA:
-  2020-07-01: false
+  2021-07-01: false
 VI:
-  2020-07-01: false
+  2015-10-01: false
 VT:
-  2020-07-01: false
+  2015-10-01: false
 WA:
-  2020-07-01: false
+  2015-10-01: false
 WI:
-  2020-07-01: false
+  2015-10-01: false
 WV:
-  2020-07-01: false
+  2015-10-01: false
 
 metadata:
+  unit: bool
+  period: year
   label: SNAP net income limit for non-elderly/disabled BBCE households
   reference:
     - title: SNAP Screener SNAP Eligibility Parameters
       href: https://www.snapscreener.com/?p=table
+    - title: USDA ERS SNAP Policy Database (bbce_inclmt column, Jan 1996 - Dec 2020)
+      href: https://www.ers.usda.gov/data-products/snap-policy-data-sets
   breakdown:
   - state_code
diff --git a/policyengine_us/parameters/gov/hhs/tanf/non_cash/requires_all_for_hheod.yaml b/policyengine_us/parameters/gov/hhs/tanf/non_cash/requires_all_for_hheod.yaml
index 5e95982789e..9fd237e98f8 100644
--- a/policyengine_us/parameters/gov/hhs/tanf/non_cash/requires_all_for_hheod.yaml
+++ b/policyengine_us/parameters/gov/hhs/tanf/non_cash/requires_all_for_hheod.yaml
@@ -1,37 +1,43 @@
 description: Requires all members in household to be elderly or disabled for the household to be classified as elderly or disabled for non-cash TANF benefit; otherwise any.
 # States without BBCE elderly/disabled rules skipped.
 AL:
-  2020-07-01: true
+  2015-10-01: true
 GA:
-  2020-07-01: true
+  2015-10-01: true
 ID:
-  2020-07-01: false 
-  2024-07-02: false
+  2015-10-01: false
 IL:
-  2020-07-01: false
+  2015-10-01: false
 IN:
-  2020-07-01: false
+  2018-01-01: false
 LA:
-  2020-07-01: false
+  2020-04-01: false
 NE:
-  2020-07-01: false
+  2015-10-01: false
 OH:
-  2020-07-01: false
+  2015-10-01: false
 OK:
-  2020-07-01: false
+  2015-10-01: false
 PA:
-  2020-07-01: false
+  2015-10-01: false
 RI:
-  2020-07-01: false
+  2015-10-01: false
 SC:
-  2020-07-01: true
+  2015-10-01: true
 VI:
-  2020-07-01: false
+  2015-10-01: false
+WV:
+  2015-10-01: true
+  2018-07-01: false
 
 metadata:
+  unit: bool
+  period: year
   label: TANF non-cash elderly/disabled household classification requirement
   reference:
     - title: SNAP Screener SNAP Eligibility Parameters
       href: https://www.snapscreener.com/?p=table
+    - title: USDA ERS SNAP Policy Database (bbce_multiple column, Jan 1996 - Dec 2020)
+      href: https://www.ers.usda.gov/data-products/snap-policy-data-sets
   breakdown:
   - state_code
diff --git a/policyengine_us/tests/policy/baseline/gov/hhs/tanf/non_cash/meets_tanf_non_cash_asset_test.yaml b/policyengine_us/tests/policy/baseline/gov/hhs/tanf/non_cash/meets_tanf_non_cash_asset_test.yaml
index 1bb772cfc96..1ca2b5f96ea 100644
--- a/policyengine_us/tests/policy/baseline/gov/hhs/tanf/non_cash/meets_tanf_non_cash_asset_test.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/hhs/tanf/non_cash/meets_tanf_non_cash_asset_test.yaml
@@ -18,3 +18,27 @@
     snap_assets: 61_200 # $5,100 monthly
   output:
     meets_tanf_non_cash_asset_test: false
+
+- name: MS asset test fails (non-BBCE state, bug fix verification)
+  period: 2024
+  input:
+    state_code_str: MS
+    snap_assets: 0
+  output:
+    meets_tanf_non_cash_asset_test: false
+
+- name: IN asset below $5K limit passes
+  period: 2024
+  input:
+    state_code_str: IN
+    snap_assets: 48_000 # $4,000 monthly
+  output:
+    meets_tanf_non_cash_asset_test: true
+
+- name: IN asset above $5K limit fails
+  period: 2024
+  input:
+    state_code_str: IN
+    snap_assets: 72_000 # $6,000 monthly
+  output:
+    meets_tanf_non_cash_asset_test: false
diff --git a/policyengine_us/tests/policy/baseline/gov/hhs/tanf/non_cash/meets_tanf_non_cash_gross_income_test.yaml b/policyengine_us/tests/policy/baseline/gov/hhs/tanf/non_cash/meets_tanf_non_cash_gross_income_test.yaml
index 12a7e73bcb8..8ab3c10abd2 100644
--- a/policyengine_us/tests/policy/baseline/gov/hhs/tanf/non_cash/meets_tanf_non_cash_gross_income_test.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/hhs/tanf/non_cash/meets_tanf_non_cash_gross_income_test.yaml
@@ -21,3 +21,35 @@
     snap_gross_income_fpg_ratio: 1.95
     # Gross income limit is 200% of FPL, so this should be true.
     meets_tanf_non_cash_gross_income_test: true
+
+- name: CO has BBCE at 200% FPL (bug fix verification)
+  period: 2024-01
+  input:
+    snap_gross_income_fpg_ratio: 1.95
+    state_code: CO
+  output:
+    meets_tanf_non_cash_gross_income_test: true
+
+- name: CO rejects income above 200% FPL
+  period: 2024-01
+  input:
+    snap_gross_income_fpg_ratio: 2.05
+    state_code: CO
+  output:
+    meets_tanf_non_cash_gross_income_test: false
+
+- name: MS has no BBCE (non-BBCE state, bug fix verification)
+  period: 2024-01
+  input:
+    snap_gross_income_fpg_ratio: 0.5
+    state_code: MS
+  output:
+    meets_tanf_non_cash_gross_income_test: false
+
+- name: IN has BBCE at 130% FPL
+  period: 2024-01
+  input:
+    snap_gross_income_fpg_ratio: 1.25
+    state_code: IN
+  output:
+    meets_tanf_non_cash_gross_income_test: true