PARTIAL
Satisfy expectations of brittle tests
Correct function locations
Add a regression test
Refactor
More refactoring