Adjusted the (test) setup to the changes in Ephemeral