Refactor tests on latest Kubernetes