[rails3-upgrade] Revised specs to use FactoryGirl