[Git][ghc/ghc][master] Increase test coverage of diagnostics, batch 2