(chore): Resolve merge conflicts in remaining e2e tests

Is this a bug? Make sure to use the Bug template above and be as detailed in your report as possible.