Added destroy method and updated unit tests