Break out destroy command for easy reading

[ID-433]
Rename #orphans to #orphans_from

[ID-433]
WIP Fix tests

[ID-433] Can't yet determine why the #zones test is failing