Problem: Tests are flaky because of using a common file name. Solution: Rename files and directories to be more unique.
Problem: Using an external diff program is slow and inflexible. Solution: Include the xdiff library. (Christian Brabandt, closes #2732) Use it by default.