RSpec fixes.
Controller and model fix.