Fixed tests : cleanup during teardown