I understand, but am not willing to do the necessary refactoring work at this point (at least not for this fix / PR)

If the test fails then it's a failure anyway, we'll need to fix it.
The most important is that the cleanup is done when it works.