Refactor to Collection.prototype.remove and improve tests