Why is this needed now?  Should this instead be in the teardown method?