Added another test case for the tree diff/merge algorithm. Still work in progress.