Changed name of unit test
Added unregister func and unit test for it