Merge "Refactoring of k8s manager and tests"