Mike, I see you fixed a test side effect that I was not aware of. While you are working on the decorator, you might consider how to fix another: every test that imports testing/jpl_units is changing the way units are handled. This breaks test_axes.test_units_strings. In addition to closing the figure, the decorator could re-initialize units.registry (and rcParams). Eric