Ensuring we do not add ephemeral keys twice.
Ensure remove_site task gets added to the site object after being populated.