Reintroduces election on cluster creation

Reverts part of 9218ff35f9f538f0fbf921cf6f9763a497ccef81
fixing test