Fixed multiple removing bug, test added