Model spec coverage catching up to recent changes
Cleans up controller and helper specs. Reactivates or removes several pending specs.