Merge "Unify e2e tests." into main