Restructure controller specs to match controller restructuring