Add bounds adjust for add and remove, Add unit tests