updates diff tests
Merge branch 'diff'