Update diagnostics test.
Add file for merge.