added teardown back in