Since you've mentioned that changing macro tests was painful, could you, please, elaborate?
Is this the sheer amount of tests that caused trouble? Is this something else? How could I improve in the future?
It was simply the number of tests. What would recommend is to merge tests into larger files. That should also improve times spent testing which means people run tests more often, which should be good for everyone.
In fact that's it's not just macros but a lot of other tests as well that could be profitably merged.