Updates to control plane and tests.