Rewrite test to use FactoryGirl