add FactoryGirl methods to spec helper and appropriate changes in specs