Fix Failing Unit Tests

Need to fix the various failing unit tests currently in the main branch before we complete the 7.12 release.
The failing tests are the tree synonymy and locality update tests.

<img width="144" height="720" alt="Image" src="https://github.com/user-attachments/assets/fd11922b-12c3-4a16-a1c1-0927c998e994" />