Fix setup teardown