[PATCH] Diff-files fix with more tests.