             [clj-http.client :as client]
             [cmr.common.concepts :as cu]
             [cmr.umm.core :as umm]
-            [cmr.umm.echo10.related-url :as ru]))
+            [cmr.umm.related-url-helper :as ru]))
 
 (use-fixtures :each (ingest/reset-fixture "CMR_PROV1"))
-
-(comment
-  (ingest/reset)
-  (ingest/create-provider "CMR_PROV1")
-  )
 
 (deftest search-granules-in-xml-metadata
   ;; TODO we can add additional formats here later such as iso


(deftest search-granule-csv
  (let [ru1 (dc/related-url "GET DATA" "http://example.com")
        coll1 (d/ingest "CMR_PROV1" (dc/collection {}))
        coll2 (d/ingest "CMR_PROV1" (dc/collection {}))
        gran1 (d/ingest "CMR_PROV1" (dg/granule coll1 {:granule-ur "Granule1"

                                                       :day-night "DAY"
                                                       :size 100
                                                       :cloud-cover 50
                                                       :related-urls [ru1 ru2]}))
        gran2 (d/ingest "CMR_PROV1" (dg/granule coll2 {:granule-ur "Granule2"
                                                       :beginning-date-time "2011-01-01T12:00:00Z"
                                                       :ending-date-time "2011-01-11T12:00:00Z"
