Fix bug coused items to be added 2x to the node
Update unit tests