Added teardown to initial state