rbtree cleanup, add removal tests