Add remove() method & associated tests