You're right, it feels like tweaks somehow. But I tend to think that the problem comes more from the tests which are trying to test internal stuffs instead of the public API.

What about updating the tests to keep the same use cases but without testing directly the internal methods?