Expand kustomize test coverage and update for later kustomize format

Expand kustomize test coverage and update for later kustomize format #222