small changes to test lsp12.4 more rigorously.