I'll close this PR, since my latest one includes this one.

You may need to `bundle install` and `rake db:test:prepare` since the FactoryGirl gem was added.