diff --git a/Sources/JSONAPITesting/Comparisons/DocumentCompare.swift b/Sources/JSONAPITesting/Comparisons/DocumentCompare.swift
index 3f3ee23..2ffc37e 100644
--- a/Sources/JSONAPITesting/Comparisons/DocumentCompare.swift
+++ b/Sources/JSONAPITesting/Comparisons/DocumentCompare.swift
@@ -79,18 +79,6 @@ public enum BodyComparison: Equatable, CustomStringConvertible {
     public var rawValue: String { description }
 }
 
-extension EncodableJSONAPIDocument where Body: Equatable, PrimaryResourceBody: _ResourceBody {
-    public func compare(to other: Self) -> DocumentComparison {
-        return DocumentComparison(
-            apiDescription: Comparison(
-                String(describing: apiDescription),
-                String(describing: other.apiDescription)
-            ),
-            body: body.compare(to: other.body)
-        )
-    }
-}
-
 extension EncodableJSONAPIDocument where Body: Equatable, PrimaryResourceBody: _OptionalResourceBody {
     public func compare(to other: Self) -> DocumentComparison {
         return DocumentComparison(
@@ -103,36 +91,6 @@ extension EncodableJSONAPIDocument where Body: Equatable, PrimaryResourceBody: _
     }
 }
 
-extension DocumentBody where Self: Equatable, PrimaryResourceBody: _ResourceBody {
-    public func compare(to other: Self) -> BodyComparison {
-
-        // rule out case where they are the same
-        guard self != other else {
-            return .same
-        }
-
-        // rule out case where they are both error bodies
-        if let errors1 = errors, let errors2 = other.errors {
-            return .differentErrors(
-                BodyComparison.compare(
-                    errors: errors1, meta, links,
-                    with: errors2, meta, links
-                )
-            )
-        }
-
-        // rule out the case where they are both data
-        if let data1 = data, let data2 = other.data {
-            return .differentData(data1.compare(to: data2))
-        }
-
-        // we are left with the case where one is data and the
-        // other is an error if self.isError, then "the error
-        // is on the left"
-        return .dataErrorMismatch(errorOnLeft: isError)
-    }
-}
-
 extension DocumentBody where Self: Equatable, PrimaryResourceBody: _OptionalResourceBody {
     public func compare(to other: Self) -> BodyComparison {
 
diff --git a/Sources/JSONAPITesting/Comparisons/DocumentDataCompare.swift b/Sources/JSONAPITesting/Comparisons/DocumentDataCompare.swift
index 87b6819..607bfa7 100644
--- a/Sources/JSONAPITesting/Comparisons/DocumentDataCompare.swift
+++ b/Sources/JSONAPITesting/Comparisons/DocumentDataCompare.swift
@@ -33,17 +33,6 @@ public struct DocumentDataComparison: Equatable, PropertyComparable {
     }
 }
 
-extension DocumentBodyData where PrimaryResourceBody: _ResourceBody {
-    public func compare(to other: Self) -> DocumentDataComparison {
-        return .init(
-            primary: primary.compare(to: other.primary),
-            includes: includes.compare(to: other.includes),
-            meta: Comparison(meta, other.meta),
-            links: Comparison(links, other.links)
-        )
-    }
-}
-
 extension DocumentBodyData where PrimaryResourceBody: _OptionalResourceBody {
     public func compare(to other: Self) -> DocumentDataComparison {
         return .init(
@@ -56,28 +45,23 @@ extension DocumentBodyData where PrimaryResourceBody: _OptionalResourceBody {
 }
 
 public enum PrimaryResourceBodyComparison: Equatable, CustomStringConvertible {
-    case single(ResourceObjectComparison)
-    case many(ManyResourceObjectComparison)
-    case other(Comparison)
+    case oneOrMore(ManyResourceObjectComparison)
+    case optionalSingle(Comparison)
 
     public var isSame: Bool {
         switch self {
-        case .other(let comparison):
+        case .optionalSingle(let comparison):
             return comparison == .same
-        case .single(let comparison):
-            return comparison.isSame
-        case .many(let comparison):
+        case .oneOrMore(let comparison):
             return comparison.isSame
         }
     }
 
     public var description: String {
         switch self {
-        case .other(let comparison):
+        case .optionalSingle(let comparison):
             return comparison.rawValue
-        case .single(let comparison):
-            return comparison.rawValue
-        case .many(let comparison):
+        case .oneOrMore(let comparison):
             return comparison.rawValue
         }
     }
@@ -107,19 +91,14 @@ extension _OptionalResourceBody where WrappedPrimaryResourceType: ResourceObject
         guard let one = optionalResourceObject,
             let two = other.optionalResourceObject else {
 
-                func nilOrName<T>(_ resObj: T?) -> String {
-                    resObj.map { String(describing: type(of: $0)) } ?? "nil"
+                func nilOrName<T>(_ resObj: [T]?) -> String {
+                    resObj.map { _ in String(describing: T.self) } ?? "nil"
                 }
 
-                return .other(Comparison(nilOrName(optionalResourceObject), nilOrName(other.optionalResourceObject)))
+                return .optionalSingle(Comparison(nilOrName(optionalResourceObject), nilOrName(other.optionalResourceObject)))
         }
-        return .single(.init(one, two))
-    }
-}
 
-extension _ResourceBody where PrimaryResourceType: ResourceObjectType {
-    public func compare(to other: Self) -> PrimaryResourceBodyComparison {
-        return .many(.init(resourceObjects.compare(to: other.resourceObjects, using: { r1, r2 in
+        return .oneOrMore(.init(one.compare(to: two, using: { r1, r2 in
             let r1AsResource = r1 as? AbstractResourceObjectType
 
             let maybeComparison = r1AsResource
@@ -141,14 +120,9 @@ extension _ResourceBody where PrimaryResourceType: ResourceObjectType {
     }
 }
 
-public protocol _ResourceBody {
-    associatedtype PrimaryResourceType: ResourceObjectType
-    var resourceObjects: [PrimaryResourceType] { get }
-}
-
 public protocol _OptionalResourceBody {
     associatedtype WrappedPrimaryResourceType: ResourceObjectType
-    var optionalResourceObject: WrappedPrimaryResourceType? { get }
+    var optionalResourceObject: [WrappedPrimaryResourceType]? { get }
 }
 
 public protocol _OptionalResourceObjectType {
@@ -168,17 +142,16 @@ extension Optional: _OptionalResourceObjectType where Wrapped: ResourceObjectTyp
     }
 }
 
-extension ManyResourceBody: _ResourceBody where PrimaryResource: ResourceObjectType {
-    public var resourceObjects: [PrimaryResource] { values }
+extension ResourceObject: _OptionalResourceObjectType {
+    public var maybeValue: Self? { self }
 }
 
-extension SingleResourceBody: _ResourceBody where PrimaryResource: ResourceObjectType {
-    public typealias PrimaryResourceType = PrimaryResource
-    public var resourceObjects: [PrimaryResource] { [value] }
+extension ManyResourceBody: _OptionalResourceBody where PrimaryResource: ResourceObjectType {
+    public var optionalResourceObject: [PrimaryResource]? { values }
 }
 
 extension SingleResourceBody: _OptionalResourceBody where PrimaryResource: _OptionalResourceObjectType {
     public typealias WrappedPrimaryResourceType = PrimaryResource.Wrapped
 
-    public var optionalResourceObject: WrappedPrimaryResourceType? { value.maybeValue }
+    public var optionalResourceObject: [WrappedPrimaryResourceType]? { value.maybeValue.map { [$0] } }
 }
diff --git a/Tests/JSONAPITestingTests/Comparisons/DocumentCompareTests.swift b/Tests/JSONAPITestingTests/Comparisons/DocumentCompareTests.swift
index 7c00e38..0d19a5c 100644
--- a/Tests/JSONAPITestingTests/Comparisons/DocumentCompareTests.swift
+++ b/Tests/JSONAPITestingTests/Comparisons/DocumentCompareTests.swift
@@ -53,7 +53,7 @@ final class DocumentCompareTests: XCTestCase {
         ])
 
         XCTAssertEqual(d8.compare(to: d9).differences, [
-            "Body": ##"(Primary Resource: ('age' attribute: 10 ≠ 12), ('bestFriend' relationship: Optional(Id(2)) ≠ nil), ('favoriteColor' attribute: nil ≠ Optional("blue")), ('name' attribute: name ≠ Fig), (id: 1 ≠ 5))"##
+            "Body": ##"(Primary Resource: (resource 1: 'age' attribute: 10 ≠ 12, 'bestFriend' relationship: Optional(Id(2)) ≠ nil, 'favoriteColor' attribute: nil ≠ Optional("blue"), 'name' attribute: name ≠ Fig, id: 1 ≠ 5))"##
         ])
 
         XCTAssertEqual(d1.compare(to: d10).differences, [