     (testing (str origin-format " to " dest-format)
       (is (empty? (generate-and-validate-xml :collection dest-format umm-c-record))))))
 
-(deftest roundtrip-example-record
-  (doseq [metadata-format tested-collection-formats]
-    (testing (str metadata-format)
-      (is (= (expected-conversion/convert expected-conversion/example-collection-record metadata-format)
-             (collection-xml-round-trip expected-conversion/example-collection-record metadata-format))))))
-
 (defspec roundtrip-generated-collection-records 100
   (for-all [umm-record (gen/no-shrink umm-gen/umm-c-generator)
             metadata-format (gen/elements tested-collection-formats)]
     (is (= (expected-conversion/convert umm-record metadata-format)
-           (collection-xml-round-trip umm-record metadata-format)))))
+           (xml-round-trip :collection metadata-format umm-record)))))
+
+;; TODO - Fix these test failures with CMR-2332 and uncomment the test
+#_(defspec roundtrip-generated-service-records 100
+  (for-all [umm-record (gen/no-shrink umm-gen/umm-s-generator)
+            metadata-format (gen/elements tested-service-formats)]
+    (is (= (expected-conversion/convert umm-record metadata-format)
+           (xml-round-trip :service metadata-format umm-record)))))
 
 (defn- parse-iso19115-projects-keywords
   "Returns the parsed projects keywords for the given ISO19115-2 xml"

  ;; Evaluate to print generated metadata from the record selected above.
  (println (core/generate-metadata :collection metadata-format sample-record))

  ;; Evaluate to return the UMM parsed from a XML round trip.
  (xml-round-trip sample-record metadata-format)

  ;; our simple example record
  (core/generate-metadata :collection metadata-format expected-conversion/example-record)

  (core/validate-xml :collection metadata-format metadata-xml)

  ;; round-trip
  (collection-xml-round-trip sample-record metadata-format)

  ;; Evaluate to see diff between expected conversion and result of XML round trip.
  (is (= (expected-conversion/convert sample-record metadata-format)
         (collection-xml-round-trip sample-record metadata-format)))

  ;; for generated test failures
  (is (= (expected-conversion/convert user/failing-value metadata-format)
         (collection-xml-round-trip user/failing-value metadata-format))))

   :iso19115 "iso19115.xml"
   :iso-smap "iso_smap.xml"})

(defn xml-round-trip
  "Returns record after being converted to XML and back to UMM through
  the given to-xml and to-umm mappings."
  [concept-type metadata-format record]
  (let [metadata-xml (core/generate-metadata concept-type metadata-format record)]
    ;; validate against xml schema
    (is (empty? (core/validate-xml concept-type metadata-format metadata-xml)))
    (core/parse-metadata concept-type metadata-format metadata-xml)))

(defn- generate-and-validate-xml
  "Returns a vector of errors (empty if none) from attempting to convert the given UMM record
