Make test decorators more consistent. NFC (#25433)

- Always use `func` to refer to functions being decorated.
- Always call inner functions with *args and **kwargs
- Always return the result of the inner function

Author: sbc100