[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 8 commits: Increase test coverage of diagnostics, batch 2