Make setup and teardown symmetric