Merge "Upgraded test env with Kubernetes support"