Merge "Add new tests and remove unused code" into nyc-support-25.3-dev