WIP - Rebase onto Kube d65f8e3b90b8fde6a86d17a8869a8777471de86d

Fixing tests