Fixed prepare/teardown cleanliness