- Simplified and fixed destroy function
- More tests