 ;; This is built on top of the existing spatial validation. It just ensures that the spatial
 ;; validation is being called.
 (deftest collection-spatial-coverage
-  (let [valid-point (umm-lib-point->umm-spec-point p/north-pole)
+  (let [valid-point {:Longitude 0 :Latitude 90} ;; north pole
         valid-mbr (umm-spec-mbr 0 0 0 0)
         invalid-point (umm-spec-point -181 0)
         invalid-mbr (umm-spec-mbr -180 45 180 46)]
     (testing "Valid spatial areas"
-      (assert-valid (coll-with-geometry {:CoordinateSystem "GEODETIC" :Points [valid-point]}))
-      (assert-valid (coll-with-geometry {:CoordinateSystem "GEODETIC" :Points [valid-point] :BoundingRectangles [valid-mbr]})))
+      (helpers/assert-valid (coll-with-geometry {:CoordinateSystem "GEODETIC" :Points [valid-point]}))
+      (helpers/assert-valid (coll-with-geometry {:CoordinateSystem "GEODETIC" :Points [valid-point] :BoundingRectangles [valid-mbr]})))
     (testing "Invalid single geometry"
-      (assert-invalid
+      (helpers/assert-invalid
         (coll-with-geometry {:CoordinateSystem "GEODETIC" :Points [invalid-point]})
         [:SpatialExtent :HorizontalSpatialDomain :Geometry :Points 0]
         ["Spatial validation error: Point longitude [-181] must be within -180.0 and 180.0"]))

                              :errors ["Spatial validation error: Point longitude [-181] must be within -180.0 and 180.0"]}
                             {:path [:SpatialExtent :HorizontalSpatialDomain :Geometry :BoundingRectangles 0]
                              :errors ["Spatial validation error: The bounding rectangle north value [45] was less than the south value [46]"]}]]
        (assert-multiple-invalid (coll-with-geometry {:CoordinateSystem "GEODETIC" :Points [valid-point invalid-point] :BoundingRectangles [invalid-mbr]})
                                 expected-errors)))))

            [cmr.spatial.point :as p]
            [cmr.common.services.errors :as e]))

(defn- umm-spec-point
  "Returns a point for a umm-spec model."
  [lon lat]
  {:Longitude lon :Latitude lat})

(defn- umm-spec-mbr
  "Returns an mbr for a umm-spec model."
