Add missing suite setup/teardown, etc.