More spec changes
Finished controller tests!