Promoted the graveyard/tombstone concept snapshot to be class rather than a string[].
Formatted JSON interferes with unit tests.
Fixed a few broken tests.