Fix all the things, move controller specs to views