* Fixed root remove/add events
* Added unit tests