Use a 'universal' diff error output for greater readability.
Try to fix test suite.  Lines not being ignore in deref test.