diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 92e31f0c6..91907806c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -476,6 +476,7 @@ jobs:
                     bch_coinbase_kat_bytevector_test \
                     bch_coinbase_author_kat_test \
                     bch_cashtokens_transparency_test \
+                    bch_cashaddr_kat_test \
                     bch_block_connector_test bch_block_ordering_test \
                     bch_utxo_connect_test bch_reorg_connect_test bch_reorg_rerequest_test \
                     bch_compact_block_connector_test \
@@ -609,6 +610,7 @@ jobs:
                     bch_coinbase_kat_bytevector_test \
                     bch_coinbase_author_kat_test \
                     bch_cashtokens_transparency_test \
+                    bch_cashaddr_kat_test \
                     bch_block_connector_test bch_block_ordering_test \
                     bch_utxo_connect_test bch_reorg_connect_test bch_reorg_rerequest_test \
                     bch_compact_block_connector_test \
diff --git a/src/impl/bch/share_check.hpp b/src/impl/bch/share_check.hpp
index 875cb15d9..c36f61b62 100644
--- a/src/impl/bch/share_check.hpp
+++ b/src/impl/bch/share_check.hpp
@@ -465,9 +465,9 @@ inline std::pair<uint256, uint64_t> compute_ref_hash_for_work(const RefHashParam
     return {ref_hash, nonce};
 }
 
-// Thread-local state from share_init_verify — read by attempt_verify() without re-computing scrypt.
+// Thread-local state from share_init_verify — read by attempt_verify() without re-computing the SHA256d PoW.
 inline thread_local bool g_last_init_is_block = false;
-inline thread_local uint256 g_last_pow_hash;  // scrypt hash of the share header
+inline thread_local uint256 g_last_pow_hash;  // SHA256d hash of the share header
 
 // ============================================================================
 // share_init_verify()
diff --git a/src/impl/bch/test/CMakeLists.txt b/src/impl/bch/test/CMakeLists.txt
index 33d87082c..bdfe914f5 100644
--- a/src/impl/bch/test/CMakeLists.txt
+++ b/src/impl/bch/test/CMakeLists.txt
@@ -26,6 +26,7 @@ if(BUILD_TESTING)
         g0_canonical_pin_test      # G0: canonical-pin vs p2poolBCH @6603b79 baseline + v35->v36 transition rule (pure)
         g2_ratchet_gate_kat_test   # G2: 60%-by-WORK version-switch accept gate + mint-cannot-outrun-accept (pure)
         coinbase_author_kat_test  # KAT G2: v36 coinbase output-assembly byte-parity vs p2pool-merged-v36 oracle (pure)
+        cashaddr_kat_test         # M4: CashAddr codec KAT -- encode/decode roundtrip + PolyMod/version-byte parity vs BCHN vectors, prefix/checksum rejection (pure)
     )
     foreach(t IN LISTS BCH_ABLA_TESTS)
         add_executable(bch_${t} ${t}.cpp)
diff --git a/src/impl/bch/test/cashaddr_test.cpp b/src/impl/bch/test/cashaddr_kat_test.cpp
similarity index 100%
rename from src/impl/bch/test/cashaddr_test.cpp
rename to src/impl/bch/test/cashaddr_kat_test.cpp