Add more setup/teardown.