destroy + test refactoring