Fix all the cases where the tests indicated I messed up #2100

All 1 939 tests pass, 1 skipped in 1m 4s

18 files ± 0 18 suites ±0 1m 4s ⏱️ ±0s
1 940 tests +10 1 939 ✅ +10 1 💤 ±0 0 ❌ ±0
2 576 runs +20 2 574 ✅ +20 2 💤 ±0 0 ❌ ±0

Results for commit e07b7f3. ± Comparison against earlier commit 1c14529.