Add a new DiffUtility that is covered by a Unit Test, use it for the diffContent
Merge branch 'test', add new DiffUtility and Unit Test