Test Consolidation

We have an oversized test suite that arose via TDD using coding agents.

It would be good to consolidate the tests:
- combine/reduce redundant tests
- organize the tests into fewer semantically unified files
- remove tests that are outdated/irrelevant
- minimize the use of private APIs except when the code cant be exercised extensively via public APIs
