Status update: most of the tests are fixed, CI should work fine on this change today. Will continue with other todos after that.
Status update: most of the tests are fixed, CI should work fine on this change today. Will continue with other todos after that.