SPOT-1424

Remove a favorite, with unit tests