adding remove method and tests