Tests for unregister
Implement a nuclear-style unregister
Merge branch 'f/add-unregister' into develop