Finish Destroy/Terminate split.

* Add unit tests.
* Need integration tests and documentation