Fix balancing after add, add more test coverage