Finish controller specs

All specs passing