Add tests for Diff3 and improve implem (wip)