diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs
index 66eca972a6..eec662dcb8 100644
--- a/ghcide/test/exe/Main.hs
+++ b/ghcide/test/exe/Main.hs
@@ -115,11 +115,14 @@ import           Test.Tasty.QuickCheck
 import           Text.Printf                              (printf)
 import           Text.Regex.TDFA                          ((=~))
 
+-- | Wait for the next progress begin step
 waitForProgressBegin :: Session ()
 waitForProgressBegin = skipManyTill anyMessage $ satisfyMaybe $ \case
   FromServerMess SProgress (NotificationMessage _ _ (ProgressParams _ (Begin _))) -> Just ()
   _ -> Nothing
 
+-- | Wait for the first progress end step
+-- Also implemented in hls-test-utils Test.Hls
 waitForProgressDone :: Session ()
 waitForProgressDone = skipManyTill anyMessage $ satisfyMaybe $ \case
   FromServerMess SProgress (NotificationMessage _ _ (ProgressParams _ (End _))) -> Just ()
@@ -127,6 +130,7 @@ waitForProgressDone = skipManyTill anyMessage $ satisfyMaybe $ \case
 
 -- | Wait for all progress to be done
 -- Needs at least one progress done notification to return
+-- Also implemented in hls-test-utils Test.Hls
 waitForAllProgressDone :: Session ()
 waitForAllProgressDone = loop
   where
@@ -136,6 +140,7 @@ waitForAllProgressDone = loop
         _ -> Nothing
       done <- null <$> getIncompleteProgressSessions
       unless done loop
+
 main :: IO ()
 main = do
   -- We mess with env vars so run single-threaded.
diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs
index 9d4014a7e5..9a008885a0 100644
--- a/hls-test-utils/src/Test/Hls.hs
+++ b/hls-test-utils/src/Test/Hls.hs
@@ -54,7 +54,8 @@ import           Development.IDE.Plugin.Test     (TestRequest (GetLastBuildKeys,
 import           Development.IDE.Types.Options
 import           GHC.IO.Handle
 import           Ide.Plugin.Config               (Config, formattingProvider)
-import           Ide.PluginUtils                 (idePluginsToPluginDesc, pluginDescToIdePlugins)
+import           Ide.PluginUtils                 (idePluginsToPluginDesc,
+                                                  pluginDescToIdePlugins)
 import           Ide.Types
 import           Language.LSP.Test
 import           Language.LSP.Types              hiding
@@ -190,17 +191,11 @@ runSessionWithServer' plugin conf sconf caps root s = withLock lock $ keepCurren
       putStrLn $ "Finishing canceling (took " <> showDuration t <> "s)"
   pure x
 
--- | Wait for all progress to be done
--- Needs at least one progress done notification to return
+-- | Wait for the next progress end step
 waitForProgressDone :: Session ()
-waitForProgressDone = loop
-  where
-    loop = do
-      () <- skipManyTill anyMessage $ satisfyMaybe $ \case
-        FromServerMess SProgress (NotificationMessage _ _ (ProgressParams _ (End _))) -> Just ()
-        _ -> Nothing
-      done <- null <$> getIncompleteProgressSessions
-      unless done loop
+waitForProgressDone = skipManyTill anyMessage $ satisfyMaybe $ \case
+  FromServerMess SProgress (NotificationMessage _ _ (ProgressParams _ (End _))) -> Just ()
+  _ -> Nothing
 
 -- | Wait for all progress to be done
 -- Needs at least one progress done notification to return
@@ -233,7 +228,7 @@ callTestPlugin cmd = do
     return $ do
       e <- _result
       case A.fromJSON e of
-        A.Error err   -> Left $ ResponseError InternalError (T.pack err) Nothing
+        A.Error err -> Left $ ResponseError InternalError (T.pack err) Nothing
         A.Success a -> pure a
 
 waitForAction :: String -> TextDocumentIdentifier -> Session (Either ResponseError WaitForIdeRuleResult)
diff --git a/plugins/hls-hlint-plugin/test/Main.hs b/plugins/hls-hlint-plugin/test/Main.hs
index 0987a5ef3b..19619dcffb 100644
--- a/plugins/hls-hlint-plugin/test/Main.hs
+++ b/plugins/hls-hlint-plugin/test/Main.hs
@@ -4,17 +4,18 @@ module Main
   ) where
 
 import           Control.Lens            ((^.))
-import           Data.Aeson              (toJSON, Value (..), object, (.=))
+import           Data.Aeson              (Value (..), object, toJSON, (.=))
 import           Data.List               (find)
 import qualified Data.Map                as Map
 import           Data.Maybe              (fromJust, isJust)
 import qualified Data.Text               as T
+import           Ide.Plugin.Config       (Config (..), PluginConfig (..),
+                                          hlintOn)
+import qualified Ide.Plugin.Config       as Plugin
 import qualified Ide.Plugin.Hlint        as HLint
-import           Ide.Plugin.Config       (hlintOn, Config (..), PluginConfig (..))
 import qualified Language.LSP.Types.Lens as L
 import           System.FilePath         ((</>))
 import           Test.Hls
-import qualified Ide.Plugin.Config as Plugin
 
 main :: IO ()
 main = defaultTestRunner tests
@@ -32,7 +33,7 @@ suggestionsTests :: TestTree
 suggestionsTests =
   testGroup "hlint suggestions" [
     testCase "provides 3.8 code actions including apply all" $ runHlintSession "" $ do
-        doc <- openDoc "ApplyRefact2.hs" "haskell"
+        doc <- openDoc "Base.hs" "haskell"
         diags@(reduceDiag:_) <- waitForDiagnosticsFromSource doc "hlint"
 
         liftIO $ do
@@ -58,7 +59,7 @@ suggestionsTests =
         liftIO $ contents @?= "main = undefined\nfoo x = x\n"
 
     , testCase "falls back to pre 3.8 code actions" $ runSessionWithServer' [hlintPlugin] def def noLiteralCaps "test/testdata" $ do
-        doc <- openDoc "ApplyRefact2.hs" "haskell"
+        doc <- openDoc "Base.hs" "haskell"
 
         _ <- waitForDiagnosticsFromSource doc "hlint"
 
@@ -71,7 +72,7 @@ suggestionsTests =
         liftIO $ contents @?= "main = undefined\nfoo = id\n"
 
     , testCase "changing document contents updates hlint diagnostics" $ runHlintSession "" $ do
-        doc <- openDoc "ApplyRefact2.hs" "haskell"
+        doc <- openDoc "Base.hs" "haskell"
         testHlintDiagnostics doc
 
         let change = TextDocumentContentChangeEvent
@@ -86,60 +87,63 @@ suggestionsTests =
         changeDoc doc [change']
         testHlintDiagnostics doc
 
-    , knownBrokenForGhcVersions [GHC88, GHC86] "hlint doesn't take in account cpp flag as ghc -D argument" $
-      testCase "hlint diagnostics works with CPP via ghc -XCPP argument (#554)" $ runHlintSession "cpp" $ do
-        doc <- openDoc "ApplyRefact3.hs" "haskell"
+    , knownBrokenForHlintOnGhcLib "hlint doesn't take in account cpp flag as ghc -D argument" $
+      testCase "[#554] hlint diagnostics works with CPP via ghc -XCPP argument" $ runHlintSession "cpp" $ do
+        doc <- openDoc "CppCond.hs" "haskell"
         testHlintDiagnostics doc
 
-    , knownBrokenForGhcVersions [GHC88, GHC86] "hlint doesn't take in account cpp flag as ghc -D argument" $
-      testCase "hlint diagnostics works with CPP via language pragma (#554)" $ runHlintSession "" $ do
-        doc <- openDoc "ApplyRefact3.hs" "haskell"
+    , knownBrokenForHlintOnGhcLib "hlint doesn't take in account cpp flag as ghc -D argument" $
+      testCase "[#554] hlint diagnostics works with CPP via language pragma" $ runHlintSession "" $ do
+        doc <- openDoc "CppCond.hs" "haskell"
         testHlintDiagnostics doc
 
-    , testCase "hlint diagnostics works with CPP via -XCPP argument and flag via #include header (#554)" $ runHlintSession "cpp" $ do
-        doc <- openDoc "ApplyRefact2.hs" "haskell"
+    , testCase "[#554] hlint diagnostics works with CPP via -XCPP argument and flag via #include header" $ runHlintSession "cpp" $ do
+        doc <- openDoc "CppHeader.hs" "haskell"
         testHlintDiagnostics doc
 
-    , testCase "apply-refact works with -XLambdaCase argument (#590)" $ runHlintSession "lambdacase" $ do
-        testRefactor "ApplyRefact1.hs" "Redundant bracket"
+    , testCase "[#590] apply-refact works with -XLambdaCase argument" $ runHlintSession "lambdacase" $ do
+        testRefactor "LambdaCase.hs" "Redundant bracket"
             expectedLambdaCase
 
-    , testCase "apply-refact works with -XTypeApplications argument (#1242)" $ runHlintSession "typeapps" $ do
-        testRefactor "ApplyRefact1.hs" "Redundant bracket"
+    , testCase "[#1242] apply-refact works with -XTypeApplications argument" $ runHlintSession "typeapps" $ do
+        testRefactor "TypeApplication.hs" "Redundant bracket"
             expectedTypeApp
 
     , testCase "apply hints works with LambdaCase via language pragma" $ runHlintSession "" $ do
-        testRefactor "ApplyRefact1.hs" "Redundant bracket"
+        testRefactor "LambdaCase.hs" "Redundant bracket"
             ("{-# LANGUAGE LambdaCase #-}" : expectedLambdaCase)
 
     , expectFailBecause "apply-refact doesn't work with cpp" $
       testCase "apply hints works with CPP via -XCPP argument" $ runHlintSession "cpp" $ do
-        testRefactor "ApplyRefact3.hs" "Redundant bracket"
+        testRefactor "CppCond.hs" "Redundant bracket"
             expectedCPP
 
     , expectFailBecause "apply-refact doesn't work with cpp" $
       testCase "apply hints works with CPP via language pragma" $ runHlintSession "" $ do
-        testRefactor "ApplyRefact3.hs" "Redundant bracket"
+        testRefactor "CppCond.hs" "Redundant bracket"
             ("{-# LANGUAGE CPP #-}" : expectedCPP)
 
     , testCase "hlint diagnostics ignore hints honouring .hlint.yaml" $ runHlintSession "ignore" $ do
-        doc <- openDoc "ApplyRefact.hs" "haskell"
+        doc <- openDoc "CamelCase.hs" "haskell"
         expectNoMoreDiagnostics 3 doc "hlint"
 
     , testCase "hlint diagnostics ignore hints honouring ANN annotations" $ runHlintSession "" $ do
-        doc <- openDoc "ApplyRefact4.hs" "haskell"
+        doc <- openDoc "IgnoreAnn.hs" "haskell"
         expectNoMoreDiagnostics 3 doc "hlint"
 
-    , knownBrokenForGhcVersions [GHC810, GHC90] "hlint plugin doesn't honour HLINT annotations (#838)" $
+    , knownBrokenForHlintOnRawGhc "[#838] hlint plugin doesn't honour HLINT annotations" $
       testCase "hlint diagnostics ignore hints honouring HLINT annotations" $ runHlintSession "" $ do
-        doc <- openDoc "ApplyRefact5.hs" "haskell"
+        doc <- openDoc "IgnoreAnnHlint.hs" "haskell"
         expectNoMoreDiagnostics 3 doc "hlint"
 
     , testCase "apply-refact preserve regular comments" $ runHlintSession "" $ do
-        testRefactor "ApplyRefact6.hs" "Redundant bracket" expectedComments
+        testRefactor "Comments.hs" "Redundant bracket" expectedComments
+
+    , testCase "[#2290] apply all hints works with a trailing comment" $ runHlintSession "" $ do
+        testRefactor "TwoHintsAndComment.hs" "Apply all hints" expectedComments2
 
     , testCase "applyAll is shown only when there is at least one diagnostic in range" $  runHlintSession "" $ do
-        doc <- openDoc "ApplyRefact8.hs" "haskell"
+        doc <- openDoc "TwoHints.hs" "haskell"
         _ <- waitForDiagnosticsFromSource doc "hlint"
 
         firstLine <- map fromAction <$> getCodeActions doc (mkRange 0 0 0 0)
@@ -153,6 +157,30 @@ suggestionsTests =
         liftIO $ hasApplyAll secondLine @? "Missing apply all code action"
         liftIO $ not (hasApplyAll thirdLine) @? "Unexpected apply all code action"
         liftIO $ hasApplyAll multiLine @? "Missing apply all code action"
+
+    , knownBrokenForHlintOnRawGhc "[#2042] maybe hlint is ignoring pragmas" $
+      testCase "hlint should warn about unused extensions" $ runHlintSession "unusedext" $ do
+        doc <- openDoc "UnusedExtension.hs" "haskell"
+        diags@(unusedExt:_) <- waitForDiagnosticsFromSource doc "hlint"
+
+        liftIO $ do
+            length diags @?= 1
+            unusedExt ^. L.code @?= Just (InR "refact:Unused LANGUAGE pragma")
+
+    , knownBrokenForHlintOnGhcLib "[#1279] hlint uses a fixed set of extensions" $
+      testCase "hlint should not activate extensions like PatternSynonyms" $ runHlintSession "" $ do
+        doc <- openDoc "PatternKeyword.hs" "haskell"
+
+        waitForAllProgressDone
+        -- hlint will report a parse error if PatternSynonyms is enabled
+        expectNoMoreDiagnostics 3 doc "hlint"
+    , knownBrokenForHlintOnRawGhc "[#2280] maybe hlint is ignoring pragmas" $
+      testCase "hlint should not warn about redundant irrefutable pattern with LANGUAGE Strict" $ runHlintSession "" $ do
+        doc <- openDoc "StrictData.hs" "haskell"
+
+        waitForAllProgressDone
+
+        expectNoMoreDiagnostics 3 doc "hlint"
     ]
     where
         testRefactor file caTitle expected = do
@@ -168,11 +196,11 @@ suggestionsTests =
             contents <- skipManyTill anyMessage $ getDocumentEdit doc
             liftIO $ contents @?= T.unlines expected
 
-        expectedLambdaCase = [ "module ApplyRefact1 where", ""
+        expectedLambdaCase = [ "module LambdaCase where", ""
                              , "f = \\case \"true\" -> True"
                              , "          _ -> False"
                              ]
-        expectedCPP =        [ "module ApplyRefact3 where", ""
+        expectedCPP =        [ "module CppCond where", ""
                              , "#ifdef FLAG"
                              , "f = 1"
                              , "#else"
@@ -180,14 +208,17 @@ suggestionsTests =
                              , "#endif", ""
                              ]
         expectedComments =   [ "-- comment before header"
-                             , "module ApplyRefact6 where", ""
+                             , "module Comments where", ""
                              , "{-# standalone annotation #-}", ""
                              , "-- standalone comment", ""
                              , "-- | haddock comment"
                              , "f = {- inline comment -}{- inline comment inside refactored code -} 1 -- ending comment", ""
                              , "-- final comment"
                              ]
-        expectedTypeApp =    [ "module ApplyRefact1 where", ""
+        expectedComments2 =  [ "module TwoHintsAndComment where"
+                             , "biggest = foldr1 max -- the line above will show two hlint hints, \"eta reduce\" and \"use maximum\""
+                             ]
+        expectedTypeApp =    [ "module TypeApplication where", ""
                              , "a = id @Int 1"
                              ]
 
@@ -198,7 +229,7 @@ configTests = testGroup "hlint plugin config" [
         let config = def { hlintOn = True }
         sendConfigurationChanged (toJSON config)
 
-        doc <- openDoc "ApplyRefact2.hs" "haskell"
+        doc <- openDoc "Base.hs" "haskell"
         testHlintDiagnostics doc
 
         let config' = def { hlintOn = False }
@@ -212,7 +243,7 @@ configTests = testGroup "hlint plugin config" [
         let config = def { hlintOn = True }
         sendConfigurationChanged (toJSON config)
 
-        doc <- openDoc "ApplyRefact2.hs" "haskell"
+        doc <- openDoc "Base.hs" "haskell"
         testHlintDiagnostics doc
 
         let config' = pluginGlobalOn config "hlint" False
@@ -226,7 +257,7 @@ configTests = testGroup "hlint plugin config" [
         let config = def { hlintOn = True }
         sendConfigurationChanged (toJSON config)
 
-        doc <- openDoc "ApplyRefact2.hs" "haskell"
+        doc <- openDoc "Base.hs" "haskell"
         testHlintDiagnostics doc
 
         let config' = hlintConfigWithFlags ["--ignore=Redundant id", "--hint=test-hlint-config.yaml"]
@@ -240,7 +271,7 @@ configTests = testGroup "hlint plugin config" [
         let config = def { hlintOn = True }
         sendConfigurationChanged (toJSON config)
 
-        doc <- openDoc "ApplyRefact7.hs" "haskell"
+        doc <- openDoc "Generalise.hs" "haskell"
 
         expectNoMoreDiagnostics 3 doc "hlint"
 
@@ -285,3 +316,16 @@ hlintConfigWithFlags flags =
   where
     unObject (Object obj) = obj
     unObject _            = undefined
+
+-- We have two main code paths in the plugin depending on how hlint interacts with ghc:
+-- * One when hlint uses ghc-lib (all ghc versions but the last version supported by hlint)
+-- * Another one when hlint uses directly ghc (only one version, which not have to be the last version supported by ghcide)
+-- As we always are using ghc through ghcide the code to get the ghc parsed AST differs
+-- So the issues and bugs usually only affects to one code path or the other.
+-- Although a given hlint version supports one direct ghc, we could use several versions of hlint
+-- each one supporting a different ghc version. It should be a temporary situation though.
+knownBrokenForHlintOnGhcLib :: String -> TestTree -> TestTree
+knownBrokenForHlintOnGhcLib = knownBrokenForGhcVersions [GHC88, GHC86]
+
+knownBrokenForHlintOnRawGhc :: String -> TestTree -> TestTree
+knownBrokenForHlintOnRawGhc = knownBrokenForGhcVersions [GHC810, GHC90]
diff --git a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact2.hs b/plugins/hls-hlint-plugin/test/testdata/Base.hs
similarity index 100%
rename from plugins/hls-hlint-plugin/test/testdata/ApplyRefact2.hs
rename to plugins/hls-hlint-plugin/test/testdata/Base.hs
diff --git a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact6.hs b/plugins/hls-hlint-plugin/test/testdata/Comments.hs
similarity index 88%
rename from plugins/hls-hlint-plugin/test/testdata/ApplyRefact6.hs
rename to plugins/hls-hlint-plugin/test/testdata/Comments.hs
index 8c5debea21..849ebecf95 100644
--- a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact6.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/Comments.hs
@@ -1,5 +1,5 @@
 -- comment before header
-module ApplyRefact6 where
+module Comments where
 
 {-# standalone annotation #-}
 
diff --git a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact3.hs b/plugins/hls-hlint-plugin/test/testdata/CppCond.hs
similarity index 70%
rename from plugins/hls-hlint-plugin/test/testdata/ApplyRefact3.hs
rename to plugins/hls-hlint-plugin/test/testdata/CppCond.hs
index 81e307b2d5..6ba9eadba3 100644
--- a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact3.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/CppCond.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-module ApplyRefact3 where
+module CppCond where
 
 #ifdef FLAG
 f = (1)
diff --git a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact7.hs b/plugins/hls-hlint-plugin/test/testdata/Generalise.hs
similarity index 100%
rename from plugins/hls-hlint-plugin/test/testdata/ApplyRefact7.hs
rename to plugins/hls-hlint-plugin/test/testdata/Generalise.hs
diff --git a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact4.hs b/plugins/hls-hlint-plugin/test/testdata/IgnoreAnn.hs
similarity index 70%
rename from plugins/hls-hlint-plugin/test/testdata/ApplyRefact4.hs
rename to plugins/hls-hlint-plugin/test/testdata/IgnoreAnn.hs
index 8752966daa..402e0bb090 100644
--- a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact4.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/IgnoreAnn.hs
@@ -1,4 +1,4 @@
-module ApplyRefact4 where
+module IgnoreAnn where
 
 {-# ANN module "HLint: ignore Redundant bracket" #-}
 f = (1)
diff --git a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact5.hs b/plugins/hls-hlint-plugin/test/testdata/IgnoreAnnHlint.hs
similarity index 79%
rename from plugins/hls-hlint-plugin/test/testdata/ApplyRefact5.hs
rename to plugins/hls-hlint-plugin/test/testdata/IgnoreAnnHlint.hs
index 1507bba739..27cd7f4851 100644
--- a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact5.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/IgnoreAnnHlint.hs
@@ -1,4 +1,4 @@
-module ApplyRefact5 where
+module IgnoreHlintAnn where
 
 {- HLINT ignore "Redundant bracket" -}
 f = (1)
diff --git a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact1.hs b/plugins/hls-hlint-plugin/test/testdata/LambdaCase.hs
similarity index 74%
rename from plugins/hls-hlint-plugin/test/testdata/ApplyRefact1.hs
rename to plugins/hls-hlint-plugin/test/testdata/LambdaCase.hs
index 8ff4c6f00f..b0f36a258c 100644
--- a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact1.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/LambdaCase.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE LambdaCase #-}
-module ApplyRefact1 where
+module LambdaCase where
 
 f = \case "true" -> (True)
           _ -> False
diff --git a/plugins/hls-hlint-plugin/test/testdata/PatternKeyword.hs b/plugins/hls-hlint-plugin/test/testdata/PatternKeyword.hs
new file mode 100644
index 0000000000..21f430e104
--- /dev/null
+++ b/plugins/hls-hlint-plugin/test/testdata/PatternKeyword.hs
@@ -0,0 +1,3 @@
+module Foo (pattern) where
+
+pattern = 42
diff --git a/plugins/hls-hlint-plugin/test/testdata/StrictData.hs b/plugins/hls-hlint-plugin/test/testdata/StrictData.hs
new file mode 100644
index 0000000000..0865b611e3
--- /dev/null
+++ b/plugins/hls-hlint-plugin/test/testdata/StrictData.hs
@@ -0,0 +1,2 @@
+{-# LANGUAGE Strict #-}
+f ~x = x
diff --git a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact8.hs b/plugins/hls-hlint-plugin/test/testdata/TwoHints.hs
similarity index 94%
rename from plugins/hls-hlint-plugin/test/testdata/ApplyRefact8.hs
rename to plugins/hls-hlint-plugin/test/testdata/TwoHints.hs
index 3ea5093476..64c57da7b0 100644
--- a/plugins/hls-hlint-plugin/test/testdata/ApplyRefact8.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/TwoHints.hs
@@ -1,3 +1,2 @@
 f = (1)
 g = (1)
-
diff --git a/plugins/hls-hlint-plugin/test/testdata/TwoHintsAndComment.hs b/plugins/hls-hlint-plugin/test/testdata/TwoHintsAndComment.hs
new file mode 100644
index 0000000000..f017bd0762
--- /dev/null
+++ b/plugins/hls-hlint-plugin/test/testdata/TwoHintsAndComment.hs
@@ -0,0 +1,2 @@
+module TwoHintsAndComment where
+biggest items = foldr1 max items -- the line above will show two hlint hints, "eta reduce" and "use maximum"
diff --git a/plugins/hls-hlint-plugin/test/testdata/cpp/ApplyRefact3.hs b/plugins/hls-hlint-plugin/test/testdata/cpp/CppCond.hs
similarity index 100%
rename from plugins/hls-hlint-plugin/test/testdata/cpp/ApplyRefact3.hs
rename to plugins/hls-hlint-plugin/test/testdata/cpp/CppCond.hs
diff --git a/plugins/hls-hlint-plugin/test/testdata/cpp/ApplyRefact2.hs b/plugins/hls-hlint-plugin/test/testdata/cpp/CppHeader.hs
similarity index 69%
rename from plugins/hls-hlint-plugin/test/testdata/cpp/ApplyRefact2.hs
rename to plugins/hls-hlint-plugin/test/testdata/cpp/CppHeader.hs
index b25d6f77af..b4c3f9d69f 100644
--- a/plugins/hls-hlint-plugin/test/testdata/cpp/ApplyRefact2.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/cpp/CppHeader.hs
@@ -1,4 +1,4 @@
-module ApplyRefact2 where
+module CppHeader where
 
 #include "test.h"
 
diff --git a/plugins/hls-hlint-plugin/test/testdata/cpp/hie.yaml b/plugins/hls-hlint-plugin/test/testdata/cpp/hie.yaml
index a30ec3673d..845a503179 100644
--- a/plugins/hls-hlint-plugin/test/testdata/cpp/hie.yaml
+++ b/plugins/hls-hlint-plugin/test/testdata/cpp/hie.yaml
@@ -3,5 +3,5 @@ cradle:
     arguments:
       - "-XCPP"
       - "-DFLAG"
-      - "ApplyRefact3"
-      - "ApplyRefact2"
+      - "CppCond"
+      - "CppHeader"
diff --git a/plugins/hls-hlint-plugin/test/testdata/hie.yaml b/plugins/hls-hlint-plugin/test/testdata/hie.yaml
index 98942ebb69..28e1a7bbc1 100644
--- a/plugins/hls-hlint-plugin/test/testdata/hie.yaml
+++ b/plugins/hls-hlint-plugin/test/testdata/hie.yaml
@@ -3,9 +3,14 @@ cradle:
     arguments:
       - "-DFLAG"
       - "-Wno-unrecognised-pragmas"
-      - "ApplyRefact1"
-      - "ApplyRefact2"
-      - "ApplyRefact3"
-      - "ApplyRefact4"
-      - "ApplyRefact5"
-      - "ApplyRefact6"
+      - "Base"
+      - "Comments"
+      - "CppCond"
+      - "Generalise"
+      - "IgnoreAnn"
+      - "IgnoreAnnHlint"
+      - "LambdaCase"
+      - "TwoHints"
+      - "PatternKeyword"
+      - "StrictData"
+      - "TwoHintsAndComment"
diff --git a/plugins/hls-hlint-plugin/test/testdata/ignore/ApplyRefact.hs b/plugins/hls-hlint-plugin/test/testdata/ignore/CamelCase.hs
similarity index 56%
rename from plugins/hls-hlint-plugin/test/testdata/ignore/ApplyRefact.hs
rename to plugins/hls-hlint-plugin/test/testdata/ignore/CamelCase.hs
index 50ad6d05f5..29cc08f961 100644
--- a/plugins/hls-hlint-plugin/test/testdata/ignore/ApplyRefact.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/ignore/CamelCase.hs
@@ -1,4 +1,4 @@
-module ApplyRefact where
+module CamelCase where
 
 f = (1)
 
diff --git a/plugins/hls-hlint-plugin/test/testdata/ignore/hie.yaml b/plugins/hls-hlint-plugin/test/testdata/ignore/hie.yaml
index 2a9b3ee8dc..f792a84060 100644
--- a/plugins/hls-hlint-plugin/test/testdata/ignore/hie.yaml
+++ b/plugins/hls-hlint-plugin/test/testdata/ignore/hie.yaml
@@ -1,4 +1,4 @@
 cradle:
   direct:
     arguments:
-      - "ApplyRefact"
+      - "CamelCase"
diff --git a/plugins/hls-hlint-plugin/test/testdata/lambdacase/ApplyRefact1.hs b/plugins/hls-hlint-plugin/test/testdata/lambdacase/LambdaCase.hs
similarity index 65%
rename from plugins/hls-hlint-plugin/test/testdata/lambdacase/ApplyRefact1.hs
rename to plugins/hls-hlint-plugin/test/testdata/lambdacase/LambdaCase.hs
index b23fe74b05..555c764162 100644
--- a/plugins/hls-hlint-plugin/test/testdata/lambdacase/ApplyRefact1.hs
+++ b/plugins/hls-hlint-plugin/test/testdata/lambdacase/LambdaCase.hs
@@ -1,4 +1,4 @@
-module ApplyRefact1 where
+module LambdaCase where
 
 f = \case "true" -> (True)
           _ -> False
diff --git a/plugins/hls-hlint-plugin/test/testdata/lambdacase/hie.yaml b/plugins/hls-hlint-plugin/test/testdata/lambdacase/hie.yaml
index 645c4b4927..c9c69a13b5 100644
--- a/plugins/hls-hlint-plugin/test/testdata/lambdacase/hie.yaml
+++ b/plugins/hls-hlint-plugin/test/testdata/lambdacase/hie.yaml
@@ -2,4 +2,4 @@ cradle:
   direct:
     arguments:
       - "-XLambdaCase"
-      - "ApplyRefact1"
+      - "LambdaCase"
diff --git a/plugins/hls-hlint-plugin/test/testdata/typeapps/ApplyRefact1.hs b/plugins/hls-hlint-plugin/test/testdata/typeapps/ApplyRefact1.hs
deleted file mode 100644
index 78fa09aec4..0000000000
--- a/plugins/hls-hlint-plugin/test/testdata/typeapps/ApplyRefact1.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module ApplyRefact1 where
-
-a = (id @Int 1)
diff --git a/plugins/hls-hlint-plugin/test/testdata/typeapps/TypeApplication.hs b/plugins/hls-hlint-plugin/test/testdata/typeapps/TypeApplication.hs
new file mode 100644
index 0000000000..5fecd5cf6e
--- /dev/null
+++ b/plugins/hls-hlint-plugin/test/testdata/typeapps/TypeApplication.hs
@@ -0,0 +1,3 @@
+module TypeApplication where
+
+a = (id @Int 1)
diff --git a/plugins/hls-hlint-plugin/test/testdata/typeapps/hie.yaml b/plugins/hls-hlint-plugin/test/testdata/typeapps/hie.yaml
index 058382f9f0..17788bcb70 100644
--- a/plugins/hls-hlint-plugin/test/testdata/typeapps/hie.yaml
+++ b/plugins/hls-hlint-plugin/test/testdata/typeapps/hie.yaml
@@ -2,4 +2,4 @@ cradle:
   direct:
     arguments:
       - "-XTypeApplications"
-      - "ApplyRefact1"
+      - "TypeApplications"
diff --git a/plugins/hls-hlint-plugin/test/testdata/unusedext/UnusedExtension.hs b/plugins/hls-hlint-plugin/test/testdata/unusedext/UnusedExtension.hs
new file mode 100644
index 0000000000..f652e62f05
--- /dev/null
+++ b/plugins/hls-hlint-plugin/test/testdata/unusedext/UnusedExtension.hs
@@ -0,0 +1 @@
+{-# LANGUAGE BangPatterns #-}
diff --git a/plugins/hls-hlint-plugin/test/testdata/unusedext/hie.yaml b/plugins/hls-hlint-plugin/test/testdata/unusedext/hie.yaml
new file mode 100644
index 0000000000..5d6dfc5138
--- /dev/null
+++ b/plugins/hls-hlint-plugin/test/testdata/unusedext/hie.yaml
@@ -0,0 +1,4 @@
+cradle:
+  direct:
+    arguments:
+      - "UnusedExtension"
diff --git a/plugins/hls-splice-plugin/test/Main.hs b/plugins/hls-splice-plugin/test/Main.hs
index 23c187846c..1d0b2783a9 100644
--- a/plugins/hls-splice-plugin/test/Main.hs
+++ b/plugins/hls-splice-plugin/test/Main.hs
@@ -86,8 +86,8 @@ goldenTestWithEdit fp tc line col =
          { _start = Position 0 0
          , _end = Position (length lns + 1) 1
          }
-     waitForProgressDone -- cradle
-     waitForProgressDone
+     waitForAllProgressDone -- cradle
+     waitForAllProgressDone
      alt <- liftIO $ T.readFile (fp <.> "error.hs")
      void $ applyEdit doc $ TextEdit theRange alt
      changeDoc doc [TextDocumentContentChangeEvent (Just theRange) Nothing alt]