Add unRegisterClass method
Add test code