cleaned up factories and moved to one factories file under spec/support/factories.rb