Cleaned up creating_trips_spec.rb by moving various flavors of trips into trip_factory.rb