Fix review comments
* rename spec
* use find instead of select
* add spec for case if primary-controller already assigned