Add setup/teardown wrappers