here is the test package for the diff engine
Merge remote-tracking branch 'origin/master'