Replaced individual class checks with a single Comparable check in the mock model comparator.