Minor bugfixes and test improvements to #4109 #20809

Job	Run time
rustfmt	16s
benchmark	16m 27s
check_release	2m 24s
fuzz	1h 39m 20s
build-tx-sync (macos-latest, stable)	5m 41s
build-tx-sync (ubuntu-latest, 1.75.0)	5m 27s
build-tx-sync (ubuntu-latest, beta)	5m 0s
build-tx-sync (ubuntu-latest, stable)	4m 52s
ext-test	5m 24s
coverage	15m 20s
linting	2m 35s
build (self-hosted, beta)	2h 4m 15s
build-tx-sync (macos-latest, beta)	4m 57s
build-tx-sync (macos-latest, 1.75.0)	5m 33s
check_docs	5m 11s
build (self-hosted, stable)	1h 15m 25s
build (self-hosted, 1.75.0)	3m 35s
build (macos-latest, stable)	1h 59m 29s
build (windows-latest, stable)	2h 52m 13s
build (macos-latest, 1.75.0)	1m 38s
	11h 15m 2s

Provide feedback