Updated Tests for add/remove methods