updates controller specs to reflect updated code
resolved merge conflicts again