Changed teardown for suite teardown