Merge "Fix k8s tests run in CI"