COMMIT 6: Iteration 3b. Refactor controller specs.