move prepareDiff to Diffs from DetailedDiffTest
further cleanup on Diff