Merge "Add tests for ArrayDiffFormatter and DiffOp"