diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90c360998af..9abc2e2b485 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,10 +66,12 @@ jobs:
             command: bin/test.sh 'slow/testOnly -- tests.gradle.*'
             name: Gradle MacOS integration
             os: macOS-latest
+            java: "17"
           - type: sbt
             command: bin/test.sh 'slow/testOnly -- tests.sbt.*'
             name: Sbt integration
             os: ubuntu-latest
+            java: "17"
           - type: sbt-metals jdk8
             command: bin/test.sh sbt-metals/scripted
             name: Sbt-metals/scripted jdk8
@@ -79,52 +81,68 @@ jobs:
             command: bin/test.sh 'slow/testOnly -- tests.maven.*'
             name: Maven integration
             os: ubuntu-latest
+            java: "17"
           - type: gradle
             command: bin/test.sh 'slow/testOnly -- tests.gradle.*'
             name: Gradle integration
             os: ubuntu-latest
+            java: "17"
           - type: mill
             command: bin/test.sh 'slow/testOnly -- tests.mill.*'
             name: Mill integration
             os: ubuntu-latest
+            java: "17"
           - type: scalacli
             command: bin/test.sh 'slow/testOnly -- tests.scalacli.*'
             name: Scala CLI integration
             os: ubuntu-latest
+            java: "17"
           - type: feature
             command: bin/test.sh 'slow/testOnly -- tests.feature.*'
             name: LSP integration tests
             os: ubuntu-latest
+            java: "17"
           - type: cross
             command: sbt +cross/test
             name: Scala cross tests
             os: ubuntu-latest
+            java: "17"
           - type: mtags-java
             command: sbt javapc/test
             name: Scala javapc tests
             os: ubuntu-latest
+            java: "17"
           - type: cross-test-nightly
             command: sbt cross-test-latest-nightly
             name: Scala3 latest NIGHTLY cross test
             os: ubuntu-latest
+            java: "17"
+          - type: cross-test-2-11
+            command: sbt cross-test-2-11
+            name: Scala 2.11 cross tests
+            os: ubuntu-latest
+            java: "8"
           - type: scalafix
             command: sbt scalafixCheck docs/docusaurusCreateSite
             name: Scalafix and docs
             os: ubuntu-latest
+            java: "17"
           - type: scalafmt
             command: ./bin/scalafmt --test
             name: Formatting
             os: ubuntu-latest
+            java: "17"
           - type: MiMa
             command: sbt interfaces/mimaReportBinaryIssues
             name: MiMa
             os: ubuntu-latest
+            java: "17"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: "17"
+          java-version: ${{ matrix.java }}
           cache: 'sbt'
       - name: ${{ matrix.command }}
         run: ${{ matrix.command }}
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 842d3e13fb6..8b6a29938db 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -35,4 +35,10 @@ fileOverride {
   "glob:**/mtags*/**" {
     trailingCommas = never
   }
+  "glob:**/tests/cross/src/**" {
+    trailingCommas = never
+  }
+  "glob:**/mtest/**" {
+    trailingCommas = never
+  }
 }
diff --git a/build.sbt b/build.sbt
index caa8ff03879..0549d63f5c4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -152,6 +152,9 @@ commands ++= Seq(
         s
     }
   },
+  Command.command("cross-test-2-11") { s =>
+    crossTestDyn(s, V.scala211)
+  },
   Command.single("test-mtags-dyn") { (s, scalaV) =>
     crossTestDyn(s, scalaV)
   },
diff --git a/mtags/src/main/scala-2/scala/meta/internal/pc/SignatureHelpProvider.scala b/mtags/src/main/scala-2/scala/meta/internal/pc/SignatureHelpProvider.scala
index d87771e22a6..1f4e75a4565 100644
--- a/mtags/src/main/scala-2/scala/meta/internal/pc/SignatureHelpProvider.scala
+++ b/mtags/src/main/scala-2/scala/meta/internal/pc/SignatureHelpProvider.scala
@@ -475,6 +475,9 @@ class SignatureHelpProvider(val compiler: MetalsGlobal) {
           shortenedNames
         )
     }
+    if (activeSignature == null) {
+      activeSignature = 0
+    }
     val mainSignature = infos(activeSignature)
     val deduplicated = infos
       .filter { sig =>
diff --git a/tests/cross/src/main/scala/tests/BaseAutoImportsSuite.scala b/tests/cross/src/main/scala/tests/BaseAutoImportsSuite.scala
index 84f6cc59114..a58409e6767 100644
--- a/tests/cross/src/main/scala/tests/BaseAutoImportsSuite.scala
+++ b/tests/cross/src/main/scala/tests/BaseAutoImportsSuite.scala
@@ -18,14 +18,14 @@ trait BaseAutoImportsSuite extends BaseCodeActionSuite {
       name: String,
       original: String,
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit loc: Location): Unit =
     test(name) {
       val imports = getAutoImports(original, "A.scala")
       val obtained = imports.map(_.packageName()).mkString("\n")
       assertNoDiff(
         obtained,
-        getExpected(expected, compat, scalaVersion),
+        getExpected(expected, compat, scalaVersion)
       )
     }
 
@@ -35,7 +35,7 @@ trait BaseAutoImportsSuite extends BaseCodeActionSuite {
       expected: String,
       selection: Int = 0,
       filename: String = "A.scala",
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit
       loc: Location
   ): Unit =
@@ -46,7 +46,7 @@ trait BaseAutoImportsSuite extends BaseCodeActionSuite {
       original: String,
       expected: String,
       selection: Int = 0,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit
       loc: Location
   ): Unit =
@@ -56,7 +56,7 @@ trait BaseAutoImportsSuite extends BaseCodeActionSuite {
       original,
       expected,
       selection,
-      compat,
+      compat
     )
 
   def checkEditSelection(
@@ -65,7 +65,7 @@ trait BaseAutoImportsSuite extends BaseCodeActionSuite {
       original: String,
       expected: String,
       selection: Int,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit
       loc: Location
   ): Unit =
@@ -80,7 +80,7 @@ trait BaseAutoImportsSuite extends BaseCodeActionSuite {
 
   def getAutoImports(
       original: String,
-      filename: String,
+      filename: String
   ): List[AutoImportsResult] = {
     val (code, symbol, offset) = params(original)
     val result = presentationCompiler
@@ -90,9 +90,9 @@ trait BaseAutoImportsSuite extends BaseCodeActionSuite {
           Paths.get(filename).toUri(),
           code,
           offset,
-          cancelToken,
+          cancelToken
         ),
-        isExtensionMethods,
+        isExtensionMethods
       )
       .get()
     result.asScala.toList
diff --git a/tests/cross/src/main/scala/tests/BaseCompletionSuite.scala b/tests/cross/src/main/scala/tests/BaseCompletionSuite.scala
index e5a57ca640e..ea206c63371 100644
--- a/tests/cross/src/main/scala/tests/BaseCompletionSuite.scala
+++ b/tests/cross/src/main/scala/tests/BaseCompletionSuite.scala
@@ -36,7 +36,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
 
   private def getItems(
       original: String,
-      filename: String = "A.scala",
+      filename: String = "A.scala"
   ): Seq[CompletionItem] = {
     val (code, offset) = params(original, filename)
     val result = resolvedCompletions(
@@ -44,7 +44,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
         Paths.get(filename).toUri(),
         code,
         offset,
-        cancelToken,
+        cancelToken
       )
     )
     result.getItems.asScala
@@ -62,7 +62,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
   def checkItems(
       name: TestOptions,
       original: String,
-      fn: Seq[CompletionItem] => Boolean,
+      fn: Seq[CompletionItem] => Boolean
   )(implicit loc: Location): Unit = {
     test(name) { assert(fn(getItems(original))) }
   }
@@ -91,7 +91,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       assertSingleItem: Boolean = true,
       filter: String => Boolean = _ => true,
       command: Option[String] = None,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit loc: Location): Unit = {
     val compatTemplate = compat.map { case (key, value) =>
       key -> template.replace("___", value)
@@ -104,7 +104,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       assertSingleItem = assertSingleItem,
       filter = filter,
       command = command,
-      compat = compatTemplate,
+      compat = compatTemplate
     )
   }
 
@@ -131,7 +131,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       command: Option[String] = None,
       compat: Map[String, String] = Map.empty,
       itemIndex: Int = 0,
-      filename: String = "A.scala",
+      filename: String = "A.scala"
   )(implicit loc: Location): Unit = {
     test(name) {
       val items =
@@ -148,7 +148,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       val obtained = TextEdits.applyEdits(code, item)
       assertNoDiff(
         obtained,
-        getExpected(expected, compat, scalaVersion),
+        getExpected(expected, compat, scalaVersion)
       )
       if (filterText.nonEmpty) {
         assertNoDiff(item.getFilterText, filterText, "Invalid filter text")
@@ -156,7 +156,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       assertNoDiff(
         Option(item.getCommand).fold("")(_.getCommand),
         command.getOrElse(""),
-        "Invalid command",
+        "Invalid command"
       )
     }
   }
@@ -175,7 +175,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       expected: String,
       compat: Map[String, String] = Map.empty,
       topLines: Option[Int] = None,
-      includeDetail: Boolean = false,
+      includeDetail: Boolean = false
   )(implicit loc: Location): Unit = {
     test(name) {
       val baseItems = getItems(original)
@@ -196,7 +196,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
         .mkString("\n")
       assertNoDiff(
         obtained,
-        getExpected(expected, compat, scalaVersion),
+        getExpected(expected, compat, scalaVersion)
       )
     }
   }
@@ -235,7 +235,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       includeDetail: Boolean = true,
       filename: String = "A.scala",
       filter: String => Boolean = _ => true,
-      enablePackageWrap: Boolean = true,
+      enablePackageWrap: Boolean = true
   )(implicit loc: Location): Unit = {
     test(name) {
       val out = new StringBuilder()
@@ -280,19 +280,19 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       assertNoDiff(
         sortLines(
           stableOrder,
-          postProcessObtained(trimTrailingSpace(out.toString())),
+          postProcessObtained(trimTrailingSpace(out.toString()))
         ),
         sortLines(
           stableOrder,
-          getExpected(expected, compat, scalaVersion),
-        ),
+          getExpected(expected, compat, scalaVersion)
+        )
       )
       if (filterText.nonEmpty) {
         filteredItems.foreach { item =>
           assertNoDiff(
             item.getFilterText,
             filterText,
-            s"Invalid filter text for item:\n$item",
+            s"Invalid filter text for item:\n$item"
           )
         }
       }
@@ -310,7 +310,7 @@ abstract class BaseCompletionSuite extends BasePCSuite {
       s.replace("equals(obj: Any)", "equals(obj: Object)")
         .replace(
           "singletonList[T](o: T)",
-          "singletonList[T <: Object](o: T)",
+          "singletonList[T <: Object](o: T)"
         )
     }
   )
diff --git a/tests/cross/src/main/scala/tests/BaseDocumentHighlightSuite.scala b/tests/cross/src/main/scala/tests/BaseDocumentHighlightSuite.scala
index 5cd140dfacb..bbc82345aa2 100644
--- a/tests/cross/src/main/scala/tests/BaseDocumentHighlightSuite.scala
+++ b/tests/cross/src/main/scala/tests/BaseDocumentHighlightSuite.scala
@@ -14,8 +14,8 @@ class BaseDocumentHighlightSuite extends BasePCSuite with RangeReplace {
 
   def check(
       name: TestOptions,
-      original: String,
-      //   compat: Map[String, String] = Map.empty,
+      original: String
+      //   compat: Map[String, String] = Map.empty
   )(implicit location: Location): Unit =
     test(name) {
 
@@ -30,7 +30,7 @@ class BaseDocumentHighlightSuite extends BasePCSuite with RangeReplace {
             URI.create("file:/Highlight.scala"),
             code,
             offset,
-            EmptyCancelToken,
+            EmptyCancelToken
           )
         )
         .get()
@@ -41,13 +41,13 @@ class BaseDocumentHighlightSuite extends BasePCSuite with RangeReplace {
 
       assertEquals(
         renderHighlightsAsString(base, highlights),
-        expected,
+        expected
       )
 
     }
   private def compareHighlights(
       h1: DocumentHighlight,
-      h2: DocumentHighlight,
+      h2: DocumentHighlight
   ) = {
     val r1 = h1.getRange().getStart()
     val r2 = h2.getRange().getStart()
diff --git a/tests/cross/src/main/scala/tests/BaseExtractMethodSuite.scala b/tests/cross/src/main/scala/tests/BaseExtractMethodSuite.scala
index b82d2b95381..480bc0125f1 100644
--- a/tests/cross/src/main/scala/tests/BaseExtractMethodSuite.scala
+++ b/tests/cross/src/main/scala/tests/BaseExtractMethodSuite.scala
@@ -17,7 +17,7 @@ class BaseExtractMethodSuite extends BaseCodeActionSuite {
       name: TestOptions,
       original: String,
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit location: Location): Unit =
     test(name) {
       val (edits, code) = getAutoImplement(original)
@@ -27,7 +27,7 @@ class BaseExtractMethodSuite extends BaseCodeActionSuite {
 
   def getAutoImplement(
       original: String,
-      filename: String = "file:/A.scala",
+      filename: String = "file:/A.scala"
   ): (List[l.TextEdit], String) = {
     val withoutExtractionPos = original.replace("@@", "")
     val onlyRangeClose = withoutExtractionPos
@@ -37,19 +37,19 @@ class BaseExtractMethodSuite extends BaseCodeActionSuite {
       URI.create(filename),
       code,
       original.indexOf("@@"),
-      cancelToken,
+      cancelToken
     )
     val rangeParams = CompilerRangeParams(
       URI.create(filename),
       code,
       withoutExtractionPos.indexOf("<<"),
       onlyRangeClose.indexOf(">>"),
-      cancelToken,
+      cancelToken
     )
     val result = presentationCompiler
       .extractMethod(
         rangeParams,
-        extractionPos,
+        extractionPos
       )
       .get()
     (result.asScala.toList, code)
diff --git a/tests/cross/src/main/scala/tests/BasePCSuite.scala b/tests/cross/src/main/scala/tests/BasePCSuite.scala
index 6a456137638..daa4a47895b 100644
--- a/tests/cross/src/main/scala/tests/BasePCSuite.scala
+++ b/tests/cross/src/main/scala/tests/BasePCSuite.scala
@@ -98,7 +98,7 @@ abstract class BasePCSuite extends BaseSuite with PCSuite {
 
   private def indexScalaLibrary(
       index: GlobalSymbolIndex,
-      scalaVersion: String,
+      scalaVersion: String
   ): Unit = {
     val libDependency =
       Dependency.of(
@@ -112,7 +112,7 @@ abstract class BasePCSuite extends BaseSuite with PCSuite {
           case v if isScala3Version(v) => BuildInfoVersions.scala213
           case v if v.startsWith("2.12") => v
           case _ => BuildInfoVersions.scala212
-        },
+        }
       )
     val deps = if (isScala3Version(scalaVersion)) {
       Seq(
@@ -120,8 +120,8 @@ abstract class BasePCSuite extends BaseSuite with PCSuite {
         Dependency.of(
           "org.scala-lang",
           "scala3-library_3",
-          scalaVersion,
-        ),
+          scalaVersion
+        )
       )
     } else {
       Seq(libDependency)
@@ -158,7 +158,7 @@ abstract class BasePCSuite extends BaseSuite with PCSuite {
         "Append Scala version",
         { test =>
           test.withName(test.name + "_" + scalaVersion)
-        },
+        }
       ),
       new TestTransform(
         "Ignore Scala version",
@@ -171,7 +171,7 @@ abstract class BasePCSuite extends BaseSuite with PCSuite {
           if (isIgnoredScalaVersion)
             test.withTags(test.tags + munit.Ignore)
           else test
-        },
+        }
       ),
       new TestTransform(
         "Run for Scala version",
@@ -184,18 +184,18 @@ abstract class BasePCSuite extends BaseSuite with PCSuite {
             }
             .getOrElse(test)
 
-        },
-      ),
+        }
+      )
     )
 
   override def params(
       code: String,
-      filename: String = "test.scala",
+      filename: String = "test.scala"
   ): (String, Int) = super.params(code, filename)
 
   override def hoverParams(
       code: String,
-      filename: String = "test.scala",
+      filename: String = "test.scala"
   ): (String, Int, Int) = super.hoverParams(code, filename)
 
   def doc(e: JEither[String, MarkupContent]): String = {
@@ -267,6 +267,8 @@ abstract class BasePCSuite extends BaseSuite with PCSuite {
 
   object IgnoreScala212 extends IgnoreScalaVersion(_.startsWith("2.12"))
 
+  object IgnoreScala211 extends IgnoreScalaVersion(_.startsWith("2.11"))
+
   object IgnoreScala3 extends IgnoreScalaVersion(_.startsWith("3."))
 
   val IgnoreForScala3CompilerPC: IgnoreScalaVersion =
diff --git a/tests/cross/src/main/scala/tests/BasePcRenameSuite.scala b/tests/cross/src/main/scala/tests/BasePcRenameSuite.scala
index 84743c9be98..23afbcedbcd 100644
--- a/tests/cross/src/main/scala/tests/BasePcRenameSuite.scala
+++ b/tests/cross/src/main/scala/tests/BasePcRenameSuite.scala
@@ -17,7 +17,7 @@ class BasePcRenameSuite extends BasePCSuite with RangeReplace {
       methodBody: String,
       newName: String = "newName",
       filename: String = "A.scala",
-      wrap: Boolean = true,
+      wrap: Boolean = true
   )(implicit location: Location): Unit =
     test(name) {
       val original =
@@ -41,9 +41,9 @@ class BasePcRenameSuite extends BasePCSuite with RangeReplace {
             URI.create(s"file:/$filename"),
             code,
             offset,
-            EmptyCancelToken,
+            EmptyCancelToken
           ),
-          newName,
+          newName
         )
         .get()
         .asScala
@@ -51,7 +51,7 @@ class BasePcRenameSuite extends BasePCSuite with RangeReplace {
 
       assertEquals(
         TextEdits.applyEdits(base, renames),
-        expected,
+        expected
       )
 
     }
@@ -59,7 +59,7 @@ class BasePcRenameSuite extends BasePCSuite with RangeReplace {
   def prepare(
       name: TestOptions,
       input: String,
-      filename: String = "A.scala",
+      filename: String = "A.scala"
   ): Unit = {
     test(name) {
       val edit = input.replaceAll("(<<|>>)", "")
@@ -73,7 +73,7 @@ class BasePcRenameSuite extends BasePCSuite with RangeReplace {
             URI.create(s"file:/$filename"),
             code,
             offset,
-            EmptyCancelToken,
+            EmptyCancelToken
           )
         )
         .get()
@@ -82,7 +82,7 @@ class BasePcRenameSuite extends BasePCSuite with RangeReplace {
         if (!range.isPresent()) base else replaceInRange(base, range.get())
       assertNoDiff(
         withRange,
-        expected,
+        expected
       )
     }
   }
diff --git a/tests/cross/src/main/scala/tests/BaseSemanticTokensSuite.scala b/tests/cross/src/main/scala/tests/BaseSemanticTokensSuite.scala
index f298b1ba84f..213af980e0c 100644
--- a/tests/cross/src/main/scala/tests/BaseSemanticTokensSuite.scala
+++ b/tests/cross/src/main/scala/tests/BaseSemanticTokensSuite.scala
@@ -15,7 +15,7 @@ class BaseSemanticTokensSuite extends BasePCSuite {
   def check(
       name: TestOptions,
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit location: Location): Unit =
     test(name) {
       val base =
@@ -30,11 +30,11 @@ class BaseSemanticTokensSuite extends BasePCSuite {
 
       val obtained = TestSemanticTokens.pcSemanticString(
         base,
-        nodes.asScala.toList,
+        nodes.asScala.toList
       )
       assertEquals(
         obtained,
-        getExpected(expected, compat, scalaVersion),
+        getExpected(expected, compat, scalaVersion)
       )
 
     }
diff --git a/tests/cross/src/main/scala/tests/BaseSignatureHelpSuite.scala b/tests/cross/src/main/scala/tests/BaseSignatureHelpSuite.scala
index aef31c9aa69..058af0ea91f 100644
--- a/tests/cross/src/main/scala/tests/BaseSignatureHelpSuite.scala
+++ b/tests/cross/src/main/scala/tests/BaseSignatureHelpSuite.scala
@@ -14,7 +14,7 @@ abstract class BaseSignatureHelpSuite extends BasePCSuite {
       name: TestOptions,
       code: String,
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit loc: Location): Unit = {
     check(name, code, expected, includeDocs = true, compat = compat)
   }
@@ -24,7 +24,7 @@ abstract class BaseSignatureHelpSuite extends BasePCSuite {
       expected: String,
       includeDocs: Boolean = false,
       compat: Map[String, String] = Map.empty,
-      stableOrder: Boolean = true,
+      stableOrder: Boolean = true
   )(implicit loc: Location): Unit = {
     test(name) {
       val pkg = scala.meta.Term.Name(name.name).syntax
@@ -98,8 +98,8 @@ abstract class BaseSignatureHelpSuite extends BasePCSuite {
         sortLines(stableOrder, out.toString()),
         sortLines(
           stableOrder,
-          getExpected(expected, compat, scalaVersion),
-        ),
+          getExpected(expected, compat, scalaVersion)
+        )
       )
     }
   }
diff --git a/tests/cross/src/main/scala/tests/pc/BaseHoverSuite.scala b/tests/cross/src/main/scala/tests/pc/BaseHoverSuite.scala
index 916d308d35d..602f4f83f76 100644
--- a/tests/cross/src/main/scala/tests/pc/BaseHoverSuite.scala
+++ b/tests/cross/src/main/scala/tests/pc/BaseHoverSuite.scala
@@ -24,7 +24,7 @@ abstract class BaseHoverSuite
       expected: String,
       includeRange: Boolean = false,
       automaticPackage: Boolean = true,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit loc: Location): Unit = {
     test(testOpt) {
       val filename = "Hover.scala"
@@ -50,7 +50,7 @@ abstract class BaseHoverSuite
       val obtained: String = renderAsString(code, hover, includeRange)
       assertNoDiff(
         obtained,
-        getExpected(expected, compat, scalaVersion),
+        getExpected(expected, compat, scalaVersion)
       )
       for {
         h <- hover
@@ -65,7 +65,7 @@ abstract class BaseHoverSuite
             .replace("@@", "")
             .replace("%<%", "")
             .replace("%>%", ""),
-          "Invalid range",
+          "Invalid range"
         )
       }
     }
@@ -75,7 +75,7 @@ abstract class BaseHoverSuite
     "2.13" -> { s =>
       s.replace(
         "def map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That",
-        "def map[B](f: Int => B): List[B]",
+        "def map[B](f: Int => B): List[B]"
       )
     }
   )
diff --git a/tests/cross/src/main/scala/tests/pc/BasePcDefinitionSuite.scala b/tests/cross/src/main/scala/tests/pc/BasePcDefinitionSuite.scala
index 07edb834d94..c1b33ac46a9 100644
--- a/tests/cross/src/main/scala/tests/pc/BasePcDefinitionSuite.scala
+++ b/tests/cross/src/main/scala/tests/pc/BasePcDefinitionSuite.scala
@@ -21,7 +21,7 @@ abstract class BasePcDefinitionSuite extends BasePCSuite {
   def check(
       options: TestOptions,
       original: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit loc: Location): Unit = {
     test(options) {
       val filename = "A.scala"
@@ -43,17 +43,17 @@ abstract class BasePcDefinitionSuite extends BasePCSuite {
             new TextEdit(
               new l.Range(
                 location.getRange().getStart(),
-                location.getRange().getStart(),
+                location.getRange().getStart()
               ),
-              "<<",
+              "<<"
             ),
             new TextEdit(
               new l.Range(
                 location.getRange().getEnd(),
-                location.getRange().getEnd(),
+                location.getRange().getEnd()
               ),
-              ">>",
-            ),
+              ">>"
+            )
           )
         } else {
           val filename = location.getUri()
@@ -65,7 +65,7 @@ abstract class BasePcDefinitionSuite extends BasePCSuite {
       val expected = getExpected(original, compat, scalaVersion).removePos
       assertNoDiff(
         obtained,
-        expected,
+        expected
       )
     }
   }
diff --git a/tests/cross/src/main/scala/tests/pc/BaseSelectionRangeSuite.scala b/tests/cross/src/main/scala/tests/pc/BaseSelectionRangeSuite.scala
index 71f977519d5..9851bfa6337 100644
--- a/tests/cross/src/main/scala/tests/pc/BaseSelectionRangeSuite.scala
+++ b/tests/cross/src/main/scala/tests/pc/BaseSelectionRangeSuite.scala
@@ -21,7 +21,7 @@ abstract class BaseSelectionRangeSuite extends BasePCSuite {
       name: TestOptions,
       original: String,
       expectedRanges: List[String],
-      compat: Map[String, List[String]] = Map.empty,
+      compat: Map[String, List[String]] = Map.empty
   ): Unit = {
     test(name) {
       val (code, offset) = params(original, "SelectionRange.scala")
@@ -30,7 +30,7 @@ abstract class BaseSelectionRangeSuite extends BasePCSuite {
           Paths.get("SelectionRange.scala").toUri(),
           code,
           offset,
-          EmptyCancelToken,
+          EmptyCancelToken
         )
       ).asJava
 
@@ -52,7 +52,7 @@ abstract class BaseSelectionRangeSuite extends BasePCSuite {
       assertSelectionRanges(
         selectionRanges.headOption,
         compatOrDefault(expectedRanges, compat, scalaVersion),
-        code,
+        code
       )
     }
   }
@@ -60,7 +60,7 @@ abstract class BaseSelectionRangeSuite extends BasePCSuite {
   private def assertSelectionRanges(
       range: Option[l.SelectionRange],
       expected: List[String],
-      original: String,
+      original: String
   ): Unit = {
     assert(range.nonEmpty)
     expected.headOption.foreach { expectedRange =>
@@ -72,7 +72,7 @@ abstract class BaseSelectionRangeSuite extends BasePCSuite {
 
   private def applyRanges(
       text: String,
-      selectionRange: l.SelectionRange,
+      selectionRange: l.SelectionRange
   ): String = {
     val input = Input.String(text)
 
diff --git a/tests/cross/src/test/scala/tests/highlight/DocumentHighlightSuite.scala b/tests/cross/src/test/scala/tests/highlight/DocumentHighlightSuite.scala
index bdae6d5ec0d..15f1a14f56d 100644
--- a/tests/cross/src/test/scala/tests/highlight/DocumentHighlightSuite.scala
+++ b/tests/cross/src/test/scala/tests/highlight/DocumentHighlightSuite.scala
@@ -9,7 +9,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """
       |object Main {
       |  Option(1).<<he@@ad>>
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -19,7 +19,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val <<abc>> = 123
       |  <<abc>>.toInt
       |  println(<<ab@@c>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
   check(
     "multiple2",
@@ -28,7 +28,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val <<a@@bc>> = 123
       |  <<abc>>.toInt
       |  println(<<abc>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -38,7 +38,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val <<abc>> = 123
       |  <<ab@@c>>.toInt
       |  println(<<abc>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -48,7 +48,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val abc = 123
       |  abc.<<to@@Int>>
       |  134l.toInt
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -61,7 +61,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |    <<ba@@r>> = 456
       |  ) 
       |
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -76,11 +76,11 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val y = x.<<foo>>
       |  
       |
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
-    "named-args2",
+    "named-args2".tag(IgnoreScala211),
     """
       |object Main {
       |  def foo = check("abc")(
@@ -93,11 +93,11 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |    <<filename>>: Int,
       |    otherDefault: String = "default"
       |  ): Unit = ()
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
-    "named-args2",
+    "named-args2".tag(IgnoreScala211),
     """
       |object Main {
       |  def foo = check("abc")(
@@ -110,7 +110,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |    <<filename>>: Int,
       |    otherDefault: String = "default"
       |  ): Unit = ()
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -129,7 +129,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      <<fil@@ename>>: Int,
       |      otherDefault: String = "default"
       |  )(loc: Boolean): Unit = ()
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -139,7 +139,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val <<@@a>> = 123
       |  val f = (a: Int) => a + 1
       |  println(<<a>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -149,7 +149,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val <<a>> = 123
       |  val f = (a: Int) => a + 1
       |  println(<<@@a>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -160,7 +160,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val user = User(<<name>> = "Susan")
       |  println(user.<<name>>)
       |  user.copy(<<name>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -171,7 +171,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val user = User(<<na@@me>> = "Susan")
       |  println(user.<<name>>)
       |  user.copy(<<name>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -182,7 +182,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val user = User(<<name>> = "Susan")
       |  println(user.<<n@@ame>>)
       |  user.copy(<<name>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -193,7 +193,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val user = User(<<name>> = "Susan")
       |  println(user.<<name>>)
       |  user.copy(<<na@@me>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -205,7 +205,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val user = <<User>>(name = "Susan")
       |  println(user.name)
       |  user.copy(name = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -217,7 +217,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val user = <<User>>(name = "Susan")
       |  println(user.name)
       |  user.copy(name = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -229,7 +229,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val user = <<U@@ser>>(name = "Susan")
       |  println(user.name)
       |  user.copy(name = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -241,7 +241,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  println(user.<<name>>)
       |  user.<<name>> = ""
       |  user.copy(<<name>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -253,7 +253,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  println(user.<<name>>)
       |  user.<<name>> = ""
       |  user.copy(<<name>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -265,7 +265,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  println(user.<<n@@ame>>)
       |  user.<<name>> = ""
       |  user.copy(<<name>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -277,7 +277,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  println(user.<<name>>)
       |  user.<<na@@me>> = ""
       |  user.copy(<<name>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -289,7 +289,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  println(user.<<name>>)
       |  user.<<name>> = ""
       |  user.copy(<<na@@me>> = "John")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -300,7 +300,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  <<abd>> = 344
       |  <<abd>> +=1
       |  println(<<abd>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -311,7 +311,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  <<ab@@d>> = 344
       |  <<abd>> +=1
       |  println(<<abd>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -322,7 +322,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  <<abd>> = 344
       |  <<ab@@d>> +=1
       |  println(<<abd>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -333,7 +333,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  <<abd>> = 344
       |  <<abd>> +=1
       |  println(<<a@@bd>>)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -343,7 +343,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  def hello() = ""
       |  def <<hel@@lo>>(a : Int) = ""
       |  def hello(a : Int, b : String) = ""
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -360,7 +360,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -377,7 +377,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -394,7 +394,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -411,7 +411,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
   check(
     "local-assign2",
@@ -427,7 +427,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
   check(
     "local-assign3",
@@ -443,7 +443,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -460,7 +460,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -477,7 +477,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -494,7 +494,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |      def m2: Int = abc + 2
       |    }
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -507,7 +507,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  }
       |  val t = new T1
       |  t.<<arg>> = 123
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -521,7 +521,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  val t = new T1
       |  t.<<arg>> = 123
       |
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -534,7 +534,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  }
       |  val t = new T1
       |  t.<<ar@@g>> = 123
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -545,7 +545,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  def bar(<<n@@ame>>: String) = ???
       |  foo(name = "123")
       |  bar(<<name>> = "123")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -556,7 +556,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  def bar(<<name>>: String) = ???
       |  foo(name = "123")
       |  bar(<<na@@me>> = "123")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -567,7 +567,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  def bar(name: String) = ???
       |  foo(<<name>> = "123")
       |  bar(name = "123")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -578,7 +578,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |  def bar(name: String) = ???
       |  foo(<<na@@me>> = "123")
       |  bar(name = "123")
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -587,7 +587,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.util.<<Tr@@y>>
       |object Test {
       |   <<Try>>(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -596,7 +596,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.util.<<Try>>
       |object Test {
       |   <<Tr@@y>>(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -605,7 +605,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.<<ut@@il>>.Try
       |object Test {
       |   scala.<<util>>.Try(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -614,7 +614,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.<<util>>.Try
       |object Test {
       |   scala.<<ut@@il>>.Try(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -623,7 +623,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.util.{ <<Try>> => <<ATr@@y>>}
       |object Test {
       |   <<ATry>>(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -632,7 +632,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.util.{ <<Try>> => <<ATry>>}
       |object Test {
       |   <<ATr@@y>>(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   // @note, we could try and not highlight normal Try,
@@ -643,7 +643,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.util.{ <<Try>> => <<ATr@@y>>}
       |object Test {
       |   scala.util.<<Try>>(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -652,7 +652,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.util.{ <<Try>> => <<ATry>>}
       |object Test {
       |   scala.util.<<Tr@@y>>(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -661,7 +661,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |import scala.util.{ <<T@@ry>> => <<ATry>>}
       |object Test {
       |   scala.util.<<Try>>(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -674,7 +674,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |     case Success(<<va@@lue>>) =>
       |       <<value>>
       |   }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -687,7 +687,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |     case Success(<<value>>) =>
       |       <<va@@lue>>
       |   }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -698,7 +698,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    object <<User>>{ def nnn = ""}
        |    <<User>>.nnn
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -709,7 +709,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    object <<U@@ser>>{ def nnn = ""}
        |    <<User>>.nnn
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -720,7 +720,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    object <<User>>{ def nnn = ""}
        |    <<Use@@r>>.nnn
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -733,13 +733,13 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |      <<Use@@r>>.nnn
        |    }
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
     // Scala 2.12.x has a bug where the namePos points at `object`
     // working around it would involve a lot of additional logic
-    "package-object".tag(IgnoreScala212),
+    "package-object".tag(IgnoreScalaVersion.forLessThan("2.13.0")),
     """|package example
        |
        |package object <<nes@@ted>> {
@@ -747,7 +747,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  class PackageObjectNestedClass
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -757,7 +757,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |      case class User(<<name>>: String)
        |      val a = User(<<na@@me>> = "abc")
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -766,7 +766,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  val <<`hi-!`>> = 5
        |
        |  <<`hi@@-!`>> + 3
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -777,21 +777,21 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    <<a@@bc>> + 1
        |  }
        |  val d = abc + 1
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
     "select-parentheses",
     """|object Main {
        |  val a = (1 + 2 + 3).<<toStr@@ing>>
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
     "select-parentheses2".tag(IgnoreScala2),
     """|object Main {
        |  val a = (1 + 2 + 3) <<:@@:>> Nil
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -804,7 +804,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |    a,
       |    <<b@@>>,
       |  )
-      |}""".stripMargin,
+      |}""".stripMargin
   )
   check(
     "trailling-comma2".tag(IgnoreScala2),
@@ -816,7 +816,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |    a,
       |    <<`ab@@`>>,
       |  )
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -833,7 +833,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |    val x = foo + <<foo@@Bar>> + baz
       |    x
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -844,7 +844,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    a <- List(1)
        |  } yield a + 1
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -856,7 +856,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    if true
        |  } yield a + 1
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -867,7 +867,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    a <- List(1)
        |  } {}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -879,7 +879,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    if true
        |  } {}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -891,7 +891,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    if true
        |  } yield a + 1
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -904,7 +904,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    if true
        |  } yield a + 1
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -917,7 +917,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    b <- List(2)
        |  } yield a + 1
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -928,6 +928,6 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |    <<`ty@@pe`>> = "abc"
        |  )
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 }
diff --git a/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala b/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala
index 045f8c69fe1..5d2783efdd4 100644
--- a/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala
+++ b/tests/cross/src/test/scala/tests/highlight/Scala3DocumentHighlightSuite.scala
@@ -12,7 +12,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|enum FooEnum:
        | case <<Ba@@r>>, Baz
        |val bar = FooEnum.<<Bar>>
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -20,7 +20,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|enum FooEnum:
        | case <<Bar>>, Baz
        |val bar = FooEnum.<<Ba@@r>>
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -31,7 +31,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |transparent inline def <<foo>>(i: Int): Foo = new Bar
        |val iii = 123
        |val bar = <<f@@oo>>(iii)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -42,7 +42,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |transparent inline def <<f@@oo>>(i: Int): Foo = new Bar
        |val iii = 123
        |val bar = <<foo>>(iii)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -53,7 +53,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |transparent inline def foo(i: Int): Foo = new Bar
        |val <<ii@@i>> = 123
        |val bar = foo(<<iii>>)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -64,7 +64,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |transparent inline def foo(i: Int): Foo = new Bar
        |val <<iii>> = 123
        |val bar = foo(<<i@@ii>>)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -75,7 +75,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  else
        |    val y = <<power>>(x, n / 2)
        |    if n % 2 == 0 then y * y else y * y * x
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -86,7 +86,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  else
        |    val y = <<po@@wer>>(x, n / 2)
        |    if n % 2 == 0 then y * y else y * y * x
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -95,7 +95,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  def double = <<sbd>> + <<sbd>>
        |  def double2 = <<sbd>> + <<sbd>>
        |end extension
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -104,7 +104,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  def double = <<sb@@d>> + <<sbd>>
        |  def double2 = <<sbd>> + <<sbd>>
        |end extension
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -113,7 +113,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  def double = <<xs>> ++ <<xs>>
        |  def double2 = <<xs>> ++ <<xs>>
        |end extension
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -122,7 +122,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  def double = <<xs>> ++ <<xs>>
        |  def double2 = <<xs>> ++ <<x@@s>>
        |end extension
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -133,7 +133,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |
        |  val x = 1.<<foo@@bar>>()
        |  val y = (1: Int).<<foobar>>()
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -153,43 +153,43 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |      map.get(key) match
        |        case None        => Left(s"Missing ${key} in }")
        |        case Some(value) => Right(value)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
     "given-synthetic1",
     """|given (usi@@ng i: Int): Double = 4.0
-       |val a = given_Double""".stripMargin,
+       |val a = given_Double""".stripMargin
   )
 
   check(
     "given-synthetic2",
     """|given (using i: Int): Double = 4.0
-       |val a = <<given_Doub@@le>>""".stripMargin,
+       |val a = <<given_Doub@@le>>""".stripMargin
   )
 
   check(
     "given-synthetic3",
     """|given Int = 10
-       |val a = <<giv@@en_Int>>""".stripMargin,
+       |val a = <<giv@@en_Int>>""".stripMargin
   )
 
   check(
     "given-synthetic4",
     """|given <<I@@nt>> = 10
-       |val a = given_Int""".stripMargin,
+       |val a = given_Int""".stripMargin
   )
 
   check(
     "given-not-synthetic1",
     """|given <<`giv@@en_D`>>: Double = 4.0
-       |val a = <<`given_D`>>""".stripMargin,
+       |val a = <<`given_D`>>""".stripMargin
   )
 
   check(
     "given-not-synthetic2",
     """|given <<`given_D`>>:Double = 4.0
-       |val a = <<`giv@@en_D`>>""".stripMargin,
+       |val a = <<`giv@@en_D`>>""".stripMargin
   )
 
   check(
@@ -197,14 +197,14 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|extension [<<E@@F>>](xs: List[<<EF>>])
        |    def double(ys: List[<<EF>>]) = xs ++ ys
        |    def double2(ys: List[<<EF>>]) = xs ++ ys
-       |end extension""".stripMargin,
+       |end extension""".stripMargin
   )
 
   check(
     "extension-with-type-param2",
     """|extension [EF, <<E@@M>>](xs: Either[<<EM>>, EF])
        |    def id() = xs
-       |end extension""".stripMargin,
+       |end extension""".stripMargin
   )
 
   check(
@@ -212,7 +212,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|extension [<<EF>>](xs: List[<<E@@F>>])
        |    def double(ys: List[<<EF>>]) = xs ++ ys
        |    def double2(ys: List[<<EF>>]) = xs ++ ys
-       |end extension""".stripMargin,
+       |end extension""".stripMargin
   )
 
   check(
@@ -220,7 +220,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|val i: <<Int>> = 3
        |extension (xs: List[<<In@@t>>])
        |  def id() = xs
-       |end extension""".stripMargin,
+       |end extension""".stripMargin
   )
 
   check(
@@ -228,7 +228,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|extension [<<EF>>](xs: List[<<EF>>])
        |    def double(ys: List[<<E@@F>>]) = xs ++ ys
        |    def double2(ys: List[<<EF>>]) = xs ++ ys
-       |end extension""".stripMargin,
+       |end extension""".stripMargin
   )
 
   check(
@@ -236,7 +236,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|extension [EF](xs: List[EF])
        |    def double(<<y@@s>>: List[EF]) = xs ++ <<ys>>
        |    def double2(ys: List[EF]) = xs ++ ys
-       |end extension""".stripMargin,
+       |end extension""".stripMargin
   )
 
   check(
@@ -244,7 +244,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|extension [EF](<<xs>>: List[EF])
        |    def double(ys: List[EF]) = <<x@@s>> ++ ys
        |    def double2(ys: List[EF]) = <<xs>> ++ ys
-       |end extension""".stripMargin,
+       |end extension""".stripMargin
   )
 
   check(
@@ -254,7 +254,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  case MyNone
        |
        |val alpha = MyOption.<<MySome>>(1)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -264,7 +264,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  case MyNone
        |
        |val alpha = MyOption.<<MySome>>(1)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -272,7 +272,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|enum MyOption[+<<A@@A>>]:
        |  case MySome(value: <<AA>>)
        |  case MyNone
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -280,7 +280,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|enum MyOption[+<<AA>>]:
        |  case MySome(value: <<A@@A>>)
        |  case MyNone
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -288,7 +288,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|enum MyOption[<<AA>>](v: <<AA>>):
        |  def get: <<A@@A>> = ???
        |  case MySome[AA](value: AA) extends MyOption[Int](1)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -297,7 +297,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  def get: <<A@@A>> = ???
        |  case MySome(value: <<AA>>)
        |  case MyNone
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -305,7 +305,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|enum MyOption[AA]:
        |  def get: AA = ???
        |  case MySome[<<AA>>](value: <<A@@A>>) extends MyOption[Int]
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -316,7 +316,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |
        |val a = MyIntOut(1)
        |val m = a.<<un@@even>>
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -326,7 +326,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  extension (i: MyIntOut) def <<uneven>>(u: Int) = i.value % 2 == 1
        |
        |val a = MyIntOut(1).<<un@@even>>(3)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -336,7 +336,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  extension (i: MyIntOut) def <<++>>(u: Int) = i.value + u
        |
        |val a = MyIntOut(1) <<+@@+>> 3
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/highlight/SyntheticsDocumentHighlightSuite.scala b/tests/cross/src/test/scala/tests/highlight/SyntheticsDocumentHighlightSuite.scala
index 6d3d0aa8302..58b3d58a702 100644
--- a/tests/cross/src/test/scala/tests/highlight/SyntheticsDocumentHighlightSuite.scala
+++ b/tests/cross/src/test/scala/tests/highlight/SyntheticsDocumentHighlightSuite.scala
@@ -15,7 +15,7 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |} yield { 
       |   <<add>>.toString.toList.map(_.toChar)
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -29,7 +29,7 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |} yield { 
       |   <<ad@@d>>.toString.toList.map(_.toChar)
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -43,7 +43,7 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |} yield { 
       |   <<abc>>.toString.toList.map(_.toChar)
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -57,7 +57,7 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |} yield { 
       |   <<abc>>.toString.toList.map(_.toChar)
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -71,7 +71,7 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |} yield { 
       |   <<ab@@c>>.toString.toList.map(_.toChar)
       |  }
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/highlight/TypeDocumentHighlightSuite.scala b/tests/cross/src/test/scala/tests/highlight/TypeDocumentHighlightSuite.scala
index b300f5eb9ad..ec90816649c 100644
--- a/tests/cross/src/test/scala/tests/highlight/TypeDocumentHighlightSuite.scala
+++ b/tests/cross/src/test/scala/tests/highlight/TypeDocumentHighlightSuite.scala
@@ -10,7 +10,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type <<NotI@@nt>> = Int
       |  val set = Set.empty[<<NotInt>>]
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -19,7 +19,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type <<NotInt>> = Int
       |  val set = Set.empty[<<Not@@Int>>]
-      |}""".stripMargin,
+      |}""".stripMargin
   )
   check(
     "type3",
@@ -27,7 +27,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type NotInt = <<In@@t>>
       |  val set = Set.empty[<<Int>>]
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -36,7 +36,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type NotInt = <<Int>>
       |  val set = Set.empty[<<I@@nt>>]
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -45,7 +45,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  var bspSession: Option[<<Stri@@ng>>] =
       |    Option.empty[<<String>>]
-      |}""".stripMargin,
+      |}""".stripMargin
   )
   check(
     "type-in-def2",
@@ -53,7 +53,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  var bspSession: Option[<<String>>] =
       |    Option.empty[<<Stri@@ng>>]
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -62,7 +62,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  var bspSession: <<Op@@tion>>[String] =
       |    <<Option>>.empty[String]
-      |}""".stripMargin,
+      |}""".stripMargin
   )
   check(
     "type-in-def4",
@@ -70,7 +70,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  var bspSession: <<Option>>[String] =
       |    <<Opt@@ion>>.empty[String]
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -79,7 +79,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type A = List[_ <: <<It@@erable>>[Int]]
       |  val a : <<Iterable>>[Int] = ???
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -88,7 +88,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type A = List[_ <: <<Iterable>>[Int]]
       |  val a : <<Ite@@rable>>[Int] = ???
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -97,7 +97,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type A = List[_ <: scala.<<Enumerati@@on>>]
       |  val a : scala.<<Enumeration>> = ???
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -106,7 +106,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type A = List[_ <: scala.<<Enumeration>>]
       |  val a : scala.<<Enumer@@ation>> = ???
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -115,7 +115,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type A = List[_ <: Iterable[<<In@@t>>]]
       |  val a : Iterable[<<Int>>] = ???
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -124,7 +124,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |object Test {
       |  type A = List[_ <: Iterable[<<Int>>]]
       |  val a : Iterable[<<In@@t>>] = ???
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -136,7 +136,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |
       |  @<<deprecated>>(since = "1.23")
       |  val hello2 = 123
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -148,7 +148,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
       |
       |  @deprecated(<<si@@nce>> = "1.23")
       |  val hello2 = 123
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -159,7 +159,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  }
        |  object Test {
        |    val b1: A#<<BB>> = 12
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -170,7 +170,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  }
        |  object Test {
        |    val b1: A#<<B@@B>> = 12
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -178,7 +178,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|trait Zg[<<T@@T>>]{
        |  def doZ: List[<<TT>>]
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -186,7 +186,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
     """|trait Zg[<<TT>>]{
        |  def doZ: List[<<T@@T>>]
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -195,7 +195,7 @@ class TypeDocumentHighlightSuite extends BaseDocumentHighlightSuite {
        |  type <<!!>>[+T, -U] = Int
        |  def m(x: Int <<!@@!>> String) = ???
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/hover/HoverDefnSuite.scala b/tests/cross/src/test/scala/tests/hover/HoverDefnSuite.scala
index 64e8d2223e5..ce1eb2b4ac9 100644
--- a/tests/cross/src/test/scala/tests/hover/HoverDefnSuite.scala
+++ b/tests/cross/src/test/scala/tests/hover/HoverDefnSuite.scala
@@ -11,7 +11,7 @@ class HoverDefnSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|val x: List[Int]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -21,7 +21,7 @@ class HoverDefnSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|var x: List[Int]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -31,7 +31,7 @@ class HoverDefnSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|def x: List[Int]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -41,7 +41,7 @@ class HoverDefnSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|def method(x: Int): List[Int]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -51,7 +51,7 @@ class HoverDefnSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|def empty[T]: Option[T]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -60,7 +60,7 @@ class HoverDefnSuite extends BaseHoverSuite {
       |  <<def @@empty[T:Ordering] = Option.empty[T]>>
       |}
       |""".stripMargin,
-    "def empty[T: Ordering]: Option[T]".hover,
+    "def empty[T: Ordering]: Option[T]".hover
   )
 
   check(
@@ -72,7 +72,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     """|```scala
        |x: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -84,7 +84,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     """|```scala
        |x: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -96,7 +96,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     """|```scala
        |def this(x: Int): a
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -108,7 +108,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     """|```scala
        |x: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -120,7 +120,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     """|```scala
        |implicit x: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -132,7 +132,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     """|```scala
        |implicit x: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -142,7 +142,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     "object object.MyObject".hover,
     compat = Map(
       "3" -> "object MyObject: `object`".hover
-    ),
+    )
   )
 
   check(
@@ -152,14 +152,14 @@ class HoverDefnSuite extends BaseHoverSuite {
     "abstract trait MyTrait: MyTrait".hover,
     compat = Map(
       "3" -> "trait MyTrait: MyTrait".hover
-    ),
+    )
   )
 
   check(
     "class",
     """class <<M@@yClass>>
       |""".stripMargin,
-    "class MyClass: MyClass".hover,
+    "class MyClass: MyClass".hover
   )
 
   check(
@@ -167,7 +167,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     """|object a {
        |  type <<M@@yType>> = Int
        |}""".stripMargin,
-    "type MyType: MyType".hover,
+    "type MyType: MyType".hover
   )
 
   check(
@@ -183,7 +183,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     compat = Map(
       // TODO hover doesn't show information on package
       "3" -> "".hover
-    ),
+    )
   )
 
   check(
@@ -198,7 +198,7 @@ class HoverDefnSuite extends BaseHoverSuite {
     "head: Int".hover,
     compat = Map(
       "3" -> "val head: Int".hover
-    ),
+    )
   )
 
   check(
@@ -213,11 +213,11 @@ class HoverDefnSuite extends BaseHoverSuite {
     "value: Int".hover,
     compat = Map(
       "3" -> "val value: Int".hover
-    ),
+    )
   )
 
   check(
-    "val-int-literal".tag(IgnoreScala212),
+    "val-int-literal".tag(IgnoreScalaVersion.forLessThan("2.13.0")),
     """object a {
       |  <<val @@x : 1 = 1>>
       |}
@@ -225,10 +225,10 @@ class HoverDefnSuite extends BaseHoverSuite {
     """|val x: 1
        |""".stripMargin.hover,
     compat = Map(
-      "2.12" -> "",
-      "3" -> """|Int
-                |val x: 1""".stripMargin.hover,
-    ),
+      "3" ->
+        """|Int
+           |val x: 1""".stripMargin.hover
+    )
   )
 
   check(
@@ -237,7 +237,7 @@ class HoverDefnSuite extends BaseHoverSuite {
       |  <<val @@x : 1 | 2 = 1>>
       |}
       |""".stripMargin,
-    "val x: 1 | 2".hover,
+    "val x: 1 | 2".hover
   )
 
   check(
@@ -269,7 +269,7 @@ class HoverDefnSuite extends BaseHoverSuite {
            |val x: Option[T]
            |```
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -279,6 +279,6 @@ class HoverDefnSuite extends BaseHoverSuite {
        |  <<val foo@@ = 123>>
        |}
        |""".stripMargin,
-    "val foo: Int".hover,
+    "val foo: Int".hover
   )
 }
diff --git a/tests/cross/src/test/scala/tests/hover/HoverDocSuite.scala b/tests/cross/src/test/scala/tests/hover/HoverDocSuite.scala
index 49697523f08..a69bace85de 100644
--- a/tests/cross/src/test/scala/tests/hover/HoverDocSuite.scala
+++ b/tests/cross/src/test/scala/tests/hover/HoverDocSuite.scala
@@ -64,8 +64,8 @@ class HoverDocSuite extends BaseHoverSuite {
            |```
            |List<String> s = Collections.emptyList();
            |```
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -75,28 +75,27 @@ class HoverDocSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     // Assert that the docstring is extracted.
-
     """|```scala
-       |override def headOption: Option[Int]
+       |def headOption: Option[Int]
        |```
        |Optionally selects the first element.
-       | Note: might return different results for different runs, unless the underlying collection type is ordered.
+       | $orderDependent
        |
-       |**Returns:** the first element of this iterable collection if it is nonempty,
+       |**Returns:** the first element of this traversable collection if it is nonempty,
        |          `None` if it is empty.
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
+      ">=2.13.0" ->
         """|```scala
-           |def headOption: Option[Int]
+           |override def headOption: Option[Int]
            |```
            |Optionally selects the first element.
-           | $orderDependent
+           | Note: might return different results for different runs, unless the underlying collection type is ordered.
            |
-           |**Returns:** the first element of this traversable collection if it is nonempty,
+           |**Returns:** the first element of this iterable collection if it is nonempty,
            |          `None` if it is empty.
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -112,7 +111,7 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Converts a path string, or a sequence of strings that when joined form
        |a path string, to a `Path`.
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -134,7 +133,7 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Doc about object
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -159,11 +158,11 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Doc about method
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
-    "case-class",
+    "case-class".tag(IgnoreScala211),
     """|
        |/**
        |  * Doc about case class
@@ -190,11 +189,11 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Doc about method
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
-    "case-class1",
+    "case-class1".tag(IgnoreScala211),
     """|
        |/**
        |  * Doc about case class
@@ -218,11 +217,11 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Doc about object
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
-    "case-class2",
+    "case-class2".tag(IgnoreScala211),
     """|
        |/**
        |  * Doc about case class
@@ -243,7 +242,7 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Doc about case class
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -265,7 +264,7 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Doc about case class
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -290,7 +289,7 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Doc about class
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -315,7 +314,7 @@ class HoverDocSuite extends BaseHoverSuite {
            |val abc: Int
            |```
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -333,7 +332,7 @@ class HoverDocSuite extends BaseHoverSuite {
     """|```scala
        |val abc: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -350,7 +349,7 @@ class HoverDocSuite extends BaseHoverSuite {
     """|```scala
        |val abc: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -375,7 +374,7 @@ class HoverDocSuite extends BaseHoverSuite {
            |type T: T
            |```
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -393,7 +392,7 @@ class HoverDocSuite extends BaseHoverSuite {
     """|```scala
        |abc: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -411,7 +410,7 @@ class HoverDocSuite extends BaseHoverSuite {
     """|```scala
        |foo: Int
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -429,7 +428,7 @@ class HoverDocSuite extends BaseHoverSuite {
     """|```scala
        |T: T
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -450,7 +449,7 @@ class HoverDocSuite extends BaseHoverSuite {
        |```
        |Doc about class
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/hover/HoverErrorSuite.scala b/tests/cross/src/test/scala/tests/hover/HoverErrorSuite.scala
index e76fa1f61ac..1cef30e3742 100644
--- a/tests/cross/src/test/scala/tests/hover/HoverErrorSuite.scala
+++ b/tests/cross/src/test/scala/tests/hover/HoverErrorSuite.scala
@@ -11,7 +11,7 @@ class HoverErrorSuite extends BaseHoverSuite {
        |  def hello(<<a@@aa>>) : Int = ""
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -26,7 +26,7 @@ class HoverErrorSuite extends BaseHoverSuite {
        |  def <<ap@@ply>>(org: String) = Dependency(org, None, None)
        |}
        |""".stripMargin,
-    "".stripMargin,
+    "".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/hover/HoverNamedArgSuite.scala b/tests/cross/src/test/scala/tests/hover/HoverNamedArgSuite.scala
index 9585ae77959..403ed3a9b91 100644
--- a/tests/cross/src/test/scala/tests/hover/HoverNamedArgSuite.scala
+++ b/tests/cross/src/test/scala/tests/hover/HoverNamedArgSuite.scala
@@ -30,7 +30,7 @@ class HoverNamedArgSuite extends BaseHoverSuite {
            |named: Int
            |```
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -41,7 +41,7 @@ class HoverNamedArgSuite extends BaseHoverSuite {
       |  foo(nam@@ed = 2)
       |}
       |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -55,7 +55,7 @@ class HoverNamedArgSuite extends BaseHoverSuite {
     "",
     compat = Map(
       "3" -> "named: Int".hover
-    ),
+    )
   )
 
   check(
@@ -69,6 +69,6 @@ class HoverNamedArgSuite extends BaseHoverSuite {
     "def this(name: String, age: Int): User".hover,
     compat = Map(
       "3" -> "name: String".hover
-    ),
+    )
   )
 }
diff --git a/tests/cross/src/test/scala/tests/hover/HoverNegativeSuite.scala b/tests/cross/src/test/scala/tests/hover/HoverNegativeSuite.scala
index 9e6193f520d..15ec127167c 100644
--- a/tests/cross/src/test/scala/tests/hover/HoverNegativeSuite.scala
+++ b/tests/cross/src/test/scala/tests/hover/HoverNegativeSuite.scala
@@ -8,7 +8,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
   def checkNegative(
       name: String,
       original: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   ): Unit =
     check(name, original, expected = "", compat = compat)
 
@@ -20,7 +20,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
       |    List(y)
       |  }
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -29,7 +29,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
       |    @@
       |  def foo = 2
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -41,7 +41,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
       |    x
       |  }
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -49,7 +49,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """object a {
       |  v@@al x = 42
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -57,7 +57,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """obj@@ect a {
       |  val x = 42
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -65,7 +65,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """object a {
       |  ty@@pe Alpha = Int
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -73,7 +73,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """object a {
       |  val x =@@ 42
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -81,7 +81,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """object a {
       |  val x = 4@@2
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -89,7 +89,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """object a {
       |  val x = 4@@2d
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -97,7 +97,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """object a {
       |  val x = 4@@2f
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -105,7 +105,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """object a {
       |  val x = 4@@2L
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -113,7 +113,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
     """object a {
       |  val x = "Hel@@lo"
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkNegative(
@@ -122,7 +122,7 @@ class HoverNegativeSuite extends BaseHoverSuite {
       |  val name = "John"
       |  s"Hel@@lo $name"
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/hover/HoverScala3TypeSuite.scala b/tests/cross/src/test/scala/tests/hover/HoverScala3TypeSuite.scala
index 2c9889fd52d..9dca8761f8d 100644
--- a/tests/cross/src/test/scala/tests/hover/HoverScala3TypeSuite.scala
+++ b/tests/cross/src/test/scala/tests/hover/HoverScala3TypeSuite.scala
@@ -19,7 +19,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|val name: Foo | Bar[Files]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -38,7 +38,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|arg: Resettable & Growable[Files]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   // We should produce a shorter type but:
@@ -57,7 +57,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
       ">=3.1.3-RC1-bin-20220301-fae7c09-NIGHTLY" ->
         """|case Red: Color
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -69,7 +69,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |
        |""".stripMargin,
     """|enum Color: enums2.SimpleEnum
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -84,7 +84,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
       ">=3.1.3-RC1-bin-20220301-fae7c09-NIGHTLY" ->
         """|case Blue: Color
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -97,7 +97,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |
        |""".stripMargin,
     """|enum Color: enums3.SimpleEnum
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -112,7 +112,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |
        |""".stripMargin,
     """|case Green: Color
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -126,7 +126,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |    "".<<doub@@le2>>
        |end Foo
        |""".stripMargin,
-    "extension (s: String) def double2: String".hover,
+    "extension (s: String) def double2: String".hover
   )
 
   /* Currently there is no way to differentiate between
@@ -152,7 +152,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |    "".<<doub@@le(1)>>
        |end Foo
        |""".stripMargin,
-    "extension [T](using A)(s: T) def double(using B)[G <: Int](using C)(times: G): String".hover,
+    "extension [T](using A)(s: T) def double(using B)[G <: Int](using C)(times: G): String".hover
   )
 
   check(
@@ -172,7 +172,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |end Foo
        |""".stripMargin,
     """|Int
-       |extension [T](using A)(main: T) def %:[R](res: R)(using B)(using C): R""".stripMargin.hover,
+       |extension [T](using A)(main: T) def %:[R](res: R)(using B)(using C): R""".stripMargin.hover
   )
 
   check(
@@ -186,7 +186,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
       |""".stripMargin,
     """|String
        |def apply[T](a: T)(using Int): T
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -195,7 +195,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |""".stripMargin,
     """|Left[String, Nothing]
        |def apply[A, B](value: A): Left[A, B]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -207,7 +207,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |val foo2 = sel.fo@@o2
        |""".stripMargin,
     """|def foo2: Int
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -219,7 +219,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |val bar2 = sel.ba@@r2(3)
        |""".stripMargin,
     """|def bar2(x: Int): Int
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
   check(
     "selectable-full",
@@ -232,7 +232,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |val bar2 = sel.fo@@o2
        |""".stripMargin,
     """|def foo2: Int
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -258,7 +258,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |end StructuralTypes
        |""".stripMargin,
     """|def age: Int
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -284,7 +284,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |end StructuralTypes
        |""".stripMargin,
     """|def scalameta: String
-    """.stripMargin.hover,
+    """.stripMargin.hover
   )
 
   check(
@@ -303,7 +303,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |
        |""".stripMargin,
     """|type Ident: Ident
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -323,7 +323,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |
        |""".stripMargin,
     """|type Ident: Ident
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -334,7 +334,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |val bar = sel.foo.ba@@r
        |""".stripMargin,
     """|def bar: Int
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -351,7 +351,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |val k = node.child.ch@@ild
        |""".stripMargin,
     """|val child: Unit
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -362,7 +362,7 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |val bar = sel.foo.bar.dd@@d
        |""".stripMargin,
     """|val ddd: Int
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -374,6 +374,6 @@ class HoverScala3TypeSuite extends BaseHoverSuite {
        |val a = MyIntOut(1).un@@even
        |""".stripMargin,
     """|extension (i: MyIntOut) def uneven: Boolean
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 }
diff --git a/tests/cross/src/test/scala/tests/hover/HoverTermSuite.scala b/tests/cross/src/test/scala/tests/hover/HoverTermSuite.scala
index 41d921fb5d2..b3f264fc209 100644
--- a/tests/cross/src/test/scala/tests/hover/HoverTermSuite.scala
+++ b/tests/cross/src/test/scala/tests/hover/HoverTermSuite.scala
@@ -17,7 +17,7 @@ class HoverTermSuite extends BaseHoverSuite {
       "3" ->
         """|List[String]
            |override final def map[B](f: Int => B): List[B]""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -27,7 +27,7 @@ class HoverTermSuite extends BaseHoverSuite {
     "abstract trait App: App".hover,
     compat = Map(
       "3" -> "trait App: App".hover
-    ),
+    )
   )
 
   check(
@@ -46,8 +46,8 @@ class HoverTermSuite extends BaseHoverSuite {
            |""".stripMargin.hover,
       "3" ->
         """|List[Int]
-           |def apply[A](elems: A*): List[A]""".stripMargin.hover,
-    ),
+           |def apply[A](elems: A*): List[A]""".stripMargin.hover
+    )
   )
 
   check(
@@ -58,7 +58,7 @@ class HoverTermSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|def apply(name: String): Person
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -70,7 +70,7 @@ class HoverTermSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|val name: String
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -88,7 +88,7 @@ class HoverTermSuite extends BaseHoverSuite {
         """|String
            |def s(args: Any*): String = macro
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -105,7 +105,7 @@ class HoverTermSuite extends BaseHoverSuite {
        |""".stripMargin.hover,
     compat = Map(
       "3" -> "def f[A >: Any](args: A*): String".hover
-    ),
+    )
   )
 
   check(
@@ -123,7 +123,7 @@ class HoverTermSuite extends BaseHoverSuite {
       |""".stripMargin,
     """|Int
        |def apply[T](a: T)(implicit ev: Int): T
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -148,7 +148,7 @@ class HoverTermSuite extends BaseHoverSuite {
       "3" ->
         """|object num: `interpolator-unapply`.a.Xtension
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -160,7 +160,7 @@ class HoverTermSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|def this(name: String, age: Int): Foo
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -179,7 +179,7 @@ class HoverTermSuite extends BaseHoverSuite {
         """|Foo[Int]
            |def this[T](name: String, age: T): Foo[T]
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -195,7 +195,7 @@ class HoverTermSuite extends BaseHoverSuite {
        |""".stripMargin.hover,
     compat = Map(
       "3" -> "class Foo: Foo".hover
-    ),
+    )
   )
 
   check(
@@ -211,7 +211,7 @@ class HoverTermSuite extends BaseHoverSuite {
     "class Foo: Foo".hover,
     compat = Map(
       "3" -> "def this(name: String, age: Int): Foo".hover
-    ),
+    )
   )
 
   check(
@@ -225,7 +225,7 @@ class HoverTermSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|x: Int
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -247,7 +247,7 @@ class HoverTermSuite extends BaseHoverSuite {
         """|Option[Int]#WithFilter
            |final def withFilter(p: A => Boolean): Option.this.WithFilter
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -269,7 +269,7 @@ class HoverTermSuite extends BaseHoverSuite {
         """|Option[String]
            |final def map[B](f: A => B): Option[B]
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -285,7 +285,7 @@ class HoverTermSuite extends BaseHoverSuite {
       |""".stripMargin,
     """|Option[String]
        |def flatMap[B](f: Int => Option[B]): Option[B]
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -307,7 +307,7 @@ class HoverTermSuite extends BaseHoverSuite {
         """|Option[String]
            |final def map[B](f: A => B): Option[B]
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -328,7 +328,7 @@ class HoverTermSuite extends BaseHoverSuite {
         """|Option[Int]#WithFilter
            |final def withFilter(p: A => Boolean): Option.this.WithFilter
            """.stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -340,17 +340,17 @@ class HoverTermSuite extends BaseHoverSuite {
       |  } yield x
       |}
       |""".stripMargin,
-    """|override def headOption: Option[Int]
+    """|def headOption: Option[Int]
        |""".stripMargin.hover,
     compat = Map(
-      "2.12" ->
-        """|def headOption: Option[Int]
+      "2.13" ->
+        """|override def headOption: Option[Int]
            |""".stripMargin.hover,
       "3" ->
         """|Option[Int]
            |override def headOption: Option[A]
-           |""".stripMargin.hover,
-    ),
+           |""".stripMargin.hover
+    )
   )
 
   check(
@@ -369,7 +369,7 @@ class HoverTermSuite extends BaseHoverSuite {
       "3" ->
         """|enum FileVisitResult: java.nio.file
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -394,7 +394,7 @@ class HoverTermSuite extends BaseHoverSuite {
       "3" ->
         """|object Foo: app.Outer
            |""".stripMargin.hover
-    ),
+    )
   )
 
   check(
@@ -405,7 +405,7 @@ class HoverTermSuite extends BaseHoverSuite {
     """|```scala
        |package java.nio
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -416,7 +416,7 @@ class HoverTermSuite extends BaseHoverSuite {
     """|```scala
        |package java
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -427,7 +427,7 @@ class HoverTermSuite extends BaseHoverSuite {
     """|```scala
        |package java.nio.file
        |```
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -439,7 +439,7 @@ class HoverTermSuite extends BaseHoverSuite {
        |""".stripMargin.hover,
     compat = Map(
       "3" -> "object Files: java.nio.file".hover
-    ),
+    )
   )
 
   check(
@@ -451,7 +451,7 @@ class HoverTermSuite extends BaseHoverSuite {
        |""".stripMargin.hover,
     compat = Map(
       "3" -> "object Paths: java.nio.file".hover
-    ),
+    )
   )
 
   check(
@@ -462,7 +462,7 @@ class HoverTermSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|def stripSuffix(suffix: String): String
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -479,7 +479,7 @@ class HoverTermSuite extends BaseHoverSuite {
       |}
       |""".stripMargin,
     """|val number: Int
-       |""".stripMargin.hover,
+       |""".stripMargin.hover
   )
 
   check(
@@ -492,7 +492,7 @@ class HoverTermSuite extends BaseHoverSuite {
     """final val CONTINUE: FileVisitResult""".hover,
     compat = Map(
       "3" -> "case CONTINUE: FileVisitResult".hover
-    ),
+    )
   )
 
   check(
@@ -501,7 +501,7 @@ class HoverTermSuite extends BaseHoverSuite {
        |val (first, <<se@@cond>>) = (1, false)
        |""".stripMargin,
     "val second: Boolean".hover,
-    automaticPackage = false,
+    automaticPackage = false
   )
 
   check(
@@ -516,7 +516,7 @@ class HoverTermSuite extends BaseHoverSuite {
        |  }
        |}
        |""".stripMargin,
-    "def this(): tailrec".hover,
+    "def this(): tailrec".hover
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/hover/RangeHoverSuite.scala b/tests/cross/src/test/scala/tests/hover/RangeHoverSuite.scala
index 304a096a0a5..ec866e5f942 100644
--- a/tests/cross/src/test/scala/tests/hover/RangeHoverSuite.scala
+++ b/tests/cross/src/test/scala/tests/hover/RangeHoverSuite.scala
@@ -22,7 +22,7 @@ class RangeHoverSuite extends BaseHoverSuite {
        |}
        |""".stripMargin,
     """|Int
-       |def sum[B >: Int](implicit num: Numeric[B]): B""".stripMargin.hoverRange,
+       |def sum[B >: Int](implicit num: Numeric[B]): B""".stripMargin.hoverRange
   )
 
   check(
@@ -44,8 +44,8 @@ class RangeHoverSuite extends BaseHoverSuite {
            |def head: T""".stripMargin.hoverRange,
       "2.13" ->
         """|T
-           |def head: T""".stripMargin.hoverRange,
-    ),
+           |def head: T""".stripMargin.hoverRange
+    )
   )
 
   check(
@@ -66,7 +66,7 @@ class RangeHoverSuite extends BaseHoverSuite {
        |}
        |""".stripMargin,
     """|Int
-       |def sum[B >: Int](implicit num: Numeric[B]): B""".stripMargin.hoverRange,
+       |def sum[B >: Int](implicit num: Numeric[B]): B""".stripMargin.hoverRange
   )
 
   check(
@@ -86,13 +86,13 @@ class RangeHoverSuite extends BaseHoverSuite {
        |  }
        |}
        |""".stripMargin,
-    """|IndexedSeq[Int]
-       |override def flatMap[B](f: Int => IterableOnce[B]): IndexedSeq[B]""".stripMargin.hoverRange,
+    """|immutable.IndexedSeq[Int]
+       |def flatMap[B, That](f: Int => GenTraversableOnce[B])(implicit bf: CanBuildFrom[immutable.IndexedSeq[Int],B,That]): That""".stripMargin.hoverRange,
     compat = Map(
-      "2.12" ->
-        """|immutable.IndexedSeq[Int]
-           |def flatMap[B, That](f: Int => GenTraversableOnce[B])(implicit bf: CanBuildFrom[immutable.IndexedSeq[Int],B,That]): That""".stripMargin.hoverRange
-    ),
+      ">=2.13.0" ->
+        """|IndexedSeq[Int]
+           |override def flatMap[B](f: Int => IterableOnce[B]): IndexedSeq[B]""".stripMargin.hoverRange
+    )
   )
 
   check(
@@ -120,8 +120,8 @@ class RangeHoverSuite extends BaseHoverSuite {
            |def apply[A](elems: A*): List[A]""".stripMargin.hoverRange,
       "3" ->
         """|List[Int]
-           |def apply[A](elems: A*): List[A]""".stripMargin.hoverRange,
-    ),
+           |def apply[A](elems: A*): List[A]""".stripMargin.hoverRange
+    )
   )
 
   check(
@@ -142,7 +142,7 @@ class RangeHoverSuite extends BaseHoverSuite {
        |}
        |""".stripMargin,
     """|List[Int]
-       |val l: List[Int]""".stripMargin.hoverRange,
+       |val l: List[Int]""".stripMargin.hoverRange
   )
 
   check(
@@ -168,7 +168,7 @@ class RangeHoverSuite extends BaseHoverSuite {
     compat = Map(
       "3" -> """|Int
                 |def +(x: Int): Int""".stripMargin.hoverRange
-    ),
+    )
   )
 
   check(
@@ -185,7 +185,7 @@ class RangeHoverSuite extends BaseHoverSuite {
        |}
        |""".stripMargin,
     """|Int
-       |val x: Int""".stripMargin.hoverRange,
+       |val x: Int""".stripMargin.hoverRange
   )
 
   check(
@@ -202,7 +202,7 @@ class RangeHoverSuite extends BaseHoverSuite {
        |}
        |""".stripMargin,
     """|Int
-       |b: Int""".stripMargin.hoverRange,
+       |b: Int""".stripMargin.hoverRange
   )
 
   check(
@@ -223,7 +223,7 @@ class RangeHoverSuite extends BaseHoverSuite {
        |}
        |""".stripMargin,
     """|Int
-       |def sum[B >: Int](implicit num: Numeric[B]): B""".stripMargin.hoverRange,
+       |def sum[B >: Int](implicit num: Numeric[B]): B""".stripMargin.hoverRange
   )
 
   check(
@@ -244,7 +244,7 @@ class RangeHoverSuite extends BaseHoverSuite {
        |}
        |""".stripMargin,
     """|Int
-       |def sum[B >: Int](implicit num: Numeric[B]): B""".stripMargin.hoverRange,
+       |def sum[B >: Int](implicit num: Numeric[B]): B""".stripMargin.hoverRange
   )
 
   check(
@@ -256,7 +256,7 @@ class RangeHoverSuite extends BaseHoverSuite {
        |val bar = <<%<%foo(1)%>%>>
        |""".stripMargin,
     """|Bar
-       |inline transparent def foo(i: Int): Foo""".stripMargin.hoverRange,
+       |inline transparent def foo(i: Int): Foo""".stripMargin.hoverRange
   )
 
   check(
@@ -277,6 +277,6 @@ class RangeHoverSuite extends BaseHoverSuite {
        |val x = <<%<%fooOut(FooA1)%>%>>
        |""".stripMargin,
     """|A1.type
-       |def fooOut(f: Foo): f.Out""".stripMargin.hoverRange,
+       |def fooOut(f: Foo): f.Out""".stripMargin.hoverRange
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/AutoImplementAbstractMembersSuite.scala b/tests/cross/src/test/scala/tests/pc/AutoImplementAbstractMembersSuite.scala
index 8650f913005..b9d633fd620 100644
--- a/tests/cross/src/test/scala/tests/pc/AutoImplementAbstractMembersSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/AutoImplementAbstractMembersSuite.scala
@@ -41,7 +41,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -71,7 +71,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -126,7 +126,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
            |  }
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -153,7 +153,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -184,7 +184,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |    override def foo(x: Int): Int = x
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -214,7 +214,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -232,7 +232,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
       |
       |  }
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkEdit(
@@ -257,7 +257,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
       |
       |  }
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkEdit(
@@ -282,7 +282,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
       |
       |  }
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkEdit(
@@ -311,7 +311,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
       |
       |  }
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkEdit(
@@ -339,7 +339,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -370,7 +370,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -390,7 +390,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override def foo: ju.List[Int] = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -416,7 +416,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  val java = 42
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -435,7 +435,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override val baz: String = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -468,7 +468,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |       override def foo(x: Int): Int = x
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -503,7 +503,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |           val test = 1
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -538,7 +538,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |           type T = Int
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -569,7 +569,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |          def bar(x: String): Int = x
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -600,7 +600,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -633,7 +633,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |      def this() = { this(4) }
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -659,7 +659,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |      }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -681,7 +681,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override def foo(x: Int): Int = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -723,7 +723,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |   }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -749,7 +749,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |   }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -780,7 +780,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -813,7 +813,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -844,7 +844,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |	}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -874,7 +874,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |	}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -905,7 +905,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |    def foo(x: Int): Int = x
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -936,7 +936,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |    def foo(x: Int): Int = x
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -962,7 +962,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |
        |	def foo(x: Int): Int = x
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -990,7 +990,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  extension (x: Int) override def bar: String = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1018,7 +1018,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  extension (x: Int) override def bar: String = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1043,7 +1043,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override def bar(x: String): String = ???
        |
        |  def foo(x: Int): Int = x
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1069,7 +1069,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override def bar(x: String): String = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1093,7 +1093,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override def foo(x: Int): Int = ???
        |
        |  override def bar(x: String): String = ???
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1119,7 +1119,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override def method(node: N): String = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1151,7 +1151,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  extension (node: N) override def rightChild: F[Option[N]] = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1174,7 +1174,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override def foo[A](using mirror: ProductOf[A])(ordering: Ordering[mirror.MirroredElemTypes]): Unit = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1198,7 +1198,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  override def implementMe: Int = ???
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1233,7 +1233,7 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  end Concrete
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1268,14 +1268,14 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
        |  end Concrete
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   def checkEdit(
       name: TestOptions,
       original: String,
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit loc: Location): Unit =
     test(name) {
       val edits = getAutoImplement(original)
@@ -1284,13 +1284,13 @@ class AutoImplementAbstractMembersSuite extends BaseCodeActionSuite {
       val obtained = TextEdits.applyEdits(code, edits)
       assertNoDiff(
         obtained,
-        getExpected(expected, compat, scalaVersion),
+        getExpected(expected, compat, scalaVersion)
       )
     }
 
   def getAutoImplement(
       original: String,
-      filename: String = "A.scala",
+      filename: String = "A.scala"
   ): List[l.TextEdit] = {
     val (code, _, offset) = params(original)
     val result = presentationCompiler
diff --git a/tests/cross/src/test/scala/tests/pc/AutoImportExtensionMethodsSuite.scala b/tests/cross/src/test/scala/tests/pc/AutoImportExtensionMethodsSuite.scala
index a285dda68df..1885f30defc 100644
--- a/tests/cross/src/test/scala/tests/pc/AutoImportExtensionMethodsSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/AutoImportExtensionMethodsSuite.scala
@@ -16,7 +16,7 @@ class AutoImportExtensionMethodsSuite extends BaseAutoImportsSuite {
        |def main = 1.<<incr>>
        |""".stripMargin,
     """|A
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -31,6 +31,6 @@ class AutoImportExtensionMethodsSuite extends BaseAutoImportsSuite {
        |  extension (num: Int) def incr = ???
        |
        |def main = 1.incr
-       |""".stripMargin,
+       |""".stripMargin
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/AutoImportsIssueSuite.scala b/tests/cross/src/test/scala/tests/pc/AutoImportsIssueSuite.scala
index 32e6f830dfc..80ae9880266 100644
--- a/tests/cross/src/test/scala/tests/pc/AutoImportsIssueSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/AutoImportsIssueSuite.scala
@@ -5,6 +5,10 @@ import tests.BaseAutoImportsSuite
 
 class AutoImportsIssueSuite extends BaseAutoImportsSuite {
 
+  override protected def ignoreScalaVersion: Option[IgnoreScalaVersion] = Some(
+    IgnoreScala211
+  )
+
   override def extraDependencies(scalaVersion: String): Seq[Dependency] = {
     val binaryVersion =
       if (isScala3Version(scalaVersion)) "2.13"
@@ -14,7 +18,7 @@ class AutoImportsIssueSuite extends BaseAutoImportsSuite {
       Dependency.of(
         "com.typesafe.akka",
         s"akka-actor-typed_$binaryVersion",
-        "2.6.13",
+        "2.6.13"
       )
     )
   }
@@ -33,7 +37,7 @@ class AutoImportsIssueSuite extends BaseAutoImportsSuite {
        |object Greeter {
        |  Address("http", "Test", "TestNodeHostName", 1234)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/AutoImportsSuite.scala b/tests/cross/src/test/scala/tests/pc/AutoImportsSuite.scala
index 6a984bb7718..34a5b817f9d 100644
--- a/tests/cross/src/test/scala/tests/pc/AutoImportsSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/AutoImportsSuite.scala
@@ -14,6 +14,13 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
     """|scala.concurrent
        |java.util.concurrent
        |""".stripMargin,
+    compat = Map(
+      "2.11" ->
+        """|scala.concurrent
+           |scala.concurrent.impl
+           |java.util.concurrent
+           |""".stripMargin
+    )
   )
 
   checkEdit(
@@ -31,7 +38,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  Future.successful(2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -52,7 +59,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  Future.successful(2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -71,7 +78,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  Future.successful(2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -94,7 +101,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |}
        |}
        |""".stripMargin,
-    filename = "A.sc.scala",
+    filename = "A.sc.scala"
   )
 
   checkEdit(
@@ -112,7 +119,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  val uuid = UUID.randomUUID()
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -130,7 +137,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  val uuid = UUID.randomUUID()
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -148,7 +155,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  val l : ju.Map[String, Int] = ???
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -167,7 +174,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |  val l = s"${mutable.Seq(2)}"
        |}
        |""".stripMargin,
-    selection = 1,
+    selection = 1
   )
 
   checkEdit(
@@ -185,7 +192,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  val l = s"${mutable.Seq(2)}"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -206,7 +213,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object Main{
        | val obj = ABC
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -224,7 +231,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |package object b {
        |  val l = s"${ListBuffer(2)}"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -246,7 +253,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  val l = s"${ListBuffer(2)}"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -271,7 +278,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  val l = s"${ListBuffer(2)}"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -287,7 +294,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
        |object A {
        |  import scala.concurrent.ExecutionContext.global
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkAmmoniteEdit(
@@ -302,7 +309,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
          |
          |val p: Path = ???
          |""".stripMargin
-    ),
+    )
   )
 
   checkAmmoniteEdit(
@@ -317,7 +324,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
         |import java.nio.file.Path
         |val p: Path = ???
         |""".stripMargin
-    ),
+    )
   )
 
   checkAmmoniteEdit(
@@ -340,7 +347,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
          |  }
          |}
          |""".stripMargin
-    ),
+    )
   )
 
   checkAmmoniteEdit(
@@ -357,7 +364,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
          |
          |val p: Path = ???
          |""".stripMargin
-    ),
+    )
   )
 
   private def ammoniteWrapper(code: String): String =
@@ -392,7 +399,7 @@ class AutoImportsSuite extends BaseAutoImportsSuite {
           |
           |object $keyword{ object ABC }
           |object Main{ val obj = ABC }
-          |""".stripMargin,
+          |""".stripMargin
     )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CancelCompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/CancelCompletionSuite.scala
index 4254be864f7..a4e93805766 100644
--- a/tests/cross/src/test/scala/tests/pc/CancelCompletionSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CancelCompletionSuite.scala
@@ -47,7 +47,7 @@ class CancelCompletionSuite extends BaseCompletionSuite {
       name: TestOptions,
       query: String,
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit loc: Location): Unit = {
     test(name) {
       val (code, offset) = params(query, "A.scala")
@@ -59,7 +59,7 @@ class CancelCompletionSuite extends BaseCompletionSuite {
               URI.create("file:///A.scala"),
               code,
               offset,
-              token,
+              token
             )
           )
           .get()
@@ -76,7 +76,7 @@ class CancelCompletionSuite extends BaseCompletionSuite {
             URI.create("file:///A.scala"),
             code,
             offset,
-            EmptyCancelToken,
+            EmptyCancelToken
           )
         )
         .get()
@@ -99,7 +99,7 @@ class CancelCompletionSuite extends BaseCompletionSuite {
     """.stripMargin,
     """|assert(assertion: Boolean): Unit
        |assert(assertion: Boolean, message: => Any): Unit
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   /**
@@ -133,7 +133,7 @@ class CancelCompletionSuite extends BaseCompletionSuite {
             uri,
             code,
             offset,
-            FreezeCancelToken,
+            FreezeCancelToken
           )
         )
         .get()
@@ -146,7 +146,7 @@ class CancelCompletionSuite extends BaseCompletionSuite {
           uri,
           code,
           offset,
-          EmptyCancelToken,
+          EmptyCancelToken
         )
       )
       .get()
diff --git a/tests/cross/src/test/scala/tests/pc/CompilerJobQueueSuite.scala b/tests/cross/src/test/scala/tests/pc/CompilerJobQueueSuite.scala
index 9c7edadfe20..77023db39a0 100644
--- a/tests/cross/src/test/scala/tests/pc/CompilerJobQueueSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompilerJobQueueSuite.scala
@@ -33,7 +33,7 @@ class CompilerJobQueueSuite extends BaseSuite {
       cancelled,
       () => {
         Thread.sleep(1000)
-      },
+      }
     )
     jobs.shutdown()
     assert(Try(cancelled.get).isFailure)
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala
index fd13a60cb8b..bbfdf45b7b1 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala
@@ -17,7 +17,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|assertion = : Boolean
        |Main arg
        |""".stripMargin,
-    topLines = Option(2),
+    topLines = Option(2)
   )
 
   check(
@@ -32,7 +32,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|banana = : String
        |tomato = : String
        |""".stripMargin,
-    topLines = Option(2),
+    topLines = Option(2)
   )
 
   check(
@@ -44,7 +44,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|message = : => Any
        |Main arg1
        |""".stripMargin,
-    topLines = Option(2),
+    topLines = Option(2)
   )
 
   checkEdit(
@@ -56,7 +56,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|object Main {
        |  assert(assertion = true, message = )
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -68,7 +68,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|message = : => Any
        |Main arg2
        |""".stripMargin,
-    topLines = Option(2),
+    topLines = Option(2)
   )
 
   def user: String =
@@ -92,7 +92,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |Main arg3
        |User arg3
        |""".stripMargin,
-    topLines = Option(4),
+    topLines = Option(4)
   )
 
   // We should get NamedArg `address` from args in scala3, and remove `address` from completion, but it doesn't appear.
@@ -121,8 +121,8 @@ class CompletionArgSuite extends BaseCompletionSuite {
         """|address = : String
            |age = : Int
            |followers = : Int
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -138,7 +138,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |Main arg5
        |User arg5
        |""".stripMargin,
-    topLines = Option(4),
+    topLines = Option(4)
   )
 
   check(
@@ -153,7 +153,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |age = : Int
        |followers = : Int
        |""".stripMargin,
-    topLines = Option(3),
+    topLines = Option(3)
   )
 
   check(
@@ -166,7 +166,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|x = : A
        |Main arg7
        |""".stripMargin,
-    topLines = Option(2),
+    topLines = Option(2)
   )
 
   check(
@@ -179,7 +179,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|suffix = : String
        |Main arg8
        |""".stripMargin,
-    topLines = Option(2),
+    topLines = Option(2)
   )
 
   // In scala3, we get NoSymbol for `until`, so we get no completions here.
@@ -198,7 +198,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|end = : Int
        |Main arg9
        |""".stripMargin,
-    topLines = Option(2),
+    topLines = Option(2)
   )
 
   check(
@@ -210,7 +210,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|address = : String
        |""".stripMargin,
-    topLines = Option(1),
+    topLines = Option(1)
   )
 
   check(
@@ -221,7 +221,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|banana = : Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -231,7 +231,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |  curry(bana@@)
         |}
         |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -241,11 +241,11 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     // assert that `evidence$1` is excluded.
-    "",
+    ""
   )
 
   check(
-    "default-args",
+    "default-args".tag(IgnoreScala211),
     """|object Main {
        |  def foo() = {
        |    def deployment(
@@ -259,11 +259,11 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|fst = : String
        |snd = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
-    "default-args2",
+    "default-args2".tag(IgnoreScala211),
     """|object Main {
        |  def deployment(
        |    fst: String,
@@ -275,11 +275,11 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|fst = : String
        |snd = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
-    "default-args3",
+    "default-args3".tag(IgnoreScala211),
     """|object Main {
        |  def deployment(str: String)(
        |    fst: String,
@@ -293,11 +293,11 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|fst = : String
        |snd = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
-    "default-args4",
+    "default-args4".tag(IgnoreScala211),
     """|object Main {
        |  def deployment(str: String)(opt: Option[Int])(
        |    fst: String,
@@ -311,13 +311,13 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|fst = : String
        |snd = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   // NOTE: In Scala 3.3.1 the tree for this test changed, which allowed easy fix
   // For previous Scala 3 versions it shows wrong completions
   check(
-    "default-args5",
+    "default-args5".tag(IgnoreScala211),
     """|object Main {
        |  def deployment(str: String)(opt: Option[Int] = None)(
        |    fst: String,
@@ -337,8 +337,8 @@ class CompletionArgSuite extends BaseCompletionSuite {
            |""".stripMargin,
       "2" ->
         """|opt = : Option[Int]
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -356,7 +356,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|fst = : String
        |snd = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   checkSnippet( // see: https://github.com/scalameta/metals/issues/2400
@@ -368,7 +368,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     """|$$foo = """.stripMargin,
-    topLines = Option(1),
+    topLines = Option(1)
   )
 
   // known issue: the second parameter with $ become | (returned from compiler)
@@ -389,7 +389,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
       "3" -> """|$$foo = 
                 |$$foo = ${1:???}, $$bar = ${2:???}
                 |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -402,7 +402,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|isResourceFile = : Boolean
        |isResourceFile = isLargeBanana : Boolean
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -417,7 +417,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |argument = : Int
        |argument = argument : Int
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   check(
@@ -432,7 +432,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |argument = : Int
        |argument = argument : Int
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   check(
@@ -452,7 +452,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |argument = number4 : Int
        |argument = number8 : Int
        |""".stripMargin,
-    topLines = Some(5),
+    topLines = Some(5)
   )
 
   check(
@@ -468,7 +468,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |`type` = number : Int
        |`type` = number2 : Int
        |""".stripMargin,
-    topLines = Some(5),
+    topLines = Some(5)
   )
 
   checkEditLine(
@@ -482,7 +482,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "foo(rele@@)",
-    "foo(relevant)",
+    "foo(relevant)"
   )
 
   checkEditLine(
@@ -495,7 +495,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "foo(auto@@)",
-    "foo(argument = ${1:number}, other = ${2:hello})",
+    "foo(argument = ${1:number}, other = ${2:hello})"
   )
 
   checkEditLine(
@@ -513,7 +513,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "foo(auto@@)",
-    "foo(animal = ${1:dog}, furniture = ${2:chair})",
+    "foo(animal = ${1:dog}, furniture = ${2:chair})"
   )
 
   checkEditLine(
@@ -527,7 +527,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "foo(auto@@)",
-    "foo(argument = ${1|???,argument,number|}, other = ${2:hello})",
+    "foo(argument = ${1|???,argument,number|}, other = ${2:hello})"
   )
 
   checkEditLine(
@@ -541,7 +541,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "foo(auto@@)",
-    "foo(argument = ${1:number}, other = ${2:???}, isTrue = ${3:???}, opt = ${4:???})",
+    "foo(argument = ${1:number}, other = ${2:???}, isTrue = ${3:???}, opt = ${4:???})"
   )
 
   checkEditLine(
@@ -559,7 +559,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     "foo(argument = ${1|???,list4,list3|}, other = ${2|???,list2,list1|})",
     compat = Map(
       "3" -> "foo(argument = ${1|???,list3,list4|}, other = ${2|???,list1,list2|})"
-    ),
+    )
   )
 
   checkEditLine(
@@ -575,7 +575,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     "f(a = ${1|???,str1,str|}, b = ${2|???,str1,str|}, `type` = ${3|???,str1,str|})",
     compat = Map(
       "3" -> "f(a = ${1|???,str,str1|}, b = ${2|???,str,str1|}, `type` = ${3|???,str,str1|})"
-    ),
+    )
   )
 
   check(
@@ -605,7 +605,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
            |argument2 = : Int
            |argument2 = x : Int
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -616,7 +616,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|x: Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -628,7 +628,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     """|xxx = : Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -643,7 +643,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     """|xxx = : Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -656,7 +656,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|arg1 = : (Context) ?=> Int
        |arg2 = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -668,7 +668,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|arg2 = : (Context) ?=> Int
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -680,11 +680,11 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|arg2 = : (Boolean, Context) ?=> (Int) ?=> String
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
-    "second-arg-first",
+    "second-arg-first".tag(IgnoreScala211),
     """|case class Test(
        |    testA: String,
        |    testB: Option[String],
@@ -699,7 +699,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|testA = : String
        |testC = : String
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -714,11 +714,11 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|foo = : Int
        |fooBar = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
-    "case-class-apply1",
+    "case-class-apply1".tag(IgnoreScala211),
     """|object Main {
        |  def m() = {
        |    case class A(foo: Int, fooBar: Int)
@@ -729,11 +729,11 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|foo = : Int
        |fooBar = : Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
-    "case-class-apply2",
+    "case-class-apply2".tag(IgnoreScala211),
     """|object Main {
        |  def m() = {
        |    case class A(foo: Int, fooBar: Int)
@@ -743,7 +743,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     """|fooBar = : Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -774,7 +774,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
            |fooBar = : Int
            |fooBar = a : Int
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -793,7 +793,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|fooBar = : Int
        |fooBar = a : Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -819,7 +819,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
            |fooBar = a : Int
            |""".stripMargin
     ),
-    topLines = Some(4),
+    topLines = Some(4)
   )
 
   check(
@@ -842,7 +842,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
            |value: Int
            |""".stripMargin
     ),
-    topLines = Some(4),
+    topLines = Some(4)
   )
   check(
     "overloaded",
@@ -855,7 +855,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|idd = : Option[Int]
        |inn = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -870,7 +870,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|aaa = : Int
        |assert(assertion: Boolean): Unit
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -885,7 +885,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|aaa = : Int
        |assert(assertion: Boolean): Unit
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -913,7 +913,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
            |abb = h : Int
            |""".stripMargin
     ),
-    topLines = Some(5),
+    topLines = Some(5)
   )
 
   check(
@@ -930,7 +930,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|aString = : String
        |anInt = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   // type of `myInstance` is resolved to `null` for Scala 2
@@ -950,7 +950,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|aString = : String
        |anInt = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -969,7 +969,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|aString = : String
        |anInt = : Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -985,7 +985,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|aaa = : Int
        |abb = : Option[Int]
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   // In Scala 2 first argument list needs to disambiguate between overloaded methods.
@@ -1000,7 +1000,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |abb = : Option[Int]
        |assert(assertion: Boolean): Unit
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   check(
@@ -1014,7 +1014,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |abb = : Option[Int]
        |assert(assertion: Boolean): Unit
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   // doesn't filter properly for Scala 2, since the filtering heuristic for matching methods
@@ -1035,7 +1035,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |abb = : Option[Int]
        |assert(assertion: Boolean): Unit
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   check(
@@ -1053,7 +1053,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |acc = : List[Int]
        |assert(assertion: Boolean): Unit
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   check(
@@ -1068,7 +1068,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |aaa = h : Int
        |abb = : Option[Int]
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   check(
@@ -1079,7 +1079,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|abb = : Option[Int]
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   // issue: https://github.com/scalameta/metals/issues/5407
@@ -1094,7 +1094,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
     """|aaa = : Int
        |abb = : Option[Int]
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -1104,7 +1104,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|x = : Int
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -1115,7 +1115,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|y = : Int
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -1125,7 +1125,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|x = : Int
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -1135,7 +1135,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|str = : String
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -1145,7 +1145,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|str = : String
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionBacktickSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionBacktickSuite.scala
index ca86dc96a96..67edab987ba 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionBacktickSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionBacktickSuite.scala
@@ -17,7 +17,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
     filterText = "type",
     compat = Map(
       "3" -> "type: Int"
-    ),
+    )
   )
 
   checkEdit(
@@ -32,7 +32,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
        |  Main.`type`
        |}
        |""".stripMargin,
-    filterText = "type",
+    filterText = "type"
   )
 
   check(
@@ -47,7 +47,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
     filterText = "hello world",
     compat = Map(
       "3" -> "hello world: Int"
-    ),
+    )
   )
 
   check(
@@ -62,7 +62,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
     filterText = "///",
     compat = Map(
       "3" -> "///: Int"
-    ),
+    )
   )
 
   check(
@@ -77,7 +77,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
     filterText = "type",
     compat = Map(
       "3" -> ""
-    ),
+    )
   )
 
   check(
@@ -91,7 +91,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
     // distinguish if the symbol was defined with backticks in source.
     """spaced: Int
       |""".stripMargin,
-    filterText = "",
+    filterText = ""
   )
 
   check(
@@ -104,7 +104,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
     // NOTE(olafur) expected output is empty because the source does not tokenize due to unclosed identifier.
     // It would be nice to fix this limitation down the road.
     "",
-    filter = _.contains("`type`"),
+    filter = _.contains("`type`")
   )
 
   // https://dotty.epfl.ch/docs/internals/syntax.html#soft-keywords
@@ -124,7 +124,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
           |  `$keyword`($$0)
           |}
           |""".stripMargin,
-      filter = _.contains("a: String"),
+      filter = _.contains("a: String")
     )
 
   checkEdit(
@@ -140,7 +140,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
        |  val a = Pos(1,2)
        |  val b = a.end
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -165,7 +165,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
            |  }
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -185,7 +185,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
        |  val a = "abc".end
        |}
        |""".stripMargin,
-    filter = _.contains("end: Char"),
+    filter = _.contains("end: Char")
   )
 
   checkEdit(
@@ -201,7 +201,7 @@ class CompletionBacktickSuite extends BaseCompletionSuite {
        |  val a = Pos(1,true)
        |  val b = a.`lazy`
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionCaseSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionCaseSuite.scala
index 590da997300..74f7719c571 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionCaseSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionCaseSuite.scala
@@ -14,6 +14,10 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       _parameterHintsCommand = paramHint
     )
 
+  override val compatProcess: Map[String, String => String] = Map(
+    "2.11" -> { (s: String) => s.replace("Some(value)", "Some(x)") }
+  )
+
   check(
     "empty",
     """
@@ -24,7 +28,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -66,7 +70,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
                 |case HasWings(e) => pkg
                 |case Seal => pkg
                 |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -79,7 +83,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -93,7 +97,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -107,7 +111,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -121,6 +125,11 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     """|case Left(value) => scala.util
        |case Right(value) => scala.util
        |""".stripMargin,
+    compat = Map(
+      "2.11" -> """|case Left(a) => scala.util
+                   |case Right(b) => scala.util
+                   |""".stripMargin
+    )
   )
 
   check(
@@ -134,11 +143,11 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case Failure(exception) => scala.util
        |case Success(value) => scala.util
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
-    "sealed-two",
+    "sealed-two".tag(IgnoreScala211),
     """
       |object Outer {
       |  sealed trait Adt
@@ -156,7 +165,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "3" -> "case Cls(a, b) => sealed-two.Outer"
-    ),
+    )
   )
 
   // TODO: `Left` has conflicting name in Scope, we should fix it so the result is the same as for scala 2
@@ -174,6 +183,11 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     """|case scala.util.Left(value) =>
        |case Right(value) => scala.util
        |""".stripMargin,
+    compat = Map(
+      "2.11" -> """|case scala.util.Left(a) =>
+                   |case Right(b) => scala.util
+                   |""".stripMargin
+    )
   )
 
   checkEdit(
@@ -194,7 +208,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |    case Failure(exception) => $0
       |  }
       |}""".stripMargin,
-    filter = _.contains("Failure"),
+    filter = _.contains("Failure")
   )
 
   checkEdit(
@@ -220,7 +234,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |    case Failure(exception) => $0
       |  }
       |}""".stripMargin,
-    filter = _.contains("Failure"),
+    filter = _.contains("Failure")
   )
 
   check(
@@ -234,7 +248,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -248,7 +262,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -261,7 +275,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |  }
       |}""".stripMargin,
     """|case (Int, Int) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -279,7 +293,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     compat = Map("3" -> """|case None => scala
                            |case Some(value) => scala
                            |case (exhaustive) Option (2 cases)
-                           |""".stripMargin),
+                           |""".stripMargin)
   )
 
   check(
@@ -293,7 +307,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -307,7 +321,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -325,7 +339,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     compat = Map("3" -> """|case None => scala
                            |case Some(value) => scala
                            |case (exhaustive) Option (2 cases)
-                           |""".stripMargin),
+                           |""".stripMargin)
   )
 
   check(
@@ -343,7 +357,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     compat = Map("3" -> """|case None => scala
                            |case Some(value) => scala
                            |case (exhaustive) Option (2 cases)
-                           |""".stripMargin),
+                           |""".stripMargin)
   )
 
   check(
@@ -357,7 +371,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -371,7 +385,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|case None => scala
        |case Some(value) => scala
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -382,15 +396,15 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |    cas@@
       |  }
       |}""".stripMargin,
-    """|case head :: next => scala.collection.immutable
+    """|case head :: tl => scala.collection.immutable
        |case Nil => scala.collection.immutable
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
-        """|case head :: tl => scala.collection.immutable
+      ">=2.13.0" ->
+        """|case head :: next => scala.collection.immutable
            |case Nil => scala.collection.immutable
            |""".stripMargin
-    ),
+    )
   )
 
   checkEditLine(
@@ -403,7 +417,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     "List(1 -> 2).map { c@@ }",
     "List(1 -> 2).map { case ($0) => }",
     assertSingleItem = false,
-    command = paramHint,
+    command = paramHint
   )
 
   check(
@@ -415,7 +429,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|case (Int, Int) => scala
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -429,7 +443,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     topLines = Some(1),
     compat = Map(
       "3" -> "f = : A => B"
-    ),
+    )
   )
 
   checkEditLine(
@@ -442,12 +456,12 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     "List(1).foldLeft(0) { cas@@ }",
     "List(1).foldLeft(0) { case ($0) => }",
     assertSingleItem = false,
-    command = paramHint,
+    command = paramHint
   )
 
   // Apparently, known-direct subclasses does not work so well in 2.11.
   checkEditLine(
-    "infix-custom".tag(IgnoreScalaVersion("2.11.12")),
+    "infix-custom".tag(IgnoreScala211),
     """package pkg
       |object Outer {
       |  sealed trait ADT
@@ -462,11 +476,11 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     "cas@@",
-    "case a :+: b => $0",
+    "case a :+: b => $0"
   )
 
   checkEditLine(
-    "infix-conflict".tag(IgnoreScalaVersion("2.11.12")),
+    "infix-conflict".tag(IgnoreScala211),
     """
       |object Outer {
       |  sealed trait List
@@ -481,7 +495,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |""".stripMargin,
     "cas@@",
     // Assert we don't use infix syntax because `::` resolves to conflicting symbol in scope.
-    "case Outer.::(a, b) => $0",
+    "case Outer.::(a, b) => $0"
   )
 
   check(
@@ -499,7 +513,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     """|case Color.Blue =>
        |case Color.Green =>
        |case Color.Red =>
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -518,7 +532,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
        |Color.Green
        |Color.Red
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   checkEdit(
@@ -549,7 +563,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |  x match
       |    case Foo.Buzz(arg1, arg2) => $0
       |}""".stripMargin,
-    filter = _.contains("Buzz"),
+    filter = _.contains("Buzz")
   )
 
   check(
@@ -563,7 +577,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |  List(Foo(1,2)).map{ cas@@ }
       |}""".stripMargin,
     """|case Foo(a, b) => example
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -577,7 +591,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |    ca@@  
       |  }
       |}""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -592,7 +606,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |      cas@@
       |}""".stripMargin,
     """|case A.B =>
-       |case A.C =>""".stripMargin,
+       |case A.C =>""".stripMargin
   )
 
   check(
@@ -603,7 +617,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
       |    case Some(a) => cas@@
       |  }
       |}""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -632,7 +646,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|case Cleaning =>Activity & Physical & Chore
        |case DishWashing(amount) => exhaustive-enum-tags.Activity
-       |case Sports(time, intensity) => exhaustive-enum-tags.Activity""".stripMargin,
+       |case Sports(time, intensity) => exhaustive-enum-tags.Activity""".stripMargin
   )
 
   check(
@@ -660,7 +674,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
         |
         |""".stripMargin,
     """|case Cleaning =>Activity & Physical & Chore
-       |case Sports(time, intensity) => exhaustive-enum-tags2.Activity""".stripMargin,
+       |case Sports(time, intensity) => exhaustive-enum-tags2.Activity""".stripMargin
   )
 
   check(
@@ -690,7 +704,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
     """|case Cleaning =>Activity & Physical & Chore
        |case Reading(book, author) => exhaustive-enum-tags3.Activity
        |case Singing(song) => exhaustive-enum-tags3.Activity
-       |case Sports(time, intensity) => exhaustive-enum-tags3.Activity""".stripMargin,
+       |case Sports(time, intensity) => exhaustive-enum-tags3.Activity""".stripMargin
   )
 
   check(
@@ -708,11 +722,11 @@ class CompletionCaseSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|case Animal.Cat =>
        |case Animal.Dog =>
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
-    "type-alias-sealed-trait-case",
+    "type-alias-sealed-trait-case".tag(IgnoreScala211),
     s"""|object O {
         | type Id[A] = A
         |
@@ -737,7 +751,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
         """|case Cat() => type-alias-sealed-trait-case.O.Animal
            |case Dog => type-alias-sealed-trait-case.O.Animal
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -750,7 +764,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
        |
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -762,7 +776,7 @@ class CompletionCaseSuite extends BaseCompletionSuite {
        |  }
        |}
        |""".stripMargin,
-    "case (Int, Int) => scala",
+    "case (Int, Int) => scala"
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala
index 1264612cb4d..4eb2f1835f3 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala
@@ -15,7 +15,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
     """.stripMargin,
     """|substring(beginIndex: Int): String
        |substring(beginIndex: Int, endIndex: Int): String
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -36,8 +36,8 @@ class CompletionDocSuite extends BaseCompletionSuite {
       "3" ->
         """|join(delimiter: CharSequence, elements: CharSequence*): String
            |join(delimiter: CharSequence, elements: Iterable[? <: CharSequence]): String
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -51,7 +51,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|setValue(value: Int): Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -67,7 +67,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
       "3" ->
         """|singletonList[T](o: T): java.util.List[T]
            |""".stripMargin
-    ),
+    )
   )
   check(
     "java5",
@@ -130,7 +130,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
          |`OptionalInt` may have unpredictable results and should be avoided.
          |OptionalInt java.util
          |""".stripMargin,
-    includeDocs = true,
+    includeDocs = true
   )
 
   check(
@@ -142,7 +142,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|reportWarning(pos: Int, msg: String, out: PrintStream = Console.out): Unit
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -158,7 +158,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
       "3" ->
         """|sliding[B >: Int](size: Int, step: Int = 1): List[Int]#iterator.GroupedIterator[B]
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -177,7 +177,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
        |- `x`: the object to print.
        |println(x: Any): Unit
        |""".stripMargin,
-    includeDocs = true,
+    includeDocs = true
   )
 
   val commonlyUsedTypesPre2134: String =
@@ -263,8 +263,8 @@ class CompletionDocSuite extends BaseCompletionSuite {
            |${predefDocString(commonlyUsedTypesPost2134)}
            |Predef scala
            |Predef - scala.runtime.stdLibPatches
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   val iteratorDocs213: String =
@@ -417,8 +417,8 @@ class CompletionDocSuite extends BaseCompletionSuite {
       "2.13" -> iteratorAndSpecificIterableFactoryDocs213(
         withLinearSeqIterator = false
       ),
-      "3" -> iteratorDocs213,
-    ),
+      "3" -> iteratorDocs213
+    )
   )
 
   def executionDocstringPre2134: String =
@@ -447,11 +447,13 @@ class CompletionDocSuite extends BaseCompletionSuite {
         |""".stripMargin,
     includeDocs = true,
     compat = Map(
-      "2.12" ->
-        s"""|$executionDocstringPre2134
-            |global: ExecutionContext
-            |""".stripMargin
-    ),
+      "2.12" -> s"""|$executionDocstringPre2134
+                    |global: ExecutionContext
+                    |""".stripMargin,
+      "2.11" -> s"""|$executionDocstringPre2134
+                    |global: ExecutionContextExecutor
+                    |""".stripMargin
+    )
   )
 
   val baseTryDocs: String =
@@ -514,7 +516,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
             |method will ensure any non-fatal exception is caught and a
             |`Failure` object is returned.
             |Try[T](r: => T): Try[T]""".stripMargin
-    ),
+    )
   )
 
   val scala213Docs: String =
@@ -549,29 +551,30 @@ class CompletionDocSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|> A builder for mutable sequence of characters.  This class provides an API
-       |mostly compatible with `java.lang.StringBuilder`, except where there are
-       |conflicts with the Scala collections API (such as the `reverse` method.)
-       |
-       |$multipleResults
+       | mostly compatible with `java.lang.StringBuilder`, except where there are
+       | conflicts with the Scala collections API (such as the `reverse` method.)
        |
        |
        |**See**
-       |- ["Scala's Collection Library overview"](https://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#stringbuilders)
-       |section on `StringBuilders` for more information.
+       |- ["Scala's Collection Library overview"](http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#stringbuilders)
+       | section on `StringBuilders` for more information.
        |StringBuilder scala.collection.mutable
        |""".stripMargin,
     includeDocs = true,
     compat = Map(
-      "2.12" -> """|> A builder for mutable sequence of characters.  This class provides an API
-                   | mostly compatible with `java.lang.StringBuilder`, except where there are
-                   | conflicts with the Scala collections API (such as the `reverse` method.)
-                   |
-                   |
-                   |**See**
-                   |- ["Scala's Collection Library overview"](http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#stringbuilders)
-                   | section on `StringBuilders` for more information.
-                   |StringBuilder scala.collection.mutable
-                   |""".stripMargin,
+      ">=2.13.0" ->
+        """|> A builder for mutable sequence of characters.  This class provides an API
+           |mostly compatible with `java.lang.StringBuilder`, except where there are
+           |conflicts with the Scala collections API (such as the `reverse` method.)
+           |
+           |$multipleResults
+           |
+           |
+           |**See**
+           |- ["Scala's Collection Library overview"](https://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#stringbuilders)
+           |section on `StringBuilders` for more information.
+           |StringBuilder scala.collection.mutable
+           |""".stripMargin,
       ">=2.13.11" ->
         s"""|$scala213Docs
             |StringBuilder scala.collection.mutable
@@ -583,7 +586,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
           "StringBuilder(str: String): StringBuilder",
           "StringBuilder(underlying: StringBuilder): StringBuilder",
           "StringBuilder(capacity: Int): StringBuilder",
-          "StringBuilder(initCapacity: Int, initValue: String): StringBuilder",
+          "StringBuilder(initCapacity: Int, initValue: String): StringBuilder"
         ).map(s => scala213Docs + "\n" + s).mkString("\n"),
       scala3PresentationCompilerVersion ->
         List(
@@ -592,9 +595,9 @@ class CompletionDocSuite extends BaseCompletionSuite {
           "StringBuilder(str: String): StringBuilder",
           "StringBuilder(underlying: java.lang.StringBuilder): StringBuilder",
           "StringBuilder(capacity: Int): StringBuilder",
-          "StringBuilder(initCapacity: Int, initValue: String): StringBuilder",
-        ).map(s => scala213Docs + "\n" + s).mkString("\n"),
-    ),
+          "StringBuilder(initCapacity: Int, initValue: String): StringBuilder"
+        ).map(s => scala213Docs + "\n" + s).mkString("\n")
+    )
   )
 
   val vectorDocs213: String =
@@ -657,8 +660,8 @@ class CompletionDocSuite extends BaseCompletionSuite {
     includeDocs = true,
     compat = Map(
       "2.13" -> vectorDocs213,
-      "3" -> vectorDocs213,
-    ),
+      "3" -> vectorDocs213
+    )
   )
 
   check(
@@ -702,7 +705,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
            |Catch[T] - scala.util.control.Exception
            |""".stripMargin
     ),
-    topLines = Some(1), // for Scala3, result contains `Catch[$0]` and `Catch`
+    topLines = Some(1) // for Scala3, result contains `Catch[$0]` and `Catch`
   )
 
   check(
@@ -720,7 +723,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
         """|Failure scala.util
            |Failure[T](exception: Throwable): Failure[T]
            |""".stripMargin
-    ),
+    )
   )
 
   // New completions not yet implemented for Scala 3
@@ -754,7 +757,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
        | are independent of those for the original thread.
        |DynamicVariable scala.util
        |""".stripMargin,
-    includeDocs = true,
+    includeDocs = true
   )
 
   val isDefinedLatestDocs: String =
@@ -787,7 +790,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
     includeDocs = true,
     compat = Map(
       "2.13" -> isDefinedLatestDocs
-    ),
+    )
   )
   check(
     "scala13",
@@ -802,31 +805,32 @@ class CompletionDocSuite extends BaseCompletionSuite {
        |
        |
        |**Type Parameters**
-       |- `V1`: type of the values of the new bindings, a supertype of `V`
+       |- `B1`: type of the values of the new bindings, a supertype of `B`
        |
        |**Parameters**
        |- `key`: the key to be inserted
        |- `value`: the value to be associated with `key`
        |
        |**Returns:** a new immutable tree map with the inserted binding, if it wasn't present in the map
-       |insert[V1 >: Int](key: Int, value: V1): TreeMap[Int,V1]
+       |insert[B1 >: Int](key: Int, value: B1): TreeMap[Int,B1]
        |""".stripMargin,
     includeDocs = true,
     compat = Map(
-      "2.12" -> """|> A new TreeMap with the entry added is returned,
-                   | assuming that key is *not* in the TreeMap.
-                   |
-                   |
-                   |**Type Parameters**
-                   |- `B1`: type of the values of the new bindings, a supertype of `B`
-                   |
-                   |**Parameters**
-                   |- `key`: the key to be inserted
-                   |- `value`: the value to be associated with `key`
-                   |
-                   |**Returns:** a new immutable tree map with the inserted binding, if it wasn't present in the map
-                   |insert[B1 >: Int](key: Int, value: B1): TreeMap[Int,B1]
-                   |""".stripMargin,
+      "2.13" ->
+        """|> A new TreeMap with the entry added is returned,
+           | assuming that key is *not* in the TreeMap.
+           |
+           |
+           |**Type Parameters**
+           |- `V1`: type of the values of the new bindings, a supertype of `V`
+           |
+           |**Parameters**
+           |- `key`: the key to be inserted
+           |- `value`: the value to be associated with `key`
+           |
+           |**Returns:** a new immutable tree map with the inserted binding, if it wasn't present in the map
+           |insert[V1 >: Int](key: Int, value: V1): TreeMap[Int,V1]
+           |""".stripMargin,
       "3" -> """|> A new TreeMap with the entry added is returned,
                 | assuming that key is *not* in the TreeMap.
                 |
@@ -840,8 +844,8 @@ class CompletionDocSuite extends BaseCompletionSuite {
                 |
                 |**Returns:** a new immutable tree map with the inserted binding, if it wasn't present in the map
                 |insert[V1 >: Int](key: Int, value: V1): TreeMap[Int, V1]
-                |""".stripMargin,
-    ),
+                |""".stripMargin
+    )
   )
 
   check(
@@ -855,6 +859,6 @@ class CompletionDocSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|myNumbers: Vector[Int]
-       |""".stripMargin,
+       |""".stripMargin
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionErrorSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionErrorSuite.scala
index d7394b694e0..af10cdd1524 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionErrorSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionErrorSuite.scala
@@ -14,7 +14,7 @@ class CompletionErrorSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "thing(): Any",
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -33,8 +33,9 @@ class CompletionErrorSuite extends BaseCompletionSuite {
     "invalid: Any",
     topLines = Some(1),
     compat = Map(
-      "2.12" -> "invalid: InvalidDependency.type"
-    ),
+      "2.12" -> "invalid: InvalidDependency.type",
+      "2.11" -> "invalid: InvalidDependency.type"
+    )
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionExtensionMethodSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionExtensionMethodSuite.scala
index ca3056ec7f8..1fdda5fb12e 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionExtensionMethodSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionExtensionMethodSuite.scala
@@ -18,7 +18,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |def main = 100.inc@@
        |""".stripMargin,
     """|incr: Int (extension)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -33,7 +33,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|incr: Int (extension)
        |""".stripMargin,
-    filter = _.contains("(extension)"),
+    filter = _.contains("(extension)")
   )
 
   check(
@@ -48,7 +48,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|incr: Int (extension)
        |""".stripMargin,
-    filter = _.contains("(extension)"),
+    filter = _.contains("(extension)")
   )
 
   check(
@@ -65,7 +65,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|identity: String (extension)
        |""".stripMargin, // incr won't be available
-    filter = _.contains("(extension)"),
+    filter = _.contains("(extension)")
   )
 
   check(
@@ -83,7 +83,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|doSomething: A (extension)
        |""".stripMargin,
-    filter = _.contains("(extension)"),
+    filter = _.contains("(extension)")
   )
 
   checkEdit(
@@ -105,7 +105,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |    def incr: Int = num + 1
        |
        |def main = 100.incr
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -127,7 +127,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |    def plus(other: Int): Int = num + other
        |
        |def main = 100.plus($0)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   // NOTE: In 3.1.3, package object name includes the whole path to file
@@ -143,7 +143,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |  def main = 100.inc@@
        |""".stripMargin,
     """|incr: Int (extension)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -157,7 +157,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |  def main = 100.inc@@
        |""".stripMargin,
     """|incr: Int (extension)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -174,7 +174,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |
        |package example2: 
        |  def main = 100.incr
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -192,7 +192,7 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|increment: Int (extension)
        |increment2: Int (extension)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionFilenameSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionFilenameSuite.scala
index 0afec5006c9..6439665b8ed 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionFilenameSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionFilenameSuite.scala
@@ -10,7 +10,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |class M@@
        |""".stripMargin,
     "class Main",
-    filename = "Main.scala",
+    filename = "Main.scala"
   )
 
   check(
@@ -19,7 +19,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |class M@@
        |""".stripMargin,
     "class Main",
-    filename = "Main.scala",
+    filename = "Main.scala"
   )
 
   check(
@@ -28,7 +28,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |trait M@@
        |""".stripMargin,
     "trait Main",
-    filename = "Main.scala",
+    filename = "Main.scala"
   )
 
   check(
@@ -37,7 +37,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |object M@@
        |""".stripMargin,
     "object Main",
-    filename = "Main.scala",
+    filename = "Main.scala"
   )
 
   check(
@@ -46,7 +46,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |object M@@
        |""".stripMargin,
     "object Main",
-    filename = "Main.scala",
+    filename = "Main.scala"
   )
 
   check(
@@ -56,7 +56,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |class M@@
        |""".stripMargin,
     "",
-    filename = "Main.scala",
+    filename = "Main.scala"
   )
 
   check(
@@ -66,7 +66,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "",
-    filename = "Main.scala",
+    filename = "Main.scala"
   )
 
   check(
@@ -75,7 +75,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |class MDataSer@@
        |""".stripMargin,
     "class MyDatabaseService",
-    filename = "MyDatabaseService.scala",
+    filename = "MyDatabaseService.scala"
   )
 
   check(
@@ -84,7 +84,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |class Us@@
        |""".stripMargin,
     "class User",
-    filename = "foo/User.scala",
+    filename = "foo/User.scala"
   )
 
   check(
@@ -93,7 +93,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |object Us@@
        |""".stripMargin,
     "object User",
-    filename = "User.scala",
+    filename = "User.scala"
   )
 
   check(
@@ -102,7 +102,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |trait Us@@
        |""".stripMargin,
     "trait User",
-    filename = "User.scala",
+    filename = "User.scala"
   )
 
   check(
@@ -112,7 +112,7 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |trait Us@@
        |""".stripMargin,
     "",
-    filename = "User.scala",
+    filename = "User.scala"
   )
 
   check(
@@ -122,13 +122,13 @@ class CompletionFilenameSuite extends BaseCompletionSuite {
        |object Us@@
        |""".stripMargin,
     "",
-    filename = "User.scala",
+    filename = "User.scala"
   )
 
   check(
     "end-of-file",
     "object Use@@",
     "object User",
-    filename = "User.scala",
+    filename = "User.scala"
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionInterpolatorSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionInterpolatorSuite.scala
index 8325a953360..3ddc2e1e707 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionInterpolatorSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionInterpolatorSuite.scala
@@ -17,7 +17,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  def message = s"Hello $myName$0, you are welcome"
        |}
        |""".stripMargin,
-    filterText = "myName",
+    filterText = "myName"
   )
 
   checkEdit(
@@ -32,7 +32,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  def message = s"$myName$0"
        |}
        |""".stripMargin,
-    filterText = "myName",
+    filterText = "myName"
   )
 
   checkEdit(
@@ -47,7 +47,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  def message = s"${myName$0}me"
        |}
        |""".stripMargin,
-    filterText = "myName",
+    filterText = "myName"
   )
 
   checkEdit(
@@ -62,7 +62,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  def message = s'''${myName$0}me'''
        |}
        |""".stripMargin.triplequoted,
-    filterText = "myName",
+    filterText = "myName"
   )
 
   checkEdit(
@@ -81,7 +81,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |    |'''.stripMargin
        |}
        |""".stripMargin.triplequoted,
-    filterText = "myName".triplequoted,
+    filterText = "myName".triplequoted
   )
 
   checkEdit(
@@ -96,7 +96,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  s"$myName$0 $$"
        |}
        |""".stripMargin.triplequoted,
-    filterText = "myName",
+    filterText = "myName"
   )
 
   checkEdit(
@@ -111,7 +111,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  s"$myName $$"
        |}
        |""".stripMargin.triplequoted,
-    filterText = "myName",
+    filterText = "myName"
   )
 
   checkEdit(
@@ -125,7 +125,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  val myName = ""
        |  s"Say $$myName is $myName$0"
        |}
-       |""".stripMargin.triplequoted,
+       |""".stripMargin.triplequoted
   )
 
   check(
@@ -136,7 +136,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     """|myName: String
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -158,7 +158,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |    }
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -167,7 +167,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  "$1@@"
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -176,7 +176,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  "$ @@"
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -185,7 +185,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  "$-@@"
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -194,7 +194,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  "$-@@"
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -203,7 +203,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  "$hello-@@"
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -212,7 +212,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  "$-hello@@"
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -221,7 +221,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  "$he-llo@@"
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -231,7 +231,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  "$he11o@@"
        |}
        |""".stripMargin,
-    "he11o: String",
+    "he11o: String"
   )
 
   checkEdit(
@@ -245,7 +245,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  val myName = "name"
        |  s"$$$myName$0"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -257,7 +257,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|object Main {
        |  s"${identity($0)}"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -269,7 +269,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|object Main {
        |  s"${toString()$0}"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -283,7 +283,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  def empty: Boolean = true
        |  s"$empty$0"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -297,7 +297,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  val myName = ""
        |  s"${myName$0}"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -313,7 +313,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|b: Int
        |a: String
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -329,7 +329,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|b: Int
        |a: String
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   checkEdit(
@@ -343,14 +343,14 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  def member = 42
        |  s"Hello ${Main.member$0}!"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
     "member-label".tag(
       IgnoreScalaVersion.forRangeUntil(
         "3.2.0-RC1",
-        "3.2.1-RC1",
+        "3.2.1-RC1"
       )
     ),
     """|object Main {
@@ -359,20 +359,20 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     """|empty[A]: List[A]
-       |equals(x$1: Object): Boolean
+       |equals(x$1: Any): Boolean
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
+      "2.13" ->
         """|empty[A]: List[A]
-           |equals(x$1: Any): Boolean
+           |equals(x$1: Object): Boolean
            |""".stripMargin,
       "3" ->
         """|empty[A]: List[A]
            |equals(x$0: Any): Boolean
-           |""".stripMargin,
+           |""".stripMargin
     ),
     topLines = Some(6),
-    includeDetail = false,
+    includeDetail = false
   )
 
   checkEdit(
@@ -386,7 +386,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  def method(arg: Int) = 42
        |  s"Hello ${Main.method($0)}!"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -394,7 +394,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
       .tag(
         IgnoreScalaVersion.forRangeUntil(
           "3.2.0-RC1",
-          "3.2.1-RC1",
+          "3.2.1-RC1"
         )
       ),
     """|object Main {
@@ -404,7 +404,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|object Main {
        |  s"Hello ${Main.toString()$0}!"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -418,7 +418,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|a: String
        |b: Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   checkEdit(
@@ -432,7 +432,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  val `type` = ""
        |  s"Hello ${Main.`type`$0}!"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -448,7 +448,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  val dfg = ""
        |  s"Hello ${abc.toString()$0} from ${dfg.toString()}!"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -464,7 +464,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  val dfg = ""
        |  s"Hello $dfg ${abc.toString()$0} from ${dfg.toString()}!"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -478,7 +478,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|a: String
        |b: Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -492,7 +492,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|a: String
        |b: Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -509,7 +509,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     """|a: String
        |b: Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -523,7 +523,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |""".stripMargin.triplequoted,
     """|member: String
        |""".stripMargin,
-    filter = s => s.contains("member"),
+    filter = s => s.contains("member")
   )
 
   checkEditLine(
@@ -534,7 +534,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     """"Hello ${hell@@}"""".stripMargin,
-    """s"Hello ${hello$0}"""".stripMargin,
+    """s"Hello ${hello$0}"""".stripMargin
   )
 
   checkEditLine(
@@ -545,7 +545,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     """"Hello ${hell@@o}"""".stripMargin,
-    """s"Hello ${hello$0}o}"""".stripMargin,
+    """s"Hello ${hello$0}o}"""".stripMargin
   )
 
   // See https://github.com/scalameta/metals/issues/608
@@ -561,7 +561,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """s"Hello $hello@@"""".stripMargin,
     """s"Hello $helloMethod"""".stripMargin,
-    filter = _.contains("a: Int"),
+    filter = _.contains("a: Int")
   )
 
   checkEditLine(
@@ -573,7 +573,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """s"Hello $@@"""".stripMargin,
     """s"Hello $hello"""".stripMargin,
-    filter = _.contains("hello"),
+    filter = _.contains("hello")
   )
 
   checkEditLine(
@@ -585,7 +585,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """s"Hello ${@@"""".stripMargin,
     """s"Hello ${hello"""".stripMargin,
-    filter = _.contains("hello"),
+    filter = _.contains("hello")
   )
 
   checkEditLine(
@@ -597,7 +597,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """s"Hello ${@@}"""".stripMargin,
     """s"Hello ${hello}"""".stripMargin,
-    filter = _.contains("hello"),
+    filter = _.contains("hello")
   )
 
   checkEdit(
@@ -612,7 +612,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  s"Hello ${`type`$0}"
        |}
        |""".stripMargin,
-    filterText = "type",
+    filterText = "type"
   )
 
   checkEdit(
@@ -627,7 +627,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |  s"Hello ${`hello world`$0}"
        |}
        |""".stripMargin,
-    filterText = "hello world",
+    filterText = "hello world"
   )
 
   checkEdit(
@@ -640,7 +640,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |object Main {
        |  s"this is an interesting $Paths$0"
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -668,14 +668,14 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
            |  s"this is an interesting {java.nio.file.Paths}"
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
     "auto-imports-prefix-with-interpolator".tag(
       IgnoreScalaVersion.forRangeUntil(
         "3.2.0-RC1",
-        "3.2.1-RC1",
+        "3.2.1-RC1"
       )
     ),
     """|
@@ -701,7 +701,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
            |  s"this is an interesting ${java.nio.file.Paths}"
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -725,7 +725,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |def main = s" ${aaa.incr$0}"
        |""".stripMargin,
     // simulate issues with VS Code
-    filterText = "aaa.incr",
+    filterText = "aaa.incr"
   )
 
   checkEdit(
@@ -750,7 +750,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |def aaa = 123
        |def main = s"  ${aaa.plus($0)}"
        |""".stripMargin,
-    filterText = "aaa.plus",
+    filterText = "aaa.plus"
   )
 
   check(
@@ -768,7 +768,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|identity: String (extension)
        |""".stripMargin, // incr won't be available
-    filter = _.contains("(extension)"),
+    filter = _.contains("(extension)")
   )
 
   checkEdit(
@@ -780,7 +780,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
        |object Main {
        |  val a = s"${ListBuffer($0)}""
        |}""".stripMargin,
-    filter = _.contains("[A]"),
+    filter = _.contains("[A]")
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionIssueSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionIssueSuite.scala
index 99118f3d798..dfc4ab0ff92 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionIssueSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionIssueSuite.scala
@@ -12,8 +12,10 @@ class CompletionIssueSuite extends BaseCompletionSuite {
       Dependency.of("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.16.0"),
       if (scalaVersion.startsWith("2.12"))
         Dependency.of("org.scalameta", "scalameta_2.12", "4.6.0")
+      else if (scalaVersion.startsWith("2.11"))
+        Dependency.of("org.scalameta", "scalameta_2.11", "4.6.0")
       else
-        Dependency.of("org.scalameta", "scalameta_2.13", "4.6.0"),
+        Dependency.of("org.scalameta", "scalameta_2.13", "4.6.0")
     )
   }
 
@@ -22,7 +24,7 @@ class CompletionIssueSuite extends BaseCompletionSuite {
     """package a
       |class Foo@@
       |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -32,7 +34,7 @@ class CompletionIssueSuite extends BaseCompletionSuite {
       |  new Foo@@
       |}
     """.stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -50,7 +52,7 @@ class CompletionIssueSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     "Self[+T] = Main.this.stream.Self",
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   checkEdit(
@@ -88,7 +90,7 @@ class CompletionIssueSuite extends BaseCompletionSuite {
                 |  NestedLeaf
                 |}
                 |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -153,11 +155,11 @@ class CompletionIssueSuite extends BaseCompletionSuite {
            |  val allCountries = Sweden + France + USA + Norway
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
-    "issue-813-empty",
+    "issue-813-empty".tag(IgnoreScala211),
     """|package a
        |
        |object Main {
@@ -175,11 +177,11 @@ class CompletionIssueSuite extends BaseCompletionSuite {
         """|++[B >: Int, That](that: GenTraversableOnce[B])(implicit bf: CanBuildFrom[List[Int],B,That]): That
            |+:[B >: Int, That](elem: B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
            |""".stripMargin
-    ),
+    )
   )
 
   check(
-    "issue-813",
+    "issue-813".tag(IgnoreScala211),
     """|package a
        |
        |object Main {
@@ -197,11 +199,11 @@ class CompletionIssueSuite extends BaseCompletionSuite {
         """|filter(p: A => Boolean): Array[A]
            |filter(pred: A => Boolean): C
            |""".stripMargin
-    ),
+    )
   )
 
   check(
-    "issue-813-space",
+    "issue-813-space".tag(IgnoreScala211),
     """|package a
        |
        |object Main {
@@ -219,11 +221,11 @@ class CompletionIssueSuite extends BaseCompletionSuite {
         """|filter(p: A => Boolean): Array[A]
            |filter(pred: A => Boolean): C
            |""".stripMargin
-    ),
+    )
   )
 
   check(
-    "issue-813-multi",
+    "issue-813-multi".tag(IgnoreScala211),
     """|package a
        |
        |object Main {
@@ -241,7 +243,7 @@ class CompletionIssueSuite extends BaseCompletionSuite {
         """|filter(p: A => Boolean): Array[A]
            |filter(pred: A => Boolean): C
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -254,7 +256,7 @@ class CompletionIssueSuite extends BaseCompletionSuite {
     """object obj {
       |  def method(arg: String): Unit = ()
       |}
-      |import obj.method""".stripMargin,
+      |import obj.method""".stripMargin
   )
 
   // We shouldn't get exhaustive completions for AbsolutePath
@@ -268,7 +270,7 @@ class CompletionIssueSuite extends BaseCompletionSuite {
        |  path match@@
        |}
        |""".stripMargin,
-    "match",
+    "match"
   )
 
   // The tests shows `x$1` but it's because the dependency is not indexed
@@ -299,14 +301,14 @@ class CompletionIssueSuite extends BaseCompletionSuite {
            |  override def createProgress(x$0: WorkDoneProgressCreateParams): CompletableFuture[Void] = ${0:???}
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   override val compatProcess: Map[String, String => String] = Map(
     "2.13" -> { s =>
       s.replace(
         "::[B >: Int](x: B): List[B]",
-        "::[B >: Int](elem: B): List[B]",
+        "::[B >: Int](elem: B): List[B]"
       )
     }
   )
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala
index 6c00940435b..c20f13dd217 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala
@@ -20,7 +20,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """|superVisorStrategy: Int (commit: '')
        |super (commit: '')
        |""".stripMargin,
-    includeCommitCharacter = true,
+    includeCommitCharacter = true
   )
 
   check(
@@ -37,7 +37,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     "",
-    includeCommitCharacter = true,
+    includeCommitCharacter = true
   )
 
   check(
@@ -56,7 +56,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     "",
-    includeCommitCharacter = true,
+    includeCommitCharacter = true
   )
 
   check(
@@ -76,7 +76,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|superVisorStrategy: Int
        |super
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -96,7 +96,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|superVisorStrategy: Int
        |super
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -116,7 +116,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|superVisorStrategy: Int
        |super
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -133,7 +133,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     """|super
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -166,8 +166,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
         """|value: Int
            |val
            |var
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -183,7 +183,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|val
        |var
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -202,7 +202,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     includeCommitCharacter = true,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -218,7 +218,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|value: Int
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   checkEditLine(
@@ -232,7 +232,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     "  va@@",
     "  val ",
-    filter = _ == "val",
+    filter = _ == "val"
   )
 
   check(
@@ -247,7 +247,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """|return
        |""".stripMargin,
     // methods add in 3.2.1
-    filter = item => !item.contains("retains"),
+    filter = item => !item.contains("retains")
   )
 
   check(
@@ -261,7 +261,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     "",
     // methods add in 3.2.1
-    filter = item => !item.contains("retains"),
+    filter = item => !item.contains("retains")
   )
 
   check(
@@ -280,7 +280,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       "3" -> ""
     ),
     // methods add in 3.2.1
-    filter = item => !item.contains("retains"),
+    filter = item => !item.contains("retains")
   )
 
   check(
@@ -292,7 +292,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     "",
     // methods add in 3.2.1
-    filter = item => !item.contains("retains"),
+    filter = item => !item.contains("retains")
   )
 
   check(
@@ -307,7 +307,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|import (commit: '')
        |""".stripMargin,
-    includeCommitCharacter = true,
+    includeCommitCharacter = true
   )
 
   check(
@@ -321,7 +321,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """|import (commit: '')
        |""".stripMargin,
     includeCommitCharacter = true,
-    enablePackageWrap = false,
+    enablePackageWrap = false
   )
 
   check(
@@ -332,7 +332,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |abstract cla@@
       |""".stripMargin,
     """|class
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -345,7 +345,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     "",
     compat = Map(
       "3" -> "type"
-    ),
+    )
   )
 
   check(
@@ -358,7 +358,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """type
-    """.stripMargin,
+    """.stripMargin
   )
 
   check(
@@ -375,7 +375,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """.stripMargin,
     // NOTE(olafur) `type` is technically valid in blocks but they're not completed
     // to reduce noise (we do the same for class, object, trait).
-    "",
+    ""
   )
 
   check(
@@ -389,7 +389,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """.stripMargin,
     "",
     // to avoid newMain annotation
-    filter = str => !str.contains("newMain"),
+    filter = str => !str.contains("newMain")
   )
   // TODO: Should provide empty completions
   // The issue is that the tree looks the same as for `case @@` (it doesn't see `new`)
@@ -407,7 +407,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """.stripMargin,
     "",
     // to avoid newMain annotation
-    filter = str => !str.contains("newMain"),
+    filter = str => !str.contains("newMain")
   )
 
   check(
@@ -422,7 +422,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """.stripMargin,
     """|supervisorStrategy: Int
        |super
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -434,7 +434,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |  protected de@@
       |}
     """.stripMargin,
-    "def",
+    "def"
   )
 
   check(
@@ -448,7 +448,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """.stripMargin,
     """val
       |var
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   check(
@@ -493,7 +493,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
                 |sealed class
                 |implicit
                 |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -506,7 +506,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     includeCommitCharacter = true,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -514,7 +514,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
     """|object A{
        |  def hello(a: String, u@@)
        |}""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -525,7 +525,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |class Foo ext@@
     """.stripMargin,
     """|extends
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -536,7 +536,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |class Foo extends Any wi@@
     """.stripMargin,
     """|with
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -549,7 +549,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|extends
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -564,7 +564,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|extends
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -575,7 +575,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |object Foo ext@@
     """.stripMargin,
     """|extends
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -586,7 +586,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |trait Foo ext@@ {}
     """.stripMargin,
     """|extends
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -597,7 +597,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |class Foo(x: Int) ext@@
     """.stripMargin,
     """|extends
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -608,7 +608,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |class Foo[A] ext@@
       """.stripMargin,
     """|extends
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -622,7 +622,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |  }
       |}
     """.stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -636,7 +636,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |  }
       |}
     """.stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -655,7 +655,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
         "3" ->
           """|extends
              |""".stripMargin
-      ),
+      )
   )
 
   check(
@@ -666,7 +666,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |enum Foo(x: Int) ext@@
         """.stripMargin,
     """|extends
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -680,7 +680,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -694,7 +694,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -711,7 +711,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -726,7 +726,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -741,7 +741,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -758,7 +758,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -775,7 +775,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "2" -> ""
-    ),
+    )
   )
 
   check(
@@ -789,7 +789,7 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       |  }
       |}
       """.stripMargin,
-    "",
+    ""
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionMatchSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionMatchSuite.scala
index 229595d8929..7d9a8980e95 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionMatchSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionMatchSuite.scala
@@ -5,6 +5,10 @@ import tests.BaseCompletionSuite
 class CompletionMatchSuite extends BaseCompletionSuite {
   override def requiresScalaLibrarySources: Boolean = true
 
+  override val compatProcess: Map[String, String => String] = Map(
+    "2.11" -> { (s: String) => s.replace("Some(value)", "Some(x)") }
+  )
+
   check(
     "match",
     """
@@ -18,7 +22,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
       "3" -> """|match
                 |match (exhaustive) Option (2 cases)
                 |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -35,7 +39,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
       "3" -> """|match
                 |match (exhaustive) Option (2 cases)
                 |""".stripMargin
-    ),
+    )
   )
 
   // In Scala3 it's allowed to write xxx.match
@@ -50,7 +54,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
       "3" -> """|match
                 |match (exhaustive) Option (2 cases)
                 |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -62,12 +66,12 @@ class CompletionMatchSuite extends BaseCompletionSuite {
       |@@
       |""".stripMargin,
     "",
-    filter = _ => false,
+    filter = _ => false
   )
 
   // Assert that Workday/Weekend symbols from previous test don't appear in result.
   checkEdit(
-    "stale2",
+    "stale2".tag(IgnoreScala211),
     """package stale
       |sealed abstract class Weekday
       |object Weekday {
@@ -113,7 +117,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
                  |
                  |}
                  |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -150,7 +154,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
                  |
                  |}
                  |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -193,7 +197,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
             |
             |}
             |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -221,11 +225,11 @@ class CompletionMatchSuite extends BaseCompletionSuite {
                 |}
                 |""".stripMargin
     ),
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   check(
-    "inner-class",
+    "inner-class".tag(IgnoreScala211),
     """
       |package example
       |
@@ -241,7 +245,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|match
        |match (exhaustive) Foo (2 cases)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -283,7 +287,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
                 |\tcase AccessMode.EXECUTE =>
                 |
                 |}""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -322,7 +326,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
         |
         |}
         |""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
@@ -359,7 +363,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
                 |\tcase scala.None =>
                 |
                 |}""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -405,7 +409,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
                 |\tcase Bar =>
                 |
                 |}""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -460,7 +464,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
                 |\t
                 |
                 |}""".stripMargin
-    ),
+    )
   )
   check(
     "exhaustive-map",
@@ -475,7 +479,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
         """|case (exhaustive) Option (2 cases)
            |""".stripMargin
     ),
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
@@ -491,7 +495,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
        |\tcase None =>
        |}
        |}""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
@@ -519,7 +523,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
         |\tcase E(e) =>
         |  }
         |}""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
@@ -548,7 +552,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
         |case E(e) =>
         |  }
         |}""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
@@ -598,7 +602,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
         |\tcase DishWashing(amount) =>
         |
         |""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
@@ -647,7 +651,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
         |\tcase Cleaning => 
         |
         |""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
@@ -698,7 +702,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
         |\tcase Singing(song) =>
         |
         |""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
@@ -731,11 +735,11 @@ class CompletionMatchSuite extends BaseCompletionSuite {
         |
         |}
         |}""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   check(
-    "stale-symbols",
+    "stale-symbols".tag(IgnoreScala211),
     """
       |package example
       |      
@@ -754,7 +758,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|match
        |match (exhaustive) ScalaTargetType (6 cases)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -784,11 +788,11 @@ class CompletionMatchSuite extends BaseCompletionSuite {
        |
        |}
        |""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
   checkEdit(
-    "type-alias-sealed-trait",
+    "type-alias-sealed-trait".tag(IgnoreScala211),
     s"""|object O {
         | type Id[A] = A
         |
@@ -846,7 +850,7 @@ class CompletionMatchSuite extends BaseCompletionSuite {
            |}
            |""".stripMargin
     ),
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionMillIvySuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionMillIvySuite.scala
index f4b0f11c7ab..e450c8e65aa 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionMillIvySuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionMillIvySuite.scala
@@ -14,7 +14,7 @@ class CompletionMillIvySuite extends BaseCompletionSuite {
     """|io.circe
        |io.circul
        |""".stripMargin,
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
   check(
@@ -25,7 +25,7 @@ class CompletionMillIvySuite extends BaseCompletionSuite {
        |circe-core_native0.4_2.13
        |circe-core_native0.4_3
        |""".stripMargin,
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
   checkEdit(
@@ -35,11 +35,11 @@ class CompletionMillIvySuite extends BaseCompletionSuite {
     """|val dependency = ivy"io.circe::circe-config"
        |""".stripMargin,
     filename = "build.sc",
-    filter = _ == "circe-config",
+    filter = _ == "circe-config"
   )
 
   check(
-    "scala-completions",
+    "scala-completions".tag(IgnoreScala211),
     """|val dependency = ivy"io.circe::circe-core@@"
        |""".stripMargin,
     """|circe-core
@@ -48,16 +48,16 @@ class CompletionMillIvySuite extends BaseCompletionSuite {
        |circe-core_sjs1
        |circe-core_sjs1.0-RC2
        |""".stripMargin,
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
   check(
-    "version",
+    "version".tag(IgnoreScala211),
     """|val dependency = ivy"io.circe::circe-core_sjs1:0.13@@"
        |""".stripMargin,
     """|0.13.0
        |""".stripMargin,
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
   check(
@@ -71,7 +71,7 @@ class CompletionMillIvySuite extends BaseCompletionSuite {
        |1.0.0-MF
        |""".stripMargin,
     filter = _.startsWith("1.0"),
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
   checkEdit(
@@ -81,25 +81,25 @@ class CompletionMillIvySuite extends BaseCompletionSuite {
     """|val dependency = ivy"org.typelevel:cats-core_2.11:1.0.1"
        |""".stripMargin,
     filter = _ == "1.0.1",
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
   check(
-    "version-double-colon2",
+    "version-double-colon2".tag(IgnoreScala211),
     """|val dependency = ivy"org.typelevel::cats-core::2.10@@"
        |""".stripMargin,
     """|2.10.0
        |""".stripMargin,
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
   checkEdit(
-    "version-double-colon-edit",
+    "version-double-colon-edit".tag(IgnoreScala211),
     """|val dependency = ivy"org.typelevel::cats-core::2.10@@"
        |""".stripMargin,
     """|val dependency = ivy"org.typelevel::cats-core::2.10.0"
        |""".stripMargin,
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
   check(
@@ -107,7 +107,7 @@ class CompletionMillIvySuite extends BaseCompletionSuite {
     """|val dependency = ivy"org.typelevel:cats-core_2.11::1.0.@@"
        |""".stripMargin,
     "",
-    filename = "build.sc",
+    filename = "build.sc"
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionOverrideAllSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionOverrideAllSuite.scala
index d162b1f832e..d0cc0a00250 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionOverrideAllSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionOverrideAllSuite.scala
@@ -24,7 +24,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|Implement all members (2 total)
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   checkEdit(
@@ -56,7 +56,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |  }
        |}
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   check(
@@ -76,7 +76,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|Implement all members (3 total)
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   checkEdit(
@@ -113,7 +113,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
       |  }
       |}
       |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   check(
@@ -134,7 +134,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|Implement all members (2 total)
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   checkEdit(
@@ -170,7 +170,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |  }
        |}
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   check(
@@ -187,7 +187,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "",
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   check(
@@ -207,7 +207,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|Implement all members (2 total)
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   checkEdit(
@@ -241,7 +241,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |  }
        |}
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   check(
@@ -261,7 +261,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|Implement all members (3 total)
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   checkEdit(
@@ -297,7 +297,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |  }
        |}
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   check(
@@ -323,7 +323,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|Implement all members (3 total)
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   checkEdit(
@@ -371,7 +371,7 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        |  }
        |}
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 
   checkEdit(
@@ -397,6 +397,6 @@ class CompletionOverrideAllSuite extends BaseCompletionSuite {
        | 
        |}
        |""".stripMargin,
-    filter = _.contains("Implement"),
+    filter = _.contains("Implement")
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionOverrideConfigSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionOverrideConfigSuite.scala
index fd1a91ece85..b4290867fcc 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionOverrideConfigSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionOverrideConfigSuite.scala
@@ -12,9 +12,9 @@ class CompletionOverrideConfigSuite extends BaseCompletionSuite {
     PresentationCompilerConfigImpl().copy(
       _symbolPrefixes = Map(
         "a/Weekday." -> "w",
-        "java/util/function/" -> "f",
+        "java/util/function/" -> "f"
       ),
-      overrideDefFormat = OverrideDefFormat.Unicode,
+      overrideDefFormat = OverrideDefFormat.Unicode
     )
 
   checkEdit(
@@ -42,7 +42,7 @@ class CompletionOverrideConfigSuite extends BaseCompletionSuite {
        |class Main extends Super {
        |  def weekday: w.Monday = ${0:???}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -77,7 +77,7 @@ class CompletionOverrideConfigSuite extends BaseCompletionSuite {
            |  def function: f.Function[Int, String] = ${0:???}
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -99,6 +99,6 @@ class CompletionOverrideConfigSuite extends BaseCompletionSuite {
         """|🔼 def numberAbstract: Int
            |⏫ override def number: Int
            |""".stripMargin
-    ),
+    )
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionOverrideSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionOverrideSuite.scala
index ea2838afeb2..49d4a0ee850 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionOverrideSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionOverrideSuite.scala
@@ -19,7 +19,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
       |object Main extends AutoCloseable {
       |  def close(): Unit = ${0:???}
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkEdit(
@@ -43,7 +43,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
       |  override def foo(a: Int): Unit = ()
       |  override def foo(a: String): Unit = ${0:???}
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkEdit(
@@ -62,7 +62,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
       |  }
       |}
       |""".stripMargin,
-    filter = _.contains("iterat"),
+    filter = _.contains("iterat")
   )
 
   checkEdit(
@@ -77,20 +77,20 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     """
       |object Main {
       |  new scala.Traversable[Int] {
-      |    override def foreach[U](f: Int => U): Unit = ${0:???}
+      |    def foreach[U](f: Int => U): Unit = ${0:???}
       |  }
       |}
       |""".stripMargin,
     compat = Map(
-      "2.12" ->
+      ">=2.13.0" ->
         """
           |object Main {
           |  new scala.Traversable[Int] {
-          |    def foreach[U](f: Int => U): Unit = ${0:???}
+          |    override def foreach[U](f: Int => U): Unit = ${0:???}
           |  }
           |}
           |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -114,7 +114,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
       |    override def add[T: Ordering]: T = ${0:???}
       |  }
       |}
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   checkEdit(
@@ -149,7 +149,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
            |  }
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -186,7 +186,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
            |override def hashCode(): Int
            |override def toString(): String
            |""".stripMargin
-    ),
+    )
   )
 
   def implement(completion: String): String =
@@ -205,13 +205,13 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     "implement",
     // assert that `override` is not inserted.
     implement("def implement@@"),
-    implement("def implementMe: Int = ${0:???}"),
+    implement("def implementMe: Int = ${0:???}")
   )
   checkEdit(
     "implement-override",
     // assert that `override` is inserted.
     implement("override def implement@@"),
-    implement("override def implementMe: Int = ${0:???}"),
+    implement("override def implementMe: Int = ${0:???}")
   )
 
   checkEdit(
@@ -232,7 +232,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
       |  }
       |}
     """.stripMargin,
-    filter = _.contains("iterat"),
+    filter = _.contains("iterat")
   )
 
   check(
@@ -253,7 +253,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |override def a: Int
        |""".stripMargin,
     topLines = Some(2),
-    includeDetail = false,
+    includeDetail = false
   )
 
   checkEdit(
@@ -308,8 +308,8 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
            |    def self: a.b.Conflict = ${0:???}
            |  }
            |}
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -341,7 +341,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
            |def selfArg: Option[a.c.Conflict]
            |def selfPath: Inner
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -364,7 +364,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |    def foo: mutable.Set[Int] = ${0:???}
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEditLine(
@@ -385,8 +385,8 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
       scala3PresentationCompilerVersion ->
         """    def foo: scala.collection.mutable.Set[Int] = ${0:???}""",
       "3" ->
-        """    def foo: collection.mutable.Set[Int] = ${0:???}""",
-    ),
+        """    def foo: collection.mutable.Set[Int] = ${0:???}"""
+    )
   )
 
   checkEdit(
@@ -405,7 +405,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |class Main extends JUtil {
        |  def foo: ju.List[Int] = ${0:???}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -430,7 +430,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |  val java = 42
        |  def foo: ju.List[Int] = ${0:???}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEditLine(
@@ -446,7 +446,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
         |""".stripMargin,
     "  def foo@@",
     // Can't use `import java.{util => ju}` because `val ju = 42` is in scope.
-    """  def foo: java.util.List[Int] = ${0:???}""",
+    """  def foo: java.util.List[Int] = ${0:???}"""
   )
 
   checkEdit(
@@ -475,7 +475,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
            |  def foo: java.lang.StringBuilder = ${0:???}
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   checkEditLine(
@@ -490,7 +490,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
         |
         |""".stripMargin,
     "  def foo@@",
-    """  def foo: List[Int] = ${0:???}""".stripMargin,
+    """  def foo: List[Int] = ${0:???}""".stripMargin
   )
 
   checkEditLine(
@@ -512,7 +512,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     compat = Map(
       "3" ->
         """  def foo: Foobar = ${0:???}""".stripMargin
-    ),
+    )
   )
 
   checkEditLine(
@@ -527,7 +527,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
         |
         |""".stripMargin,
     "  def foo@@",
-    """  def foo: JBoolean = ${0:???}""".stripMargin,
+    """  def foo: JBoolean = ${0:???}""".stripMargin
   )
 
   checkEditLine(
@@ -543,7 +543,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
         |
         |""".stripMargin,
     "  def foo@@",
-    """  def foo: Out = ${0:???}""".stripMargin,
+    """  def foo: Out = ${0:???}""".stripMargin
   )
 
   checkEditLine(
@@ -564,7 +564,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     compat = Map(
       "3" ->
         """  def foo: Out = ${0:???}""".stripMargin
-    ),
+    )
   )
 
   checkEditLine(
@@ -584,7 +584,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "    def conflict@@",
-    """    def conflict: Main.this.Out = ${0:???}""".stripMargin,
+    """    def conflict: Main.this.Out = ${0:???}""".stripMargin
   )
 
   check(
@@ -600,7 +600,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """override def hello1: Int
       |""".stripMargin,
-    includeDetail = false,
+    includeDetail = false
   )
 
   check(
@@ -616,7 +616,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """def hello1: Int
       |""".stripMargin,
-    includeDetail = false,
+    includeDetail = false
   )
 
   checkEditLine(
@@ -630,7 +630,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "def hello@@",
-    """def hello(arg: Int): Unit = ${0:???}""".stripMargin,
+    """def hello(arg: Int): Unit = ${0:???}""".stripMargin
   )
 
   checkEditLine(
@@ -648,7 +648,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     compat = Map(
       "3" ->
         """def exist: Set[?] = ${0:???}""".stripMargin
-    ),
+    )
   )
 
   checkEditLine(
@@ -663,7 +663,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "def Apply@@",
-    """override def Apply(tree: Tree): Tree = ${0:???}""".stripMargin,
+    """override def Apply(tree: Tree): Tree = ${0:???}""".stripMargin
   )
 
   checkEditLine(
@@ -680,7 +680,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "def Apply@@",
-    """override def Apply(tree: Tree): Tree = ${0:???}""".stripMargin,
+    """override def Apply(tree: Tree): Tree = ${0:???}""".stripMargin
   )
 
   checkEditLine(
@@ -695,7 +695,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "def Apply@@",
-    """override def Apply(tree: Int): Tree = ${0:???}""".stripMargin,
+    """override def Apply(tree: Int): Tree = ${0:???}""".stripMargin
   )
 
   check(
@@ -709,7 +709,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |  def hello@@
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   checkEditLine(
@@ -723,7 +723,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "val hello@@",
-    "override val hello1: Int = ${0:???}",
+    "override val hello1: Int = ${0:???}"
   )
 
   check(
@@ -738,7 +738,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |""".stripMargin,
     // NOTE(olafur) assert completion items are empty because it's not possible to
     // override concrete vars.
-    "",
+    ""
   )
 
   check(
@@ -753,7 +753,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |""".stripMargin,
     // NOTE(olafur) assert completion items are empty because it's not possible to
     // override concrete vars.
-    "",
+    ""
   )
 
   check(
@@ -775,7 +775,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     compat = Map(
       "3" ->
         "override var hello1: Int"
-    ),
+    )
   )
 
   check(
@@ -803,7 +803,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
            |override val hello2: Int
            |override def hello3: Int
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -822,7 +822,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     compat = Map(
       "3" ->
         "override def hello3: Int"
-    ),
+    )
   )
 
   check(
@@ -835,7 +835,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |   override val hello@@
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -852,7 +852,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     includeDetail = false,
     compat = Map(
       "3" -> "override protected def hello: Int"
-    ),
+    )
   )
 
   check(
@@ -870,7 +870,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     filterText =
       if (scalaVersion.startsWith("3")) "override def hello: Int"
       else
-        "override def hello",
+        "override def hello"
   )
 
   checkEditLine(
@@ -884,7 +884,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "override val hel@@",
-    "override lazy val hello: Int = ${0:???}",
+    "override lazy val hello: Int = ${0:???}"
   )
 
   checkEditLine(
@@ -904,7 +904,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     compat = Map(
       "3" ->
         "override lazy val analyzer: Object = ${0:???}"
-    ),
+    )
   )
 
   checkEditLine(
@@ -918,7 +918,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "val hello@@",
-    "override val hello1: Int = ${0:???}",
+    "override val hello1: Int = ${0:???}"
   )
 
   check(
@@ -934,7 +934,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
     """|hello: Int
        |override def hello: Int
        |""".stripMargin,
-    includeDetail = false,
+    includeDetail = false
   )
 
   check(
@@ -962,7 +962,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
         """|override def overTop: Int
            |overTop: Int
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -979,7 +979,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |override def overTop: Int
        |""".stripMargin,
     includeDetail = false,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   checkEdit(
@@ -999,7 +999,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |class Main extends Val {
        |   override def hello: Int = ${0:???}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1023,7 +1023,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
         """|override def hello1: Int
            |override val hello2: Int
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -1049,7 +1049,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
            |override val hello2: Int
            |override def equals(x$0: Any): Boolean
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -1073,7 +1073,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |class Under extends Over {
        |  def inner: Outer.Inner = ${0:???}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1099,7 +1099,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |  override def close: Unit = ${0:???}
        |}
        |""".stripMargin,
-    filter = (str) => str.contains("def"),
+    filter = (str) => str.contains("def")
   )
 
   checkEdit(
@@ -1125,7 +1125,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |  override def close: Unit = ${0:???}
        |}
        |""".stripMargin,
-    filter = (str) => str.contains("def"),
+    filter = (str) => str.contains("def")
   )
 
   checkEdit(
@@ -1148,7 +1148,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |class Concrete extends Base:
        |  extension (x: Int) override def foo: Int = ${0:???}
        |""".stripMargin,
-    filter = (str) => str.contains("foo"),
+    filter = (str) => str.contains("foo")
   )
 
   checkEdit(
@@ -1170,7 +1170,7 @@ class CompletionOverrideSuite extends BaseCompletionSuite {
        |
        |class Concrete extends Base:
        |  extension (x: Int) def foo: Int = ${0:???}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionParameterHintSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionParameterHintSuite.scala
index bbd9ece2ab7..5eefb741980 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionParameterHintSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionParameterHintSuite.scala
@@ -24,7 +24,7 @@ class CompletionParameterHintSuite extends BaseCompletionSuite {
     """.stripMargin,
     { case Seq(item) =>
       item.getCommand.getCommand == "hello"
-    },
+    }
   )
 
   checkItems(
@@ -37,6 +37,6 @@ class CompletionParameterHintSuite extends BaseCompletionSuite {
     { case Seq(item1, item2) =>
       item1.getCommand == null &&
       item2.getCommand.getCommand == "hello"
-    },
+    }
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionPatternSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionPatternSuite.scala
index 9f94759217f..e00df19bcdf 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionPatternSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionPatternSuite.scala
@@ -18,7 +18,8 @@ class CompletionPatternSuite extends BaseCompletionSuite {
     "3" -> { (s: String) =>
       // In Scala3 wildcard type has been changed from [_] to [?]
       s.replace("Some[_]", "Some[?]")
-    }
+    },
+    "2.11" -> { (s: String) => s.replace("Some(value)", "Some(x)") }
   )
 
   checkEdit(
@@ -35,7 +36,7 @@ class CompletionPatternSuite extends BaseCompletionSuite {
       |    case Some(value)$0 =>
       |  }
       |}""".stripMargin,
-    filter = _.contains("Some(value)"),
+    filter = s => s.contains("Some(value)") || s.contains("Some(x)")
   )
 
   check(
@@ -48,7 +49,7 @@ class CompletionPatternSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|Some(value) scala
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -59,7 +60,7 @@ class CompletionPatternSuite extends BaseCompletionSuite {
       |    case ma@@
       |  }
       |}""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -73,7 +74,7 @@ class CompletionPatternSuite extends BaseCompletionSuite {
     """|None scala
        |Some(value) scala
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -86,7 +87,7 @@ class CompletionPatternSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|Some(value) scala
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
   check(
     "wildcard",
@@ -103,7 +104,7 @@ class CompletionPatternSuite extends BaseCompletionSuite {
         """|Some[?] scala
            |""".stripMargin
     ),
-    topLines = Some(1),
+    topLines = Some(1)
   )
   check(
     "wildcard-ident",
@@ -115,7 +116,7 @@ class CompletionPatternSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|Some[_] scala
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -133,7 +134,7 @@ class CompletionPatternSuite extends BaseCompletionSuite {
         """|Some[?] scala
            |""".stripMargin
     ),
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -146,6 +147,6 @@ class CompletionPatternSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """|Some[_] scala
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSbtLibSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSbtLibSuite.scala
index 5e0f9effbc8..6c05eff7239 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionSbtLibSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionSbtLibSuite.scala
@@ -14,7 +14,7 @@ class CompletionSbtLibSuite extends BaseCompletionSuite {
     """|io.circe
        |io.circul
        |""".stripMargin,
-    filename = "A.sbt",
+    filename = "A.sbt"
   )
 
   check(
@@ -25,7 +25,7 @@ class CompletionSbtLibSuite extends BaseCompletionSuite {
        |circe-core_native0.4_2.13
        |circe-core_native0.4_3
        |""".stripMargin,
-    filename = "A.sbt",
+    filename = "A.sbt"
   )
 
   check(
@@ -39,23 +39,29 @@ class CompletionSbtLibSuite extends BaseCompletionSuite {
        |circe-core_sjs1.0-RC2
        |""".stripMargin,
     filename = "A.sbt",
+    compat = Map(
+      "2.11" ->
+        """|circe-core
+           |circe-core_sjs0.6
+           |""".stripMargin
+    )
   )
 
   check(
-    "version",
+    "version".tag(IgnoreScala211),
     """|val dependency = "io.circe" %% "circe-core_sjs1" % "0.13@@"
        |""".stripMargin,
     """|0.13.0
        |""".stripMargin,
-    filename = "A.sbt",
+    filename = "A.sbt"
   )
 
   checkEdit(
-    "double-percent-edit",
+    "double-percent-edit".tag(IgnoreScala211),
     """|val dependency = "io.circe" %% "circe-core_n@@"
        |""".stripMargin,
     """|val dependency = "io.circe" %% "circe-core_native0.4"
        |""".stripMargin,
-    filename = "A.sbt",
+    filename = "A.sbt"
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionScala3Suite.scala b/tests/cross/src/test/scala/tests/pc/CompletionScala3Suite.scala
index e0c050ee180..b78169b47b6 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionScala3Suite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionScala3Suite.scala
@@ -20,7 +20,7 @@ class CompletionScala3Suite extends BaseCompletionSuite {
        |other = otxxx : Int
        |otxxx: Int
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   check(
@@ -34,7 +34,7 @@ class CompletionScala3Suite extends BaseCompletionSuite {
        |""".stripMargin,
     """|Testing a
        |Testing(): Testing
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -48,7 +48,7 @@ class CompletionScala3Suite extends BaseCompletionSuite {
        |""".stripMargin,
     """|Testing a
        |Testing(a: Int, b: String): Testing
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   // https://github.com/scalameta/metals/issues/2810
@@ -69,7 +69,7 @@ class CompletionScala3Suite extends BaseCompletionSuite {
        |""".stripMargin,
     """|map[B](f: A => B): Foo[B]
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   checkEdit(
@@ -86,6 +86,6 @@ class CompletionScala3Suite extends BaseCompletionSuite {
        |object Bar extends Foo:
        |  def foo: String = ${0:???}
        |""".stripMargin,
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionScalaCliSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionScalaCliSuite.scala
index 422036df741..813210f0a96 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionScalaCliSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionScalaCliSuite.scala
@@ -3,13 +3,18 @@ package tests.pc
 import tests.BaseCompletionSuite
 
 class CompletionScalaCliSuite extends BaseCompletionSuite {
+
+  override protected def ignoreScalaVersion: Option[IgnoreScalaVersion] = Some(
+    IgnoreScala211
+  )
+
   check(
     "simple",
     """|//> using lib "io.cir@@
        |package A
        |""".stripMargin,
     """|io.circe
-       |io.circul""".stripMargin,
+       |io.circul""".stripMargin
   )
 
   checkEdit(
@@ -25,7 +30,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
        |// //> using lib ???
        |//> using lib io.circe::circe-core_native0.4
        |package A
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -36,7 +41,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|circe-core_native0.4_2.12
        |circe-core_native0.4_2.13
        |circe-core_native0.4_3
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -44,7 +49,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "io.circe::circe-core_sjs1:0.14.1@@"
        |package A
        |""".stripMargin,
-    "0.14.1",
+    "0.14.1"
   )
 
   // We don't to add `::` before version if `sjs1` is specified
@@ -55,7 +60,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|//> using lib "io.circe::circe-core_sjs1:0.14.1"
        |package A
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -63,7 +68,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "io.circe::circe-core:0.14.0", "io.circe::circe-core_na@@"
        |package A
        |""".stripMargin,
-    "circe-core_native0.4",
+    "circe-core_native0.4"
   )
 
   check(
@@ -72,14 +77,14 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
       """|//> using lib "io.circe:circe-core_na@@
          |
          |""".stripMargin,
-      "script.sc.scala",
+      "script.sc.scala"
     ),
     """|circe-core_native0.4_2.12
        |circe-core_native0.4_2.13
        |circe-core_native0.4_3
        |""".stripMargin,
     filename = "script.sc.scala",
-    enablePackageWrap = false,
+    enablePackageWrap = false
   )
 
   check(
@@ -87,7 +92,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "io.circe::circe-core:0.14.0"@@
        |package A
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -95,7 +100,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "io.circe::circe-co @@
        |package A
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -114,7 +119,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using plugin "org.polyvariant:::@@
        |package A
        |""".stripMargin,
-    "better-tostring",
+    "better-tostring"
   )
 
   checkEdit(
@@ -125,7 +130,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "co.fs2::fs2-core::3.4.0"
        |package A
        |""".stripMargin,
-    filter = _.startsWith("3.4"),
+    filter = _.startsWith("3.4")
   )
 
   check(
@@ -134,7 +139,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
        |package A
        |""".stripMargin,
     """|io.circe
-       |io.circul""".stripMargin,
+       |io.circul""".stripMargin
   )
 
   check(
@@ -142,7 +147,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using libs "io.circe::circe-core:0.14.0", "io.circe::circe-core_na@@"
        |package A
        |""".stripMargin,
-    "circe-core_native0.4",
+    "circe-core_native0.4"
   )
 
   check(
@@ -154,7 +159,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
        |0.7.2
        |0.7.1
        |0.7.0
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -165,7 +170,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|3.7.1
        |3.7.0
        |""".stripMargin,
-    filter = _.startsWith("3.7"),
+    filter = _.startsWith("3.7")
   )
 
   checkEdit(
@@ -176,7 +181,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "com.outr::scribe-cats::3.7.1"
        |package A
        |""".stripMargin,
-    filter = _.startsWith("3.7.1"),
+    filter = _.startsWith("3.7.1")
   )
 
   check(
@@ -186,7 +191,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|3.7.1
        |3.7.0
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -197,7 +202,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "com.outr::scribe-cats::3.7.1"
        |package A
        |""".stripMargin,
-    filter = _.startsWith("3.7.1"),
+    filter = _.startsWith("3.7.1")
   )
 
   check(
@@ -205,7 +210,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "com.outr:scribe-cats_3::@@"
        |package A
        |""".stripMargin,
-    "",
+    ""
   )
 
   checkEdit(
@@ -216,7 +221,7 @@ class CompletionScalaCliSuite extends BaseCompletionSuite {
     """|//> using lib "com.outr:scribe-cats_3:3.7.1"
        |package A
        |""".stripMargin,
-    filter = _.startsWith("3.7.1"),
+    filter = _.startsWith("3.7.1")
   )
 
   private def scriptWrapper(code: String, filename: String): String =
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionScaladocSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionScaladocSuite.scala
index aeb42b0a129..de7ae73393c 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionScaladocSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionScaladocSuite.scala
@@ -12,7 +12,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
       |  def test(x: Int, y: Int): Int = ???
       |}""".stripMargin,
     """|/** */Scaladoc Comment
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -23,7 +23,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
       |  case class(x: Int) {}
       |}""".stripMargin,
     """|/** */Scaladoc Comment
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   // see: https://github.com/scalameta/metals/issues/1941
@@ -34,7 +34,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
       |  /**@@
       |}""".stripMargin,
     """|/** */Scaladoc Comment
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -56,7 +56,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |  def test1(param1: Int, param2: Int): Int = ???
        |  def test2(param1: Int, param2: Int, param3: Int): Int = ???
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -77,7 +77,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |  class Test1(param1: Int, param2: Int) {}
        |  class Test2(param1: Int, param2: Int, param3: Int) {}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -93,7 +93,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    */
        |  val x = 1
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -111,7 +111,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |  // do not calculate scaladoc based on the method
        |  def test(x: Int): Int = ???
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -134,7 +134,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    def nest(y: Int) = ???
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -156,7 +156,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    case class C(y: Int) {}
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -178,7 +178,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    case class C(y: Int) {}
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -198,7 +198,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |  def test1: Int = ???
        |  def test2(param1: Int, param2: Int, param3: Int): Int = ???
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -219,7 +219,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    */
        |  def test(param1: Int, param2: Int): Unit = ???
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -240,7 +240,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    */
        |  def test(param1: Int, param2: Int) = {}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -262,7 +262,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    */
        |  def test[T: Ordering](x: T, y: T): T = if(x < y) x else y
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -281,7 +281,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    */
        |  case class Test[T: Ordering](x: T, y: T) {}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -301,7 +301,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    */
        |  case class Test(a: Int, b: String)(c: Long)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -314,7 +314,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    * $0
        |    */
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -331,7 +331,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |    * @return
        |    */
        |  def foo(param1: Int): Int = ???
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -346,7 +346,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |  * @return
        |  */
        |def foo(param1: Int)(using String): Int = ???
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -362,7 +362,7 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |  * @return
        |  */
        |def foo(param1: Int)(using s: String): Int = ???
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -386,6 +386,6 @@ class CompletionScaladocSuite extends BaseCompletionSuite {
        |
        |  def r(a: Int) = ???
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSnippetNegSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSnippetNegSuite.scala
index 0abfb7b5ae3..a9d902f1701 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionSnippetNegSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionSnippetNegSuite.scala
@@ -29,8 +29,8 @@ class CompletionSnippetNegSuite extends BaseCompletionSuite {
            |unapplySeq
            |apply
            |""".stripMargin,
-      "3" -> "apply",
-    ),
+      "3" -> "apply"
+    )
   )
 
   checkSnippet(
@@ -43,7 +43,7 @@ class CompletionSnippetNegSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|println()
        |println
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkSnippet(
@@ -63,7 +63,7 @@ class CompletionSnippetNegSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "3" -> "toString"
-    ),
+    )
   )
 
   checkSnippet(
@@ -75,7 +75,7 @@ class CompletionSnippetNegSuite extends BaseCompletionSuite {
     // It's expected to have two separate results, one for `object IndexedSeq` and one for `type IndexedSeq[T]`.
     """|IndexedSeq
        |IndexedSeq
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSnippetSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSnippetSuite.scala
index 41cea4f68c7..7289d11420e 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionSnippetSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionSnippetSuite.scala
@@ -23,8 +23,8 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
            |""".stripMargin,
       "3" ->
         """|apply($0)
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkSnippet(
@@ -37,7 +37,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|println()
        |println($0)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkSnippet(
@@ -49,7 +49,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|head
        |headOption
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkSnippet(
@@ -64,7 +64,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|now()
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   checkSnippet(
@@ -88,7 +88,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
       "3" ->
         """|toString
            |""".stripMargin
-    ),
+    )
   )
 
   checkSnippet(
@@ -103,7 +103,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     """|MyType
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkSnippet(
@@ -119,7 +119,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     """|MyType
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkSnippet(
@@ -138,7 +138,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         """|IndexedSeq[$0]
            |IndexedSeq
            |""".stripMargin
-    ),
+    )
   )
 
   checkSnippet(
@@ -148,7 +148,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |  val bar = doSomethi@@
         |}
         |""".stripMargin,
-    "doSomething($0)",
+    "doSomething($0)"
   )
 
   checkSnippet(
@@ -162,7 +162,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|IndexedSeq
        |IndexedSeq[$0] {}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkSnippet(
@@ -186,8 +186,8 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
            |ArrayDeque
            |ArrayDeque
            |ArrayDequeOps
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkSnippet(
@@ -203,7 +203,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         """|SimpleFileVisitor[$0]
            |SimpleFileVisitor
            |""".stripMargin
-    ),
+    )
   )
 
   checkSnippet(
@@ -225,8 +225,8 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         """|Iterable[$0] {}
            |IterableOnce[$0] {}
            |Iterable
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkSnippet(
@@ -248,8 +248,8 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         """|Iterable[$0]
            |IterableOnce[$0]
            |Iterable
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkSnippet(
@@ -271,8 +271,8 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         """|Iterable[$0]
            |IterableOnce[$0]
            |Iterable
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkSnippet(
@@ -287,7 +287,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|Upper
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEditLine(
@@ -298,7 +298,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "trailing@@()",
-    "trailing()",
+    "trailing()"
   )
 
   checkEditLine(
@@ -309,7 +309,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "trailing@@ { }",
-    "trailing { }",
+    "trailing { }"
   )
 
   checkEditLine(
@@ -320,7 +320,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "trailing@@{ }",
-    "trailing{ }",
+    "trailing{ }"
   )
 
   checkEditLine(
@@ -332,7 +332,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "trailing@@ _",
-    "trailing _",
+    "trailing _"
   )
 
   checkEditLine(
@@ -342,7 +342,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "List(1).flatte@@",
-    "List(1).flatten",
+    "List(1).flatten"
   )
 
   checkEditLine(
@@ -353,7 +353,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "scala.util.Try@@(1)",
-    "scala.util.Try(1)",
+    "scala.util.Try(1)"
   )
 
   checkEditLine(
@@ -364,7 +364,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |""".stripMargin,
     "scala.util.Tr@@(1)",
     "scala.util.Try(1)",
-    filter = str => str.contains("Try"),
+    filter = str => str.contains("Try")
   )
 
   checkSnippet(
@@ -374,6 +374,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|Try
+       |PropertiesTrait
        |Either
        |control
        |""".stripMargin,
@@ -383,13 +384,11 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         """|Try
            |Try($0)
            |""".stripMargin,
-      "2.12" ->
-        """|Try
-           |PropertiesTrait
-           |Either
-           |control
-           |""".stripMargin,
-    ),
+      "2.13" -> """|Try
+                   |Either
+                   |control
+                   |""".stripMargin
+    )
   )
 
   checkSnippet(
@@ -408,7 +407,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         """|Try
            |Try($0)
            |""".stripMargin
-    ),
+    )
   )
 
   checkEditLine(
@@ -420,7 +419,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |""".stripMargin,
     "out.+@@=('a')",
     "out.++==('a')",
-    filter = _.contains("++=(s: String)"),
+    filter = _.contains("++=(s: String)")
   )
 
   checkSnippet(
@@ -445,7 +444,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
            |Widget($0) - (name: String, age: Int): Widget
            |""".stripMargin
     ),
-    includeDetail = true,
+    includeDetail = true
   )
 
   checkSnippet(
@@ -463,7 +462,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         """|Widget -  example
            |""".stripMargin
     ),
-    includeDetail = true,
+    includeDetail = true
   )
 
   // https://github.com/scalameta/metals/issues/4004
@@ -480,7 +479,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |  extension (s: String)
         |    def bar = 0
         |  val bar = "abc".bar
-    """.stripMargin,
+    """.stripMargin
   )
 
   // https://github.com/scalameta/metals/issues/4004
@@ -497,7 +496,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |  extension (s: String)
         |    def bar() = 0
         |  val bar = "abc".bar()
-    """.stripMargin,
+    """.stripMargin
   )
 
   checkEdit(
@@ -517,7 +516,7 @@ class CompletionSnippetSuite extends BaseCompletionSuite {
         |object O {
         |  val f : `x-x`.AAA
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
index ec4814acff6..2727939d0ad 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
@@ -32,9 +32,9 @@ class CompletionSuite extends BaseCompletionSuite {
            |List - java.util
            |List - scala.collection.immutable
            |List[A](elems: A*): CC[A]
-           |""".stripMargin,
+           |""".stripMargin
     ),
-    topLines = Some(5),
+    topLines = Some(5)
   )
 
   check(
@@ -45,7 +45,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |}""".stripMargin,
     """
       |empty[A]: List[A]
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   check(
@@ -55,7 +55,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |  "".stripSu@@
       |}""".stripMargin,
     """|stripSuffix(suffix: String): String
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -68,7 +68,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |  new Foo[Int].ident@@
       |}""".stripMargin,
     """|identity[B >: Int](a: B): B
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -81,7 +81,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |  new Foo[Int].ident@@
       |}""".stripMargin,
     """|identity(a: Int): Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -93,6 +93,9 @@ class CompletionSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|getOrElse[V1 >: String](key: Int, default: => V1): V1
        |""".stripMargin,
+    compat = Map(
+      "2.11" -> "getOrElse[B1 >: String](key: Int, default: => B1): B1"
+    )
   )
 
   check(
@@ -109,9 +112,42 @@ class CompletionSuite extends BaseCompletionSuite {
        |override def toString(): String
        |override def clone(): Object
        |override def finalize(): Unit
-       |""".stripMargin,
+       |""".stripMargin
   )
 
+  val dot211: String =
+    """|apply[A](xs: A*): List[A]
+       |canBuildFrom[A]: CanBuildFrom[List.Coll,A,List[A]]
+       |empty[A]: List[A]
+       |newBuilder[A]: Builder[A,List[A]]
+       |GenericCanBuildFrom scala.collection.generic.GenTraversableFactory
+       |ReusableCBF: List.GenericCanBuildFrom[Nothing]
+       |concat[A](xss: Traversable[A]*): List[A]
+       |fill[A](n: Int)(elem: => A): List[A]
+       |fill[A](n1: Int, n2: Int)(elem: => A): List[List[A]]
+       |fill[A](n1: Int, n2: Int, n3: Int)(elem: => A): List[List[List[A]]]
+       |fill[A](n1: Int, n2: Int, n3: Int, n4: Int)(elem: => A): List[List[List[List[A]]]]
+       |fill[A](n1: Int, n2: Int, n3: Int, n4: Int, n5: Int)(elem: => A): List[List[List[List[List[A]]]]]
+       |iterate[A](start: A, len: Int)(f: A => A): List[A]
+       |range[T: Integral](start: T, end: T): List[T]
+       |range[T: Integral](start: T, end: T, step: T): List[T]
+       |tabulate[A](n: Int)(f: Int => A): List[A]
+       |tabulate[A](n1: Int, n2: Int)(f: (Int, Int) => A): List[List[A]]
+       |tabulate[A](n1: Int, n2: Int, n3: Int)(f: (Int, Int, Int) => A): List[List[List[A]]]
+       |tabulate[A](n1: Int, n2: Int, n3: Int, n4: Int)(f: (Int, Int, Int, Int) => A): List[List[List[List[A]]]]
+       |tabulate[A](n1: Int, n2: Int, n3: Int, n4: Int, n5: Int)(f: (Int, Int, Int, Int, Int) => A): List[List[List[List[List[A]]]]]
+       |unapplySeq[A](x: List[A]): Some[List[A]]
+       |+(other: String): String
+       |formatted(fmtstr: String): String
+       |asInstanceOf[T0]: T0
+       |equals(obj: Any): Boolean
+       |getClass(): Class[_]
+       |hashCode(): Int
+       |isInstanceOf[T0]: Boolean
+       |synchronized[T0](x$1: T0): T0
+       |toString(): String
+       |""".stripMargin
+
   val dot213: String =
     """|empty[A]: List[A]
        |from[B](coll: IterableOnce[B]): List[B]
@@ -231,6 +267,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |toString(): String
        |""".stripMargin,
     compat = Map(
+      "2.11" -> dot211,
       "2.13.5" -> dot213,
       "2.13.6" -> dot213,
       "2.13" -> dot2137,
@@ -277,10 +314,10 @@ class CompletionSuite extends BaseCompletionSuite {
            |wait(): Unit
            |wait(x$0: Long): Unit
            |wait(x$0: Long, x$1: Int): Unit
-           |""".stripMargin,
+           |""".stripMargin
       // wait(x$0: Long) won't be replaced with timeoutMills here
       // but it will be replaced in `completionItem/resolve`
-    ),
+    )
   )
 
   check(
@@ -296,7 +333,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "3" -> "XtensionMethod(a: Int): XtensionMethod"
-    ),
+    )
   )
 
   check(
@@ -307,7 +344,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |  uService@@
       |}""".stripMargin,
     """|userService: Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -340,7 +377,7 @@ class CompletionSuite extends BaseCompletionSuite {
            |CertPathBuilderException - java.security.cert
            |PKIXCertPathBuilderResult - java.security.cert
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -365,8 +402,8 @@ class CompletionSuite extends BaseCompletionSuite {
       "3" ->
         """|TrieMap scala.collection.concurrent
            |TrieMap[K, V](elems: (K, V)*): CC[K, V]
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -375,7 +412,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |import scala.collection.conc@@
       |""".stripMargin,
     """|concurrent scala.collection
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -388,7 +425,7 @@ class CompletionSuite extends BaseCompletionSuite {
       "3" ->
         """|*
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -401,7 +438,7 @@ class CompletionSuite extends BaseCompletionSuite {
       "3" ->
         """|*
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -415,6 +452,11 @@ class CompletionSuite extends BaseCompletionSuite {
        |AsJavaConverters - scala.collection.convert
        |""".stripMargin,
     compat = Map(
+      "2.11" ->
+        """|JavaConverters - scala.collection
+           |JavaConversions - scala.collection
+           |JavaConversions - scala.concurrent
+           |""".stripMargin,
       "2.13" -> """|JavaConverters - scala.collection
                    |AsJavaConsumer - scala.jdk.FunctionWrappers
                    |JavaConversions - scala.concurrent
@@ -436,8 +478,8 @@ class CompletionSuite extends BaseCompletionSuite {
                 |AsJavaLongConsumer - scala.jdk.FunctionWrappers
                 |FromJavaBiConsumer - scala.jdk.FunctionWrappers
                 |FromJavaIntConsumer - scala.jdk.FunctionWrappers
-                |""".stripMargin,
-    ),
+                |""".stripMargin
+    )
   )
 
   check(
@@ -446,7 +488,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |import Paths@@
       |""".stripMargin,
     """|Paths - java.nio.file
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -455,7 +497,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |import Catch@@
       |""".stripMargin,
     """|Catch - scala.util.control.Exception
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -474,7 +516,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |XPathNodes - javax.xml.xpath
        |PathMatcher - java.nio.file
        |XPathResult - org.w3c.dom.xpath
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -483,7 +525,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |import scala.collection.AbstractIterator@@
       |""".stripMargin,
     """|AbstractIterator scala.collection
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -497,7 +539,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |ParameterMetaData - java.sql
        |ResultSetMetaData - java.sql
        |RowSetMetaDataImpl - javax.sql.rowset
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -512,7 +554,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     """|Inner - a.Outer
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -534,8 +576,8 @@ class CompletionSuite extends BaseCompletionSuite {
        * might have been a bug in presentation compiler that we were using
        * https://github.com/scalameta/metals/issues/2546
        */
-      "2.13" -> "Inner a.Outer",
-    ),
+      "2.13" -> "Inner a.Outer"
+    )
   )
 
   check(
@@ -554,7 +596,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """Files java.nio.file
       |Files - a.Outer
-      |""".stripMargin,
+      |""".stripMargin
   )
 
   check(
@@ -570,8 +612,9 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     includeCommitCharacter = true,
     compat = Map(
+      "2.11" -> "empty[A, B]: Map[A,B] (commit: '')",
       "3" -> "empty[K, V]: Map[K, V] (commit: '')" // space between K V
-    ),
+    )
   )
 
   check(
@@ -585,7 +628,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|identity[A](x: A): A (commit: '')
        |""".stripMargin,
-    includeCommitCharacter = true,
+    includeCommitCharacter = true
   )
 
   check(
@@ -653,18 +696,18 @@ class CompletionSuite extends BaseCompletionSuite {
            |Function21 scala
            |Function22 scala
            |""".stripMargin
-    ),
+    )
   )
 
   check(
-    "sam",
+    "sam".tag(IgnoreScala211),
     """
       |object A {
       |  new java.util.ArrayList[String]().forEach(p => p.toChar@@)
       |}
     """.stripMargin,
     """|toCharArray(): Array[Char]
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -675,7 +718,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|concat[T: ClassTag](xss: Array[T]*): Array[T]
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -689,7 +732,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|test[T: Ordering: Numeric](x: T): T
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -707,7 +750,7 @@ class CompletionSuite extends BaseCompletionSuite {
         """|readAttributes(path: Path, attributes: String, options: LinkOption*): java.util.Map[String, Object]
            |readAttributes[A <: BasicFileAttributes](path: Path, type: Class[A], options: LinkOption*): A
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -721,7 +764,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|thisIsLocal: Int
-       |""".stripMargin,
+       |""".stripMargin
   )
   check(
     "local1",
@@ -743,8 +786,8 @@ class CompletionSuite extends BaseCompletionSuite {
     compat = Map(
       "3" -> """|DelayedLazyVal scala.concurrent
                 |DelayedLazyVal[T](f: () => T, body: => Unit)(exec: ExecutionContext): DelayedLazyVal[T]""".stripMargin,
-      "2.13" -> "DelayedLazyVal - scala.concurrent",
-    ),
+      "2.13" -> "DelayedLazyVal - scala.concurrent"
+    )
   )
 
   check(
@@ -764,7 +807,7 @@ class CompletionSuite extends BaseCompletionSuite {
     """.stripMargin,
     """|prefixbb: Int
        |prefixaa: Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -779,8 +822,8 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       scala3PresentationCompilerVersion -> "incrementThisType(): A.this.type",
-      "3" -> "incrementThisType(): (A.this : singleton.A)",
-    ),
+      "3" -> "incrementThisType(): (A.this : singleton.A)"
+    )
   )
 
   check(
@@ -803,6 +846,12 @@ class CompletionSuite extends BaseCompletionSuite {
     postProcessObtained = _.replace("Float", "Double"),
     stableOrder = false,
     compat = Map(
+      "2.11" ->
+        """|until(end: Double): Range.Partial[Double,NumericRange[Double]]
+           |until(end: Double, step: Double): NumericRange.Exclusive[Double]
+           |until(end: Long): NumericRange.Exclusive[Long]
+           |until(end: Long, step: Long): NumericRange.Exclusive[Long]
+           |""".stripMargin,
       "2.13" ->
         """|until(end: Int): Range
            |until(end: Int, step: Int): Range
@@ -814,8 +863,8 @@ class CompletionSuite extends BaseCompletionSuite {
            |until(end: Int, step: Int): Range
            |until(end: T): Exclusive[T]
            |until(end: T, step: T): Exclusive[T]
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   def classFoo: String =
@@ -840,8 +889,8 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "3" -> "selectDynamic(field: String): Foo",
-      ">=3.4.0-RC1-bin-20231004-hash-NIGHTLY" -> "banana: Int",
-    ),
+      ">=3.4.0-RC1-bin-20231004-hash-NIGHTLY" -> "banana: Int"
+    )
   )
 
   check(
@@ -855,8 +904,8 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "3" -> "selectDynamic(field: String): Foo",
-      ">=3.4.0-RC1-bin-20231004-hash-NIGHTLY" -> "banana: Int",
-    ),
+      ">=3.4.0-RC1-bin-20231004-hash-NIGHTLY" -> "banana: Int"
+    )
   )
 
   check(
@@ -871,8 +920,8 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "3" -> "selectDynamic(field: String): Foo",
-      ">=3.4.0-RC1-bin-20231004-hash-NIGHTLY" -> "banana: Int",
-    ),
+      ">=3.4.0-RC1-bin-20231004-hash-NIGHTLY" -> "banana: Int"
+    )
   )
 
   check(
@@ -886,8 +935,8 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "3" -> "selectDynamic(field: String): Foo",
-      ">=3.4.0-RC1-bin-20231004-hash-NIGHTLY" -> "banana: Int",
-    ),
+      ">=3.4.0-RC1-bin-20231004-hash-NIGHTLY" -> "banana: Int"
+    )
   )
 
   check(
@@ -899,7 +948,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|selectDynamic(field: String): Foo
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -915,7 +964,7 @@ class CompletionSuite extends BaseCompletionSuite {
         """|ListBuffer[A] - scala.collection.mutable
            |ListBuffer - scala.collection.mutable
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -931,7 +980,7 @@ class CompletionSuite extends BaseCompletionSuite {
         """|ListBuffer[A] - scala.collection.mutable
            |ListBuffer - scala.collection.mutable
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -953,7 +1002,7 @@ class CompletionSuite extends BaseCompletionSuite {
            |Iterable[+A] = Iterable
            |IterableOnce[+A] = IterableOnce
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -966,6 +1015,7 @@ class CompletionSuite extends BaseCompletionSuite {
     """|Some(value) scala
        |""".stripMargin,
     compat = Map(
+      "2.11" -> "Some(x) scala",
       "3" ->
         """|Some(value) scala
            |Some scala
@@ -974,7 +1024,7 @@ class CompletionSuite extends BaseCompletionSuite {
            |SomeToExpr[T: Type: ToExpr]: SomeToExpr[T]
            |SomeFromExpr[T](using Type[T], FromExpr[T]): SomeFromExpr[T]
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -1001,8 +1051,8 @@ class CompletionSuite extends BaseCompletionSuite {
            |SomeToExpr[T: Type: ToExpr]: SomeToExpr[T]
            |SomeFromExpr - scala.quoted.FromExpr
            |SomeFromExpr[T](using Type[T], FromExpr[T]): SomeFromExpr[T]
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -1015,7 +1065,7 @@ class CompletionSuite extends BaseCompletionSuite {
     """|None scala
        |NoManifest scala.reflect
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -1036,12 +1086,17 @@ class CompletionSuite extends BaseCompletionSuite {
            |Seq scala.collection.immutable
            |Set scala.collection.immutable
            |""".stripMargin,
+      "2.11" ->
+        """|Some(x) scala
+           |Seq scala.collection
+           |Set scala.collection.immutable
+           |""".stripMargin,
       "3" ->
         """|Some(value) scala
            |Seq scala.collection.immutable
            |Set scala.collection.immutable
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -1060,8 +1115,8 @@ class CompletionSuite extends BaseCompletionSuite {
            |""".stripMargin,
       "3" ->
         """|Some[?] scala
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -1087,7 +1142,7 @@ class CompletionSuite extends BaseCompletionSuite {
         """|NotString: Int
            |Number: Regex
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -1100,7 +1155,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|Number: Regex
        |""".stripMargin,
-    topLines = Option(1),
+    topLines = Option(1)
   )
 
   check(
@@ -1113,7 +1168,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |""".stripMargin,
     """|NotImplementedError scala
        |""".stripMargin,
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -1123,7 +1178,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     // assert that `_root_` is not a completion item.
-    "",
+    ""
   )
 
   check(
@@ -1135,7 +1190,7 @@ class CompletionSuite extends BaseCompletionSuite {
     """substring(beginIndex: Int): String
       |substring(beginIndex: Int, endIndex: Int): String
       |""".stripMargin,
-    filterText = "substring",
+    filterText = "substring"
   )
 
   check(
@@ -1147,7 +1202,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |  }
         |}
         |""".stripMargin,
-    "myError: String",
+    "myError: String"
   )
 
   check(
@@ -1166,7 +1221,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |printnnn: String
        |print(x: Any): Unit
        |""".stripMargin,
-    topLines = Some(4),
+    topLines = Some(4)
   )
 
   check(
@@ -1179,7 +1234,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|getTimeStamp: Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1203,7 +1258,7 @@ class CompletionSuite extends BaseCompletionSuite {
       "3" ->
         """|intNumber: Int
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -1221,7 +1276,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |yeti1: Int
        |yeti2: Int
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   check(
@@ -1235,7 +1290,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|max[T](x: T, y: T)(using ord: Ordered[T]): T
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1248,7 +1303,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|max[T](x: T, y: T)(using Ordered[T]): T
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1286,8 +1341,8 @@ class CompletionSuite extends BaseCompletionSuite {
            |experimental scala.languageFeature
            |implicitConversions scala.languageFeature
            |postfixOps scala.languageFeature
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -1307,7 +1362,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |%(x: Char): Int
        |%(x: Double): Double
        |""".stripMargin,
-    topLines = Some(10),
+    topLines = Some(10)
   )
 
   check(
@@ -1328,7 +1383,7 @@ class CompletionSuite extends BaseCompletionSuite {
     """|fooB: String
        |fooA: String
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   // issues with scala 3 https://github.com/lampepfl/dotty/pull/13515
@@ -1348,7 +1403,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |fooC: Int
        |foo: String
        |""".stripMargin,
-    topLines = Some(4),
+    topLines = Some(4)
   )
 
   checkEdit(
@@ -1362,7 +1417,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |    .map($0)
        |}""".stripMargin,
     filter = _.contains("map["),
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
   checkEdit(
@@ -1383,7 +1438,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |     a
       |  }
       |}""".stripMargin,
-    filter = _.startsWith("toInt:"),
+    filter = _.startsWith("toInt:")
   )
 
   checkItems(
@@ -1397,7 +1452,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  }
        |}
        |""".stripMargin,
-    _.nonEmpty,
+    _.nonEmpty
   )
 
   check(
@@ -1410,7 +1465,7 @@ class CompletionSuite extends BaseCompletionSuite {
     """|Foo x
        |bar: Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -1423,7 +1478,7 @@ class CompletionSuite extends BaseCompletionSuite {
     """|Foo x
        |bar: Int
        |""".stripMargin,
-    topLines = Some(2),
+    topLines = Some(2)
   )
 
   check(
@@ -1441,7 +1496,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |Foo x
        |bar: Int
        |""".stripMargin,
-    topLines = Some(4),
+    topLines = Some(4)
   )
 
   check(
@@ -1458,7 +1513,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |bar: Int
        |baz: Int
        |""".stripMargin,
-    topLines = Some(3),
+    topLines = Some(3)
   )
 
   checkEdit(
@@ -1475,7 +1530,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |		42.toInt
         |}
         |""".stripMargin,
-    filter = _.startsWith("toInt"),
+    filter = _.startsWith("toInt")
   )
 
   check(
@@ -1485,7 +1540,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |  errored.@@
         |}
         |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -1494,7 +1549,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |  scala.coll@@
         |}
         |""".stripMargin,
-    "collection scala",
+    "collection scala"
   )
 
   check(
@@ -1503,7 +1558,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |  val a : scala.coll@@
         |}
         |""".stripMargin,
-    "collection scala",
+    "collection scala"
   )
 
   check(
@@ -1512,7 +1567,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |  new scala.coll@@
         |}
         |""".stripMargin,
-    "collection scala",
+    "collection scala"
   )
 
   check(
@@ -1527,11 +1582,11 @@ class CompletionSuite extends BaseCompletionSuite {
       "2" ->
         """|scala _root_
            |""".stripMargin
-    ),
+    )
   )
 
   check(
-    "class-members-trait-issue",
+    "class-members-trait-issue".tag(IgnoreScala211),
     s"""|package x
         |class Foo(
         |  first: java.util.List[Int],
@@ -1547,7 +1602,7 @@ class CompletionSuite extends BaseCompletionSuite {
       "2" ->
         """|first: List[Int]
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -1566,7 +1621,7 @@ class CompletionSuite extends BaseCompletionSuite {
         """|Foo `object-at-type-pos`
            |""".stripMargin
     ),
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -1578,7 +1633,7 @@ class CompletionSuite extends BaseCompletionSuite {
       |  }
       |}""".stripMargin,
     "",
-    filter = _.startsWith("_"),
+    filter = _.startsWith("_")
   )
 
   check(
@@ -1588,7 +1643,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     "get: Int",
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   check(
@@ -1608,7 +1663,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |  val foo = ddddd.a@@
         |}""".stripMargin,
     "add(d: => `t-t`): `B-A`.Foo[`B-A`.`x-x`]",
-    topLines = Some(1),
+    topLines = Some(1)
   )
 
   // In Scala 3 we get: (x$1 : (String, Unit)) @unchecked scala
@@ -1622,7 +1677,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  } yield abc
        |}
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -1634,7 +1689,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  } yield abc@@
        |}
        |""".stripMargin,
-    "abcCURSORde: Unit",
+    "abcCURSORde: Unit"
   )
 
   check(
@@ -1648,7 +1703,7 @@ class CompletionSuite extends BaseCompletionSuite {
     compat = Map(
       "3" -> "TTT[A <: Int]"
     ),
-    includeDetail = false,
+    includeDetail = false
   )
 
   check(
@@ -1661,7 +1716,7 @@ class CompletionSuite extends BaseCompletionSuite {
     "TTT[A] = O.TTT",
     compat = Map(
       "3" -> "TTT[A <: Int] = List[A]"
-    ),
+    )
   )
 
   check(
@@ -1672,7 +1727,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "TTT[A <: Int]",
-    includeDetail = false,
+    includeDetail = false
   )
 
   check(
@@ -1683,7 +1738,7 @@ class CompletionSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     "TTT[K <: Int]",
-    includeDetail = false,
+    includeDetail = false
   )
 
   check(
@@ -1693,7 +1748,7 @@ class CompletionSuite extends BaseCompletionSuite {
         | val t: TT@@
         |}
         |""".stripMargin,
-    "TTT[K <: Int] = [V] =>> Map[K, V]",
+    "TTT[K <: Int] = [V] =>> Map[K, V]"
   )
 
   check(
@@ -1706,7 +1761,7 @@ class CompletionSuite extends BaseCompletionSuite {
     "TTT<: O.TTT",
     compat = Map(
       "3" -> "TTT <: Int"
-    ),
+    )
   )
 
   check(
@@ -1724,7 +1779,7 @@ class CompletionSuite extends BaseCompletionSuite {
            |AClass class-with-params.O
            |AbstractTypeClassManifest - scala.reflect.ClassManifestFactory
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -1736,7 +1791,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension (x: Fo@@)
        |""".stripMargin,
     """|Foo extension-definition-scope
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1748,7 +1803,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|ListBuffer[A] - scala.collection.mutable
        |ListBuffer - scala.collection.mutable
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1760,7 +1815,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension [A <: Fo@@]
        |""".stripMargin,
     """|Foo extension-definition-type-parameter
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1772,7 +1827,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|ListBuffer[A] - scala.collection.mutable
        |ListBuffer - scala.collection.mutable
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1784,7 +1839,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension (using Fo@@)
        |""".stripMargin,
     """|Foo extension-definition-using-param-clause
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1796,7 +1851,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension (x: Int)(using Fo@@)
        |""".stripMargin,
     """|Foo extension-definition-mix-1
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1808,7 +1863,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension (using Fo@@)(x: Int)(using Foo)
        |""".stripMargin,
     """|Foo extension-definition-mix-2
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1820,7 +1875,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension (using Foo)(x: Int)(using Fo@@)
        |""".stripMargin,
     """|Foo extension-definition-mix-3
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1832,7 +1887,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension [A](x: Fo@@)
        |""".stripMargin,
     """|Foo extension-definition-mix-4
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1844,7 +1899,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension [A](using Fo@@)(x: Int)
        |""".stripMargin,
     """|Foo extension-definition-mix-5
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1856,7 +1911,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension [A](using Foo)(x: Fo@@)
        |""".stripMargin,
     """|Foo extension-definition-mix-6
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1868,7 +1923,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension [A](using Foo)(x: Fo@@)(using Foo)
        |""".stripMargin,
     """|Foo extension-definition-mix-7
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1881,7 +1936,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension (x: Test.TestSel@@)
        |""".stripMargin,
     """|TestSelect extension-definition-select.Test
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1894,7 +1949,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  extension (using Int)(x: Test.TestSel@@)
        |""".stripMargin,
     """|TestSelect extension-definition-select-mix-1.Test
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -1908,7 +1963,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|TestSelect[T] extension-definition-select-mix-2.Test
        |TestSelect extension-definition-select-mix-2.Test
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1918,7 +1973,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|object O:
        |  val a = List.apply($0)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1934,7 +1989,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  /* $0 */
        |  def f = 1
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -1947,7 +2002,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  printlnprintln()
        |}
        |""".stripMargin,
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
   checkEdit(
@@ -1960,7 +2015,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  printlnprintln()
        |}
        |""".stripMargin,
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
   checkEdit(
@@ -1973,7 +2028,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  println()
        |}
        |""".stripMargin,
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
   checkEdit(
@@ -1986,7 +2041,7 @@ class CompletionSuite extends BaseCompletionSuite {
        |  println()
        |}
        |""".stripMargin,
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionTypeSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionTypeSuite.scala
index 1fc61e9f15b..2003455a6ef 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionTypeSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionTypeSuite.scala
@@ -22,7 +22,7 @@ class CompletionTypeSuite extends BaseCompletionSuite {
       "2" ->
         """|method[T <: FileSystem](a: T): Nothing
            |""".stripMargin
-    ),
+    )
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
index 64e61b01c08..34f4d95bf43 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
@@ -17,7 +17,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |object Main {
        |  val x = Files
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEditLine(
@@ -29,7 +29,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
       |""".stripMargin,
     "import Files@@",
     "import java.nio.file.Files",
-    filterText = "Files",
+    filterText = "Files"
   )
 
   checkEditLine(
@@ -46,7 +46,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     "import Banana@@",
-    "import pkg.`type`.Banana",
+    "import pkg.`type`.Banana"
   )
 
   checkEdit(
@@ -59,7 +59,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
       |trait Serializable
       |object Main extends java.io.Serializable
       |""".stripMargin,
-    filter = _ == "Serializable - java.io",
+    filter = _ == "Serializable - java.io"
   )
 
   checkEdit(
@@ -78,7 +78,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  val x = Files
        |}
        |""".stripMargin,
-    filter = _ == "Files - java.nio.file",
+    filter = _ == "Files - java.nio.file"
   )
 
   checkEdit(
@@ -97,7 +97,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  val x = Files
        |}
        |""".stripMargin,
-    filter = _ == "Files - java.nio.file",
+    filter = _ == "Files - java.nio.file"
   )
 
   checkEdit(
@@ -125,7 +125,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
            |  name: scala.concurrent.Future
            |)
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -153,7 +153,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
            |  name: scala.concurrent.Future
            |)
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -183,7 +183,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
            |  name: Future
            |)
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -201,7 +201,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  Await
        |}
        |""".stripMargin,
-    filter = _ == "Await - scala.concurrent",
+    filter = _ == "Await - scala.concurrent"
   )
 
   checkEdit(
@@ -222,7 +222,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
           |object Main extends CompletableFuture
           |""".stripMargin
     ),
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
   checkEdit(
@@ -243,7 +243,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
           |object Main extends CompletableFuture
           |""".stripMargin
     ),
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
   checkEdit(
@@ -260,7 +260,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |    Files
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -279,7 +279,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |    Files
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -298,7 +298,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |    println("".substring(Files))
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -317,7 +317,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |      Files
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -338,7 +338,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |     } =>
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -359,7 +359,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |}
        |""".stripMargin,
     filter = _.contains("java.util"),
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
   checkEdit(
@@ -388,7 +388,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
            |}
            |""".stripMargin
     ),
-    assertSingleItem = false,
+    assertSingleItem = false
   )
 
   checkEdit(
@@ -410,7 +410,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |      Files
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -436,7 +436,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |    _ = Files
        |  } yield x
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -464,7 +464,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |    }
        |  } yield x
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -492,7 +492,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |    }
        |  } yield x
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEditLine(
@@ -507,7 +507,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     "def backtick@@",
-    "def backtick: `type`.Foo = ${0:???}",
+    "def backtick: `type`.Foo = ${0:???}"
   )
 
   checkEdit(
@@ -525,7 +525,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  def foo: ArrayBuffer [Int] = ???
        |}
        |""".stripMargin,
-    filter = _ == "ArrayBuffer - scala.collection.mutable",
+    filter = _ == "ArrayBuffer - scala.collection.mutable"
   )
 
   checkEdit(
@@ -544,7 +544,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  class Foo extends ArrayBuffer[Int]
        |}
        |""".stripMargin,
-    filter = _ == "ArrayBuffer - scala.collection.mutable",
+    filter = _ == "ArrayBuffer - scala.collection.mutable"
   )
 
   checkEdit(
@@ -563,7 +563,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  trait Foo extends ArrayBuffer[Int]
        |}
        |""".stripMargin,
-    filter = _ == "ArrayBuffer - scala.collection.mutable",
+    filter = _ == "ArrayBuffer - scala.collection.mutable"
   )
 
   checkEdit(
@@ -580,7 +580,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  name: Future[String]
        |)
        |""".stripMargin,
-    filter = _ == "Future - scala.concurrent",
+    filter = _ == "Future - scala.concurrent"
   )
 
   checkEdit(
@@ -603,7 +603,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  val x = Future
        |}
        |""".stripMargin,
-    filter = _ == "Future - scala.concurrent",
+    filter = _ == "Future - scala.concurrent"
   )
 
   checkEdit(
@@ -627,7 +627,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  val x = Future
        |}
        |""".stripMargin,
-    filter = _ == "Future - scala.concurrent",
+    filter = _ == "Future - scala.concurrent"
   )
 
   checkEdit(
@@ -643,7 +643,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  val x = Future
        |}
        |""".stripMargin,
-    filter = _ == "Future - scala.concurrent",
+    filter = _ == "Future - scala.concurrent"
   )
 
   checkEdit(
@@ -665,7 +665,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
            |  Implicits
            |}
            |""".stripMargin
-    },
+    }
   )
 
   // this test was intended to check that import is rendered correctly - without `$` symbol
@@ -682,7 +682,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  Implicits
        |}
        |""".stripMargin,
-    filter = _ == "Implicits - scala.concurrent.ExecutionContext",
+    filter = _ == "Implicits - scala.concurrent.ExecutionContext"
   )
 
   checkEdit(
@@ -696,7 +696,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  mutable.Map
        |}
        |""".stripMargin,
-    filter = _ == "Map - scala.collection.mutable",
+    filter = _ == "Map - scala.collection.mutable"
   )
 
   checkEdit(
@@ -711,7 +711,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  mut.Map
        |}
        |""".stripMargin,
-    filter = _ == "Map - scala.collection.mutable",
+    filter = _ == "Map - scala.collection.mutable"
   )
 
   checkEdit(
@@ -725,7 +725,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  ju.Map
        |}
        |""".stripMargin,
-    filter = _ == "Map - java.util",
+    filter = _ == "Map - java.util"
   )
 
   checkEdit(
@@ -740,7 +740,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |  ju.Map
        |}
        |""".stripMargin,
-    filter = _ == "Map - java.util",
+    filter = _ == "Map - java.util"
   )
 
   check(
@@ -758,6 +758,11 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |""".stripMargin,
     topLines = Some(3),
     compat = Map(
+      "2.11" ->
+        """|Future scala.concurrent
+           |Future - java.util.concurrent
+           |Future - scala.concurrent.impl
+           |""".stripMargin,
       "2.13" ->
         """|Future scala.concurrent
            |Future - java.util.concurrent
@@ -767,8 +772,8 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
         """|Future[T] scala.concurrent
            |Future scala.concurrent
            |Future[V] - java.util.concurrent
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -786,6 +791,11 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |""".stripMargin,
     topLines = Some(3),
     compat = Map(
+      "2.11" ->
+        """|Future java.util.concurrent
+           |Future - scala.concurrent
+           |Future - scala.concurrent.impl
+           |""".stripMargin,
       "2.13" ->
         """|Future java.util.concurrent
            |Future - scala.concurrent
@@ -795,8 +805,8 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
         """|Future[V] java.util.concurrent
            |Future java.util.concurrent
            |Future[T] - scala.concurrent
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkEdit(
@@ -808,7 +818,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |object Main {
        |  val a = ListBuffer($0)
        |}""".stripMargin,
-    filter = _.contains("[A]"),
+    filter = _.contains("[A]")
   )
 
   checkEdit(
@@ -856,7 +866,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
            |  }
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -877,7 +887,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |
        |package b:
        |  def main() = fooBar
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -897,7 +907,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
     """|increment3: Int
        |increment: Int
        |increment2: Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -918,7 +928,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |""".stripMargin,
     """|fooBar(x: Int): Int
        |fooBar(x: String): Int
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -943,7 +953,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
       "2" -> """|fooBar: String
                 |fooBar - case_class_param.A: List[Int]
                 |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -959,7 +969,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |val j = MyTy@@
        |""".stripMargin,
     """|MyType(m: Long): MyType
-       |MyType - demo.other""".stripMargin,
+       |MyType - demo.other""".stripMargin
   )
 
   check(
@@ -975,7 +985,7 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |val j = MyTy@@
        |""".stripMargin,
     """|MyType(m: Long): MyType
-       |MyType - demo.other""".stripMargin,
+       |MyType - demo.other""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/ConvertToNamedArgumentsSuite.scala b/tests/cross/src/test/scala/tests/pc/ConvertToNamedArgumentsSuite.scala
index b9cabea1f36..c2a0027c435 100644
--- a/tests/cross/src/test/scala/tests/pc/ConvertToNamedArgumentsSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/ConvertToNamedArgumentsSuite.scala
@@ -26,7 +26,7 @@ class ConvertToNamedArgumentsSuite extends BaseCodeActionSuite {
     List(0, 1),
     """|object A{
        |  val a = scala.math.max(x = 1, y = 2)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -39,7 +39,7 @@ class ConvertToNamedArgumentsSuite extends BaseCodeActionSuite {
     """|object A{
        |  final case class Foo(`type`: Int, arg: String)
        |  val a = Foo(`type` = 1, arg = "a")
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -52,7 +52,7 @@ class ConvertToNamedArgumentsSuite extends BaseCodeActionSuite {
     """|object A{
        |  def foo(`type`: Int, arg: String) = "a"
        |  val a = foo(`type` = 1, arg = "a")
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -65,7 +65,7 @@ class ConvertToNamedArgumentsSuite extends BaseCodeActionSuite {
     """|object Something {
        |  class Foo(param1: Int, param2: Int)
        |  val a = new Foo(param1 = 1, param2 = 2)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
   checkEdit(
     "new-apply-multiple",
@@ -77,7 +77,7 @@ class ConvertToNamedArgumentsSuite extends BaseCodeActionSuite {
     """|object Something {
        |  class Foo(param1: Int, param2: Int)(param3: Int)
        |  val a = new Foo(param1 = 1, param2 = 2)(param3 = 3)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkError(
@@ -87,14 +87,14 @@ class ConvertToNamedArgumentsSuite extends BaseCodeActionSuite {
        |}
        |""".stripMargin,
     List(0, 1),
-    CodeActionErrorMessages.ConvertToNamedArguments.IsJavaObject,
+    CodeActionErrorMessages.ConvertToNamedArguments.IsJavaObject
   )
 
   def checkError(
       name: TestOptions,
       original: String,
       argIndices: List[Int],
-      expectedErrorMsg: String,
+      expectedErrorMsg: String
   ): Unit = {
     test(name) {
       try {
@@ -117,7 +117,7 @@ class ConvertToNamedArgumentsSuite extends BaseCodeActionSuite {
       original: String,
       argIndices: List[Int],
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit location: Location): Unit =
     test(name) {
       val edits = convertToNamedArgs(original, argIndices)
@@ -129,13 +129,13 @@ class ConvertToNamedArgumentsSuite extends BaseCodeActionSuite {
   def convertToNamedArgs(
       original: String,
       argIndices: List[Int],
-      filename: String = "file:/A.scala",
+      filename: String = "file:/A.scala"
   ): List[l.TextEdit] = {
     val (code, _, offset) = params(original)
     val result = presentationCompiler
       .convertToNamedArguments(
         CompilerOffsetParams(URI.create(filename), code, offset, cancelToken),
-        argIndices.map(new Integer(_)).asJava,
+        argIndices.map(new Integer(_)).asJava
       )
       .get()
     result.asScala.toList
diff --git a/tests/cross/src/test/scala/tests/pc/ExtractMethodSuite.scala b/tests/cross/src/test/scala/tests/pc/ExtractMethodSuite.scala
index d366aa04134..25ff86de641 100644
--- a/tests/cross/src/test/scala/tests/pc/ExtractMethodSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/ExtractMethodSuite.scala
@@ -17,7 +17,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    123 + method(b)
         |
         |  val a = newMethod()
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   checkEdit(
@@ -54,7 +54,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
                          |    newMethod()
                          |  }
                          |
-                         |}""".stripMargin),
+                         |}""".stripMargin)
   )
 
   checkEdit(
@@ -88,7 +88,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
                          |    val c = 1
                          |    newMethod(c)
                          |  }
-                         |}""".stripMargin),
+                         |}""".stripMargin)
   )
 
   checkEdit(
@@ -107,7 +107,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    method(5)
         |
         |  val a = newMethod1()
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   checkEdit(
@@ -132,7 +132,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    val b = 4
         |    newMethod(b, c)
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   checkEdit(
@@ -175,7 +175,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
                          |      newMethod(c)
                          |    }
                          |  }
-                         |}""".stripMargin),
+                         |}""".stripMargin)
   )
 
   checkEdit(
@@ -198,7 +198,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    val b = 4
         |    newMethod(b)
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   checkEdit(
@@ -238,7 +238,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
                          |    val c = 1
                          |    newMethod(c)
                          |  }
-                         |}""".stripMargin),
+                         |}""".stripMargin)
   )
 
   checkEdit(
@@ -255,7 +255,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |  class B(val b: Int) {
         |    def f2 = newMethod(b)
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   checkEdit(
@@ -274,7 +274,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |  def f1(a: Int) = {
         |    newMethod(a)
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   checkEdit(
@@ -293,7 +293,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |  def f1[T](a: T) = {
         |    newMethod(a)
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
   checkEdit(
     "method-type-no-param",
@@ -311,7 +311,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |  def f1[T](a: T) = {
         |    newMethod()
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   checkEdit(
@@ -354,7 +354,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
                          |    val d = 3
                          |    newMethod()
                          |  }
-                         |}""".stripMargin),
+                         |}""".stripMargin)
   )
 
   checkEdit(
@@ -375,7 +375,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    def m2(b: Int) = b + 1
         |    newMethod(a, m2)
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   checkEdit(
@@ -398,7 +398,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    newMethod(a, m2)
         |  }
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   checkEdit(
@@ -419,7 +419,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    newMethod(a, m2)
         |  }
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   checkEdit(
@@ -440,7 +440,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    newMethod(m2)(2)
         |  }
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   checkEdit(
@@ -461,7 +461,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    newMethod(m2)
         |  }
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   checkEdit(
@@ -482,7 +482,7 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |    newMethod(m2)
         |  }
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   checkEdit(
@@ -505,6 +505,6 @@ class ExtractMethodSuite extends BaseExtractMethodSuite {
         |      newMethod(color, other)
         |    }
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/HKSignatureHelpSuite.scala b/tests/cross/src/test/scala/tests/pc/HKSignatureHelpSuite.scala
index 0c537a7184e..930ae78b331 100644
--- a/tests/cross/src/test/scala/tests/pc/HKSignatureHelpSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/HKSignatureHelpSuite.scala
@@ -5,10 +5,13 @@ import tests.BaseSignatureHelpSuite
 
 class HKSignatureHelpSuite extends BaseSignatureHelpSuite {
 
+  override protected def ignoreScalaVersion: Option[IgnoreScalaVersion] = Some(
+    IgnoreScala211
+  )
+
   override def extraDependencies(scalaVersion: String): Seq[Dependency] = {
     val binaryVersion = createBinaryVersion(scalaVersion)
     Seq(Dependency.of("org.typelevel", s"cats-core_$binaryVersion", "2.8.0"))
-
   }
 
   check(
@@ -27,7 +30,7 @@ class HKSignatureHelpSuite extends BaseSignatureHelpSuite {
         """|foldMap[A, B](fa: Option[A])(f: A => B)(using B: cats.kernel.Monoid[B]): B
            |              ^^^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   // https://github.com/scalameta/metals/issues/5055
@@ -66,7 +69,7 @@ class HKSignatureHelpSuite extends BaseSignatureHelpSuite {
        |                                                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
        |  @param <redactHeadersWhen test description
        |""".stripMargin,
-    includeDocs = true,
+    includeDocs = true
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/InlineValueSuite.scala b/tests/cross/src/test/scala/tests/pc/InlineValueSuite.scala
index 22f321f9c62..7e2314c2d84 100644
--- a/tests/cross/src/test/scala/tests/pc/InlineValueSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/InlineValueSuite.scala
@@ -28,7 +28,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |  def u(): Unit = {
        |    val p: Int = 1 + 2
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -38,7 +38,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |}""".stripMargin,
     """|object Main {
        | val a = { val b = 1 + 1 }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -55,7 +55,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    val b = 1 + 1
        |  }
        |  val a = 3
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -74,7 +74,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |  }
        |  val a = 3
        |  val g = a
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -91,7 +91,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    val p: Int = 1 + 2
        |    val i: Int = 1 + 3
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -108,7 +108,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    val p: Int = 1 + 2
        |    val i: Int = 1 + 3
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -126,7 +126,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    val p: Int = 2 - (1 + 6)
        |    val k: Int = o
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -145,7 +145,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    val p: Int = h - (1 + 6)
        |    val k: Int = 1 + 6
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -157,7 +157,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
     """|object Main {
        |  val o: Int = 6
        |  val p: Int = 2 - 6
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -171,7 +171,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |object Main {
        |  val o: Int = 6
        |  val p: Int = 2 - 6
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -186,7 +186,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |  def demo = {
        |    println(((x: Int) => x + 1)(1))
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -201,7 +201,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |  def demo = {
        |    val plus2 = (x: Int) => x + 1
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkError(
@@ -210,7 +210,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |  val <<o>>: Int = 6
        |  val p: Int = 2 - o
        |}""".stripMargin,
-    InlineErrors.notLocal,
+    InlineErrors.notLocal
   )
 
   checkEdit(
@@ -230,7 +230,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |val b = (for {
        |    i <- List(1,2,3)
        |  } yield i + 1).map(_ + 1)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -242,7 +242,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
     """|object Main {
        |  val b = 1 + (2 + 3)
        |  val c = 1 + (2 + 3)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   // --- different possibilites of conflicts ----------
@@ -258,7 +258,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    val z = <<f>> + 1
        |  }
        |}""".stripMargin,
-    InlineErrors.variablesAreShadowed("scala.net.com.ooo.Demo.j"),
+    InlineErrors.variablesAreShadowed("scala.net.com.ooo.Demo.j")
   )
 
   checkError(
@@ -272,7 +272,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    val z = <<f>> + 1
        |  }
        |}""".stripMargin,
-    InlineErrors.variablesAreShadowed("Demo.j"),
+    InlineErrors.variablesAreShadowed("Demo.j")
   )
 
   // Note: we do not check if summoned implicts change when inlining
@@ -297,7 +297,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    implicit val v : Boolean = false
        |    val z = myF
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkError(
@@ -315,7 +315,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |    <<inl>>
        |  }
        |}""".stripMargin,
-    InlineErrors.variablesAreShadowed("a.A.aaa"),
+    InlineErrors.variablesAreShadowed("a.A.aaa")
   )
 
   checkError(
@@ -332,7 +332,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
     InlineErrors.variablesAreShadowed("Demo.oo.j"),
     compat = Map(
       "2" -> InlineErrors.variablesAreShadowed("Demo.j")
-    ),
+    )
   )
 
   checkError(
@@ -345,7 +345,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
        |     val m = <<l>> + 3
        |  }
        |}""".stripMargin,
-    InlineErrors.variablesAreShadowed("A.k"),
+    InlineErrors.variablesAreShadowed("A.k")
   )
 
   def checkEdit(
@@ -353,7 +353,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
       original: String,
       expected: String,
       compat: Map[String, String] = Map.empty,
-      filename: String = "file:/A.scala",
+      filename: String = "file:/A.scala"
   )(implicit location: Location): Unit =
     test(name) {
       val edits = getInlineEdits(original, filename)
@@ -367,7 +367,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
       original: String,
       expectedError: String,
       compat: Map[String, String] = Map.empty,
-      filename: String = "file:/A.scala",
+      filename: String = "file:/A.scala"
   )(implicit location: Location): Unit =
     test(name) {
       try {
@@ -383,14 +383,14 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
             }) =>
           assertNoDiff(
             e.getCause.getMessage,
-            getExpected(expectedError, compat, scalaVersion),
+            getExpected(expectedError, compat, scalaVersion)
           )
       }
     }
 
   def getInlineEdits(
       original: String,
-      filename: String,
+      filename: String
   ): List[l.TextEdit] = {
     val (code, _, offset) = params(original)
     val result = presentationCompiler
@@ -399,7 +399,7 @@ class InlineValueSuite extends BaseCodeActionSuite with CommonMtagsEnrichments {
           URI.create(filename),
           code,
           offset,
-          cancelToken,
+          cancelToken
         )
       )
       .get()
diff --git a/tests/cross/src/test/scala/tests/pc/InsertInferredTypeSuite.scala b/tests/cross/src/test/scala/tests/pc/InsertInferredTypeSuite.scala
index 90d0a597826..8a8cbb2f883 100644
--- a/tests/cross/src/test/scala/tests/pc/InsertInferredTypeSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/InsertInferredTypeSuite.scala
@@ -16,9 +16,14 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
 
   override def extraDependencies(scalaVersion: String): Seq[Dependency] = {
     val binaryVersion = createBinaryVersion(scalaVersion)
-    Seq(
-      Dependency.of("org.typelevel", s"cats-effect_$binaryVersion", "3.1.1")
-    )
+    if (scalaVersion.startsWith("2.11"))
+      Seq(
+        Dependency.of("org.typelevel", s"cats-effect_$binaryVersion", "2.0.0")
+      )
+    else
+      Seq(
+        Dependency.of("org.typelevel", s"cats-effect_$binaryVersion", "3.1.1")
+      )
   }
 
   checkEdit(
@@ -28,7 +33,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val alpha: Int = 123
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -38,7 +43,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  def alpha(a: Int, b: String): Int = 123
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -48,7 +53,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val alpha: Int = 123
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -58,7 +63,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val alpha: List[Int] = List(1, 2, 3)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -68,7 +73,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val alpha: String = ""
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -78,7 +83,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val alpha: String = s""
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -88,7 +93,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  def alpha: Int = 123
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -98,7 +103,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  def alpha: List[Int] = List(1, 2, 3)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -108,7 +113,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  def alpha: String = ""
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -118,7 +123,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  def alpha: String = s""
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -129,7 +134,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|def hello =
        |  val a: String = ""
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -137,7 +142,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|def <<alpha>> = List("")
        |""".stripMargin,
     """|def alpha: List[String] = List("")
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -147,7 +152,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val (alpha: Int, beta) = (123, 12)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -158,7 +163,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|object A{
        |  val ((alpha: Int, gamma), beta) = ((123, 1), 12)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -168,7 +173,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  var (alpha: Int, beta) = (123, 12)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -178,7 +183,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  var alpha: (Int, Int) = (123, 12)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -188,7 +193,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  def alpha: (Int, Int) = (123, 12)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -199,7 +204,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|object A{
        |  def alpha: (Int, Int) /* [] */= (123, 12)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -210,7 +215,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|object A{
        |  def alpha(): (Int, Int) /* [] */= (123, 12)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -220,7 +225,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  def alpha(a : String): (Int, Int) = (123, 12)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -230,7 +235,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  def alpha[T]: (Int, Int) = (123, 12)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -241,7 +246,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|import scala.collection.mutable.Buffer
        |object A{
        |  val buffer: Buffer[String] = List("").toBuffer
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -251,7 +256,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val toStringList = List(1, 2, 3).map((int: Int) => int.toString)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -261,7 +266,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val toStringList = List(1, 2, 3).map( /*{}*/(int: Int) => int.toString)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -277,7 +282,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
         """|object A{
            |  val toStringList = List(1, 2, 3).map{(int: Int) => int.toString}
            |}""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -287,7 +292,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |}""".stripMargin,
     """|object A{
        |  val toStringList = List((1, 2)).map((int: Int, n) => int)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -303,7 +308,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |    case (head: Int) :: tail => tail
        |    case Nil => Nil
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -320,7 +325,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |    case (one, two: Int) => 2
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -337,7 +342,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |    case None =>
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -354,7 +359,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |    case _ =>
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -370,7 +375,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |    case 2 => "Two!"
        |    case otherDigit: Int => "Not two!"
        |  }
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   checkEdit(
@@ -387,7 +392,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |    j <- 1 to 11
        |  } yield (i, j)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -404,12 +409,12 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |    j: Int = i
        |  } yield (i, j)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   val additionalSpace: String = if (isScala3Version(scalaVersion)) " " else ""
   checkEdit(
-    "higher-kinded-types",
+    "higher-kinded-types".tag(IgnoreScala211),
     """|package io
        |
        |import cats.effect.Resource
@@ -443,7 +448,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
         |    } yield ()
         |
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   checkEdit(
@@ -478,7 +483,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  }
        |
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -498,7 +503,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  val second: I = every
        |}
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -517,7 +522,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  val every: t.Instant = ???
        |  val second: t.Instant = every
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -536,7 +541,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  val every: c.duration.Duration = ???
        |  val second: c.duration.Duration = every
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -562,7 +567,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  def apply(org: String): Any = Dependency(org, None, None)
        |  def apply(org: String, name: String) = Dependency(org, Some(name), None)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -585,8 +590,15 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
            |    if (value == "left") Left("a") else Right("b")
            |  }
            |}
+           |""".stripMargin,
+      "2.11" ->
+        """|object O{
+           |  def returnEither(value: String): Product with Serializable with Either[String,String] = {
+           |    if (value == "left") Left("a") else Right("b")
+           |  }
+           |}
            |""".stripMargin
-    ),
+    )
   )
 
   checkEdit(
@@ -597,7 +609,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|object O{
        |  val `bar`: Int = 42
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -608,7 +620,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|object O{
        |  def `bar`: Int = 42
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -619,7 +631,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|object O{
        |  List(1).map((`a`: Int) => a + 1)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -633,7 +645,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  val a: Some[1] = Some(1)
        |  val b: Some[1] = a
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   val defaultRefinedTypes: String =
@@ -659,7 +671,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |
        |  val c: Foo{type T = Int; type G = Long} = new Foo { type T = Int; type G = Long}
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -679,7 +691,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  val c = new Foo { type T = Int }
        |  val d: Foo{type T = Int} = c
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -699,7 +711,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |
        |  val c: Foo{type T = Int} = new Foo { type T = Int }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -725,7 +737,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  def y = 0
        |  var z = 0
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -747,7 +759,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |object O {
        | val c: Int = new Foo().getT
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -763,7 +775,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  def getT: T = 1
        |  val c: T = getT
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -778,7 +790,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |  opaque type T = Int
        |  def getT: T = 1
        |val c: T = Foo.getT
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -796,7 +808,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        | def get: W = ???
        |
        |val m: Int => Int = O.get
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -815,7 +827,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        | def get: W = ???
        |
        |val m: M => Int = O.get
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -828,7 +840,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |object O{
        |  val foo: `Foo-Foo` = `Foo-Foo`(1)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -845,7 +857,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |object O{
        |  val foo: A.`Foo-Foo` = A.`Foo-Foo`(1)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -862,7 +874,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |object O{
        |  val foo: A.`Foo-Foo`[Int] = A.`Foo-Foo`(1)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -881,7 +893,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
        |object O{
        |  val foo: A.Foo[A.`x-x`] = A.Foo(new A.`x-x`)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkEdit(
@@ -893,14 +905,14 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
     """|object A {
        |  val v: List[Tuple1[Int]] = List.empty[Tuple1[Int]]
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   def checkEdit(
       name: TestOptions,
       original: String,
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit location: Location): Unit =
     test(name) {
       val edits = getAutoImplement(original)
@@ -911,7 +923,7 @@ class InsertInferredTypeSuite extends BaseCodeActionSuite {
 
   def getAutoImplement(
       original: String,
-      filename: String = "file:/A.scala",
+      filename: String = "file:/A.scala"
   ): List[l.TextEdit] = {
     val (code, _, offset) = params(original)
     val result = presentationCompiler
diff --git a/tests/cross/src/test/scala/tests/pc/InterruptPresentationCompilerSuite.scala b/tests/cross/src/test/scala/tests/pc/InterruptPresentationCompilerSuite.scala
index 584174ff2e6..65609dbc56b 100644
--- a/tests/cross/src/test/scala/tests/pc/InterruptPresentationCompilerSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/InterruptPresentationCompilerSuite.scala
@@ -49,7 +49,7 @@ class InterruptPresentationCompilerSuite extends BasePCSuite {
   def check(
       name: String,
       original: String,
-      act: (PresentationCompiler, OffsetParams) => CompletableFuture[_],
+      act: (PresentationCompiler, OffsetParams) => CompletableFuture[_]
   )(implicit loc: Location): Unit = {
     test(name) {
       val (code, offset) = this.params(original, "A.scala")
@@ -61,8 +61,8 @@ class InterruptPresentationCompilerSuite extends BasePCSuite {
             URI.create("file:///A.scala"),
             code,
             offset,
-            interrupt.token.get(),
-          ),
+            interrupt.token.get()
+          )
         ).get()
         fail(s"Expected cancellation exception. Obtained $result")
       } catch {
@@ -71,7 +71,7 @@ class InterruptPresentationCompilerSuite extends BasePCSuite {
       val isInterrupted = interrupt.isInterrupted.get()
       Predef.assert(
         !isInterrupted,
-        "thread was interrupted, expected no interruption.",
+        "thread was interrupted, expected no interruption."
       )
     }
   }
@@ -85,7 +85,7 @@ class InterruptPresentationCompilerSuite extends BasePCSuite {
       |""".stripMargin,
     (pc, params) => {
       pc.hover(params)
-    },
+    }
   )
 
   check(
@@ -97,7 +97,7 @@ class InterruptPresentationCompilerSuite extends BasePCSuite {
       |""".stripMargin,
     (pc, params) => {
       pc.signatureHelp(params)
-    },
+    }
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/MacroCompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/MacroCompletionSuite.scala
index 726938ddde1..fcec691c1ba 100644
--- a/tests/cross/src/test/scala/tests/pc/MacroCompletionSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/MacroCompletionSuite.scala
@@ -27,19 +27,19 @@ class MacroCompletionSuite extends BaseCompletionSuite {
           .of(
             "com.olegpy",
             s"better-monadic-for_$scalaBinaryVersion",
-            BuildInfoVersions.betterMonadicFor,
+            BuildInfoVersions.betterMonadicFor
           ),
         Dependency
           .of(
             "org.typelevel",
             s"kind-projector_$scalaVersion",
-            BuildInfoVersions.kindProjector,
+            BuildInfoVersions.kindProjector
           ),
         Dependency
           .of("org.typelevel", s"simulacrum_$scalaBinaryVersion", "1.0.0"),
         Dependency
           .of("com.lihaoyi", s"sourcecode_$scalaBinaryVersion", "0.1.9"),
-        Dependency.of("com.chuusai", s"shapeless_$scalaBinaryVersion", "2.3.3"),
+        Dependency.of("com.chuusai", s"shapeless_$scalaBinaryVersion", "2.3.3")
       ) ++ macrosDependencies
     }
   }
@@ -75,6 +75,9 @@ class MacroCompletionSuite extends BaseCompletionSuite {
       |""".stripMargin,
     """|from(r: String :: Int :: HNil): Person
        |""".stripMargin,
+    compat = Map(
+      "2.11" -> "from(r: ::[String,::[Int,HNil]]): Person"
+    )
   )
 
   check(
@@ -95,9 +98,10 @@ class MacroCompletionSuite extends BaseCompletionSuite {
     """|fold[C](fa: Int => C, fb: String => C): C
        |""".stripMargin,
     compat = Map(
+      "2.11" -> "fold[X](fa: Int => X, fb: String => X): X",
       // NOTE(olafur): the presentation compiler returns empty results here in 2.13.0
       "2.13" -> ""
-    ),
+    )
   )
 
   check(
@@ -108,7 +112,7 @@ class MacroCompletionSuite extends BaseCompletionSuite {
       |}
       |""".stripMargin,
     """|value: String
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   def simulacrum(name: String, completion: String, expected: String): Unit =
@@ -129,19 +133,19 @@ class MacroCompletionSuite extends BaseCompletionSuite {
          |  $completion
          |}
          |""".stripMargin,
-      expected,
+      expected
     )
   simulacrum(
     "import",
     """|import Semigroup.op@@
        |""".stripMargin,
-    "",
+    ""
   )
   simulacrum(
     "object",
     """|Semigroup.apply@@
        |""".stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -154,6 +158,9 @@ class MacroCompletionSuite extends BaseCompletionSuite {
     """.stripMargin,
     """|fold[C](fa: Int => C, fb: String => C): C
        |""".stripMargin,
+    compat = Map(
+      "2.11" -> "fold[X](fa: Int => X, fb: String => X): X"
+    )
   )
 
   check(
@@ -165,7 +172,7 @@ class MacroCompletionSuite extends BaseCompletionSuite {
       |}
     """.stripMargin,
     """|toCharArray(): Array[Char]
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/NoIndentSuite.scala b/tests/cross/src/test/scala/tests/pc/NoIndentSuite.scala
index 9221f1a8691..789a73502ca 100644
--- a/tests/cross/src/test/scala/tests/pc/NoIndentSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/NoIndentSuite.scala
@@ -25,7 +25,7 @@ class ExtractMethodNoIndentSuite extends BaseExtractMethodSuite {
         |    123 + method(b)
         |
         |  val a = newMethod()
-        |}""".stripMargin,
+        |}""".stripMargin
   )
   checkEdit(
     "multiple-expr",
@@ -51,7 +51,7 @@ class ExtractMethodNoIndentSuite extends BaseExtractMethodSuite {
         |    val c = 1
         |    newMethod(c)
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 }
 
@@ -73,7 +73,7 @@ class CompletionMatchNoIndentSuite extends BaseCompletionSuite {
        |\tcase$$0
        |}
        |}""".stripMargin,
-    filter = !_.contains("exhaustive"),
+    filter = !_.contains("exhaustive")
   )
 
   checkEdit(
@@ -89,6 +89,6 @@ class CompletionMatchNoIndentSuite extends BaseCompletionSuite {
        |\tcase Some(value) =>
        |}
        |}""".stripMargin,
-    filter = _.contains("exhaustive"),
+    filter = _.contains("exhaustive")
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/PcDefinitionSuite.scala b/tests/cross/src/test/scala/tests/pc/PcDefinitionSuite.scala
index ea6b99027ea..51ae37152eb 100644
--- a/tests/cross/src/test/scala/tests/pc/PcDefinitionSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/PcDefinitionSuite.scala
@@ -35,7 +35,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  println(abc)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -61,7 +61,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  } yield y
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -73,7 +73,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |    y <- Option(x)
        |  } yield y
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -85,7 +85,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |    y /*scala/Option#map(). Option.scala*/@@<- Option(x)
        |  } yield y
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -98,7 +98,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |    /*scala/Option#withFilter(). Option.scala*/@@if y > 2
        |  } yield y
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -117,7 +117,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  increment(1)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -127,7 +127,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  @@(1, 2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -149,8 +149,8 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |object Main {
            |  /*scala/collection/IterableFactory#apply(). Factory.scala*/List(1)
            |}
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -159,7 +159,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  /*scala/Predef.assert(). Predef.scala*//*scala/Predef.assert(+1). Predef.scala*/@@assert
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -168,7 +168,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  Predef./*scala/Predef.assert(). Predef.scala*//*scala/Predef.assert(+1). Predef.scala*/@@assert
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -177,7 +177,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  1./*scala/Predef.Ensuring#ensuring(). Predef.scala*//*scala/Predef.Ensuring#ensuring(+1). Predef.scala*//*scala/Predef.Ensuring#ensuring(+2). Predef.scala*//*scala/Predef.Ensuring#ensuring(+3). Predef.scala*/@@ensuring
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -186,7 +186,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  ne@@w java.io.File("")
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -194,7 +194,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
     """|
        |object Main ex@@tends java.io.Serializable {
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -211,7 +211,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |object Main {
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -220,7 +220,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |imp@@ort scala.concurrent.Future
        |object Main {
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -229,7 +229,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |import scala.co@@ncurrent.Future
        |object Main {
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -250,7 +250,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  foo(arg = 42)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -267,7 +267,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |
            |  tst(1, p@@ar3 = true, par2 = "")
            |}""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -286,7 +286,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  tst(par2 = "foo", par1 = 1)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -303,7 +303,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  assert(/*scala/Predef.assert(+1).(assertion) Predef.scala*/assertion = true)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -312,7 +312,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  val lst = 1 /*scala/collection/immutable/List#`::`(). List.scala*/@@:: Nil
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -329,7 +329,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  val <<number>>: Int = 1
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -338,7 +338,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  val n = ma@@th.max(1, 2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -355,7 +355,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  List(1).map(@@_ + 2)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -371,7 +371,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  List(1).foldLeft(0)(_ + _)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -380,14 +380,14 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  def x: /*scala/Int# Int.scala*/@@Int = 42
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
     "constructor",
     """|
        |class Main(x: /*scala/Int# Int.scala*/@@Int)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -406,7 +406,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  Foo(@@a = 3, b = "42")
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -425,7 +425,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  Foo(2, "4").copy(@@a = 3, b = "42")
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -434,7 +434,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |class Main {
        |  val all = Option(42)./*scala/Option#get(). Option.scala*/@@get :: List("1", "2")
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -455,7 +455,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  hello(User())
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -476,7 +476,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
            |  hello(new Us@@er())
            |}
            |""".stripMargin
-    ),
+    )
   )
   check(
     "no-definition-1",
@@ -488,7 +488,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |  }
        |  println(foo())
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -500,7 +500,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |  }
        |  println(foo())
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -512,7 +512,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |  }
        |  println(foo())
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -529,7 +529,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |
        |case class Box[A](value: A) derives Sh@@ow
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -547,7 +547,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |
        |  ???
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -556,7 +556,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |enum MyOption[+<<AA>>]:
        |  case MySome(value: A@@A)
        |  case MyNone
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -566,7 +566,7 @@ class PcDefinitionSuite extends BasePcDefinitionSuite {
        |  extension (i: MyIntOut) def <<uneven>> = i.value % 2 == 1
        |
        |val a = MyIntOut(1).un@@even
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/PcPrepareRenameSuite.scala b/tests/cross/src/test/scala/tests/pc/PcPrepareRenameSuite.scala
index ad4e2279139..20bfffb5ee4 100644
--- a/tests/cross/src/test/scala/tests/pc/PcPrepareRenameSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/PcPrepareRenameSuite.scala
@@ -17,7 +17,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    val toRename3: java.util.List[Int] = ???
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   // currently we are not using presentation compiler in this case
@@ -32,7 +32,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |      StdLibTryprepare(n)
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -46,7 +46,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    user.copy(name = "")
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -54,7 +54,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
     """|package a
        |trait S1[X] { def torename(p: X): String = "" }
        |trait T1[Z] extends S1[Z] { override def tore@@name(p: Z): String = super.torename(p) }
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -65,7 +65,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |trait A { def torename(a: String): P = ??? }
        |trait B extends A { override def tore@@name(a: String): PP = ??? }
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -81,7 +81,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    }
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -95,7 +95,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    case Foo(name) => ()
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -107,7 +107,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    toRename
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -119,7 +119,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    if(methodprepare("")) println("Is true!")
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -135,7 +135,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    val a = new Alphabet with ABC
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -148,7 +148,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |class GoodMorning extends Hello {
        |  def met@@hod(abc : String) = true
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -161,7 +161,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |object Main{
        |  val toRename = User##.##("abc")
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -176,7 +176,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    "" :: user
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -192,7 +192,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    @@!user
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -201,7 +201,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |class MyException extends Exce@@ption
        |class NewException extends RuntimeException
        |class NewException2 extends RuntimeException
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -209,7 +209,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
     """|package a
        |class Main{}
        |object M@@ain
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -222,7 +222,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -240,7 +240,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    override def me@@thod(adf: String): Int = 321
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -261,7 +261,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    }
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -278,7 +278,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    }
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -287,7 +287,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |import io.circe.generic.JsonCodec
        |@JsonCodec
        |final case class Ma@@in2(name: String)
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -297,7 +297,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |  implicit val some@@Name: Int = 1
        |  def m[A](implicit a: A): A = a
        |  m[Int]
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   prepare(
@@ -309,7 +309,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    case `gre@@eting` =>
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -323,7 +323,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    }
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   // If renaming in VS Code, backticks are taken as part of the name
@@ -338,7 +338,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    }
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -355,7 +355,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    val name2 = Name(value = "44")
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -365,7 +365,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |object Main {
        |  val name2 = new Name(value = "44")
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -377,7 +377,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |  val a = classOf[ABC]
        |  val b = new CBD[ABC]
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -393,7 +393,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    val symbol3: Symbol = Variable("value")
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -409,7 +409,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    val symbol3: Symbol = Variable("value")
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -423,7 +423,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    v5 == true
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -437,7 +437,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    v5 == true
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -445,7 +445,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
     """|trait S1[X] { def torename(p: X): String = "" }
        |trait T1[Z] extends S1[Z] { override def <<tore@@name>>(p: Z): String = super.torename(p) }
        |""".stripMargin,
-    filename = "A.worksheet.sc",
+    filename = "A.worksheet.sc"
   )
   prepare(
     "worksheet-classes",
@@ -453,7 +453,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |case class Method(name: String) extends Symbol
        |case class Variable(value: String) extends Symbol
        |""".stripMargin,
-    filename = "A.worksheet.sc",
+    filename = "A.worksheet.sc"
   )
 
   prepare(
@@ -466,7 +466,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    <<ab@@c>>.map(_ + 1)
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -475,7 +475,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |  def double = sbd + sbd
        |  def double2 = sbd + sbd
        |end extension
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -484,7 +484,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |  def double = <<sb@@d>> + sbd
        |  def double2 = sbd + sbd
        |end extension
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -493,7 +493,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |  def double = xs ++ xs
        |  def double2 = xs ++ xs
        |end extension
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -502,7 +502,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |  def double = xs ++ xs
        |  def double2 = xs ++ <<x@@s>>
        |end extension
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   prepare(
@@ -515,7 +515,7 @@ class PcPrepareRenameSuite extends BasePcRenameSuite {
        |    )
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/PcRenameSuite.scala b/tests/cross/src/test/scala/tests/pc/PcRenameSuite.scala
index 42fac71bb05..b66d3077fe1 100644
--- a/tests/cross/src/test/scala/tests/pc/PcRenameSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/PcRenameSuite.scala
@@ -6,16 +6,26 @@ import tests.BasePcRenameSuite
 class PcRenameSuite extends BasePcRenameSuite {
   override def extraDependencies(scalaVersion: String): Seq[Dependency] = {
     val scalaBinaryVersion = createBinaryVersion(scalaVersion)
-    Seq(
-      Dependency.of("io.circe", s"circe-generic_$scalaBinaryVersion", "0.14.1")
-    )
+    if (scalaVersion.startsWith("2.11"))
+      Seq(
+        Dependency
+          .of("io.circe", s"circe-generic_$scalaBinaryVersion", "0.11.2")
+      )
+    else
+      Seq(
+        Dependency.of(
+          "io.circe",
+          s"circe-generic_$scalaBinaryVersion",
+          "0.14.1"
+        )
+      )
   }
 
   check(
     "basic",
     """|val <<a>> = 123
        |<<@@a>> + 1  
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -27,7 +37,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  }
        |}  
        |""".stripMargin,
-    wrap = false,
+    wrap = false
   )
 
   check(
@@ -38,7 +48,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |trait T3[I, J] extends T2[I] { override def <<torename>>(p: I): String = super.<<torename>>(p) }
        |trait T4[I, J] extends T3[J, I] { override def <<torename>>(p: J): String = super.<<torename>>(p) }
        |trait T5[U] extends T4[U, U] { override def <<tore@@name>>(p: U): String = super.<<torename>>(p) }
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -47,7 +57,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |trait PP extends P
        |trait A { def <<torename>>(a: String): P = ??? }
        |trait B extends A { override def <<tore@@name>>(a: String): PP = ??? }
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -60,7 +70,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  val a = new Alphabet with <<ABC>>
        |}
        |""".stripMargin,
-    newName = "Animal",
+    newName = "Animal"
   )
 
   check(
@@ -72,7 +82,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |class GoodMorning extends Hello {
        |  def <<met@@hod>>(abc : String) = true
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -88,7 +98,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |abstract class C extends B[String] {
        |  def <<meth@@od>>(abc : String) : Boolean = false
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -104,7 +114,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |abstract class C extends B with A {
        |  override def <<meth@@od>>(abc : String) : Boolean = false
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -116,7 +126,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  val user = new User()
        |  "" <<::>> user
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -129,7 +139,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  "" <<::>> user
        |}
        |""".stripMargin,
-    newName = "+++:",
+    newName = "+++:"
   )
 
   check(
@@ -138,7 +148,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |class Dog extends <<Animal>>
        |class Cat extends <<Animal>>
        |""".stripMargin,
-    newName = "Tree",
+    newName = "Tree"
   )
 
   check(
@@ -146,14 +156,14 @@ class PcRenameSuite extends BasePcRenameSuite {
     """|class <<Foo>>{}
        |object <<Fo@@o>> {}
   """.stripMargin,
-    newName = "Tree",
+    newName = "Tree"
   )
   check(
     "companion2",
     """|class <<Fo@@o>>{}
        |object <<Foo>>
   """.stripMargin,
-    newName = "Tree",
+    newName = "Tree"
   )
 
   check(
@@ -165,7 +175,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  case object Dog extends <<Animal>>
        |  case object Cat extends <<Animal>>
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -181,7 +191,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |val a = new Alphabet {
        |  override def <<me@@thod>>(adf: String): Int = 321
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -189,7 +199,7 @@ class PcRenameSuite extends BasePcRenameSuite {
     """|implicit val <<some@@Name>>: Int = 1
        |def m[A](implicit a: A): A = a
        |m[Int]
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -201,7 +211,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  val toRename = A.<<toR@@ename>>
        |}
        |""".stripMargin,
-    newName = "`other-rename`",
+    newName = "`other-rename`"
   )
 
   check(
@@ -213,7 +223,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  val toRename = A.<<`to-R@@ename`>>
        |}
        |""".stripMargin,
-    newName = "`other-rename`",
+    newName = "`other-rename`"
   )
 
   check(
@@ -222,7 +232,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |"" match {
        |  case `<<greeting>>` =>
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -232,7 +242,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  case <<`greeting`>> =>
        |}
        |""".stripMargin,
-    newName = "`greeting-!`",
+    newName = "`greeting-!`"
   )
 
   check(
@@ -241,7 +251,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |"" match {
        |  case `<<gre@@eting>>` =>
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -251,7 +261,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  case `gre@@eting` =>
        |}
        |""".stripMargin,
-    newName = "`greeting`",
+    newName = "`greeting`"
   )
 
   check(
@@ -262,7 +272,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        | .copy(<<va@@lue>> = "43")
        | .<<value>>
        |val name2 = Name(<<value>> = "44")
-       |""".stripMargin,
+       |""".stripMargin
   )
   check(
     "params2",
@@ -272,14 +282,14 @@ class PcRenameSuite extends BasePcRenameSuite {
        | .copy(<<value>> = "43")
        | .<<value>>
        |val name2 = Name(<<value>> = "44")
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
     "constructor",
     """|case class Name(<<va@@lue>>: String)
        |val name2 = new Name(<<value>> = "44")
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -289,7 +299,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |val a = classOf[<<AB@@C>>]
        |val b = new CBD[<<ABC>>]
        |""".stripMargin,
-    newName = "Animal",
+    newName = "Animal"
   )
 
   check(
@@ -299,7 +309,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |val a = classOf[<<ABC>>]
        |val b = new CBD[<<ABC>>]
        |""".stripMargin,
-    newName = "Animal",
+    newName = "Animal"
   )
 
   check(
@@ -313,7 +323,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  val x = bar
        |}
        |""".stripMargin,
-    newName = "foo2",
+    newName = "foo2"
   )
 
   check(
@@ -325,7 +335,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |val symbol2: <<Symbol>> = Method("method")
        |val symbol3: <<Symbol>> = Variable("value")
        |""".stripMargin,
-    newName = "NewSymbol",
+    newName = "NewSymbol"
   )
 
   check(
@@ -337,7 +347,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |val symbol2: <<Symbol>> = Method("method")
        |val symbol3: <<Symbol>> = Variable("value")
        |""".stripMargin,
-    newName = "NewSymbol",
+    newName = "NewSymbol"
   )
 
   check(
@@ -348,7 +358,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |    <<v5>> = true
        |    <<v5>> == true
        |  }
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -357,7 +367,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |trait T1[Z] extends S1[Z] { override def <<tore@@name>>(p: Z): String = super.<<torename>>(p) }
        |""".stripMargin,
     filename = "A.worksheet.sc",
-    wrap = false,
+    wrap = false
   )
 
   check(
@@ -368,7 +378,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |""".stripMargin,
     newName = "Tree",
     filename = "A.worksheet.sc",
-    wrap = false,
+    wrap = false
   )
 
   check(
@@ -381,7 +391,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |    <<ab@@c>>.map(_ + 1)
        |  }
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -391,7 +401,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  def double2 = <<sbd>> + <<sbd>>
        |end extension
        |""".stripMargin,
-    newName = "greeting",
+    newName = "greeting"
   )
 
   check(
@@ -401,7 +411,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  def double2 = <<sbd>> + <<sbd>>
        |end extension
        |""".stripMargin,
-    newName = "greeting",
+    newName = "greeting"
   )
 
   check(
@@ -411,7 +421,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  def double2 = <<xs>> ++ <<xs>>
        |end extension
        |""".stripMargin,
-    newName = "ABC",
+    newName = "ABC"
   )
 
   check(
@@ -421,7 +431,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  def double2 = <<xs>> ++ <<x@@s>>
        |end extension
        |""".stripMargin,
-    newName = "ABC",
+    newName = "ABC"
   )
 
   check(
@@ -433,7 +443,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  }
        |}
        |""".stripMargin,
-    newName = "testing",
+    newName = "testing"
   )
 
   check(
@@ -449,7 +459,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |    )
        |}
        |""".stripMargin,
-    newName = "`other-rename`",
+    newName = "`other-rename`"
   )
 
   check(
@@ -464,7 +474,7 @@ class PcRenameSuite extends BasePcRenameSuite {
       |} yield {
       |  val x = foo + <<foo@@Bar>> + baz
       |  x
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -473,7 +483,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  <<ab@@c>> <- List("a", "b", "c")
        |  _ = println("print!")
        |} yield <<a@@bc>>
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -486,7 +496,7 @@ class PcRenameSuite extends BasePcRenameSuite {
        |  for {
        |    b <- Bar(List(1,2,3))
        |  } yield b
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -494,7 +504,7 @@ class PcRenameSuite extends BasePcRenameSuite {
     """|def <<he@@llo>>(a: Int) =
        |  ???
        |end <<hello>>
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -502,7 +512,7 @@ class PcRenameSuite extends BasePcRenameSuite {
     """|def <<he@@llo>>(a: Int) =
        |  ???
        |end /* a comment */ <<hello>> /* a comment */
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -510,6 +520,6 @@ class PcRenameSuite extends BasePcRenameSuite {
     """|def <<f@@oo>> =
        |  def bar = 
        |    ???
-       |  end bar""".stripMargin,
+       |  end bar""".stripMargin
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/PcSemanticdbSuite.scala b/tests/cross/src/test/scala/tests/pc/PcSemanticdbSuite.scala
index d3fd919dab8..7fbc85e08ab 100644
--- a/tests/cross/src/test/scala/tests/pc/PcSemanticdbSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/PcSemanticdbSuite.scala
@@ -28,7 +28,7 @@ class PcSemanticdbSuite extends BasePCSuite {
        |  val a/*a.O.a.*/ = 123
        |  val b/*a.O.b.*/ = a/*a.O.a.*/ +/*scala.Int#`+`(+4).*/ 1
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -57,7 +57,7 @@ class PcSemanticdbSuite extends BasePCSuite {
            |  val b/*_empty_.O.b.*/ = a/*_empty_.O.a.*/ +/*scala.Int#`+`(+4).*/ 1
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   def check(
@@ -65,7 +65,7 @@ class PcSemanticdbSuite extends BasePCSuite {
       original: String,
       expected: String,
       compat: Map[String, String] = Map.empty,
-      filename: String = "A.scala",
+      filename: String = "A.scala"
   )(implicit loc: Location): Unit = {
     test(name) {
       val uri = new URI(s"file:///$filename")
@@ -76,7 +76,7 @@ class PcSemanticdbSuite extends BasePCSuite {
       val obtained = Semanticdbs.printTextDocument(withCode)
       assertNoDiff(
         obtained,
-        getExpected(expected, compat, scalaVersion),
+        getExpected(expected, compat, scalaVersion)
       )
     }
   }
diff --git a/tests/cross/src/test/scala/tests/pc/PrettyPrintSuite.scala b/tests/cross/src/test/scala/tests/pc/PrettyPrintSuite.scala
index 67c31117d81..02b3ebaf1dc 100644
--- a/tests/cross/src/test/scala/tests/pc/PrettyPrintSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/PrettyPrintSuite.scala
@@ -12,7 +12,7 @@ class PrettyPrintSuite extends BaseCompletionSuite {
       name: String,
       original: String,
       expected: String,
-      compat: Map[String, String] = Map.empty,
+      compat: Map[String, String] = Map.empty
   )(implicit loc: Location): Unit = {
     val signature = original.replace("@@", "")
     val completion = original.replaceFirst("@@.*", "@@")
@@ -32,7 +32,7 @@ class PrettyPrintSuite extends BaseCompletionSuite {
       """.stripMargin,
       completion,
       expected + suffix,
-      compat = compatWithSuffix,
+      compat = compatWithSuffix
     )
   }
 
@@ -41,7 +41,7 @@ class PrettyPrintSuite extends BaseCompletionSuite {
     "def foo@@(): this.type",
     // NOTE(olafur): this expected output is undesirable, we widen the type too aggressively.
     // It would be nice to fix this if possible.
-    "def foo(): Main",
+    "def foo(): Main"
   )
 
   checkSignature(
@@ -52,7 +52,7 @@ class PrettyPrintSuite extends BaseCompletionSuite {
     "def foo(x: Int): Any",
     compat = Map(
       "2.13" -> "def foo(x: Int): x.type"
-    ),
+    )
   )
 
   checkSignature(
@@ -60,109 +60,109 @@ class PrettyPrintSuite extends BaseCompletionSuite {
     "def foo@@(duck: {def quack(): Unit}): Unit",
     // NOTE(olafur): the ideal output would be without the redunant `AnyRef` but we need to implement
     // our own pretty-printer to fix that.
-    "def foo(duck: AnyRef{def quack(): Unit}): Unit",
+    "def foo(duck: AnyRef{def quack(): Unit}): Unit"
   )
 
   checkSignature(
     "int-literal",
     "def foo@@ = 42",
-    "override def foo: Int",
+    "override def foo: Int"
   )
 
   checkSignature(
     "string-literal",
     "def foo@@ = \"foo\"",
-    "override def foo: String",
+    "override def foo: String"
   )
 
   checkSignature(
     "int-val-literal",
     "val foo@@ = 42",
-    "override val foo: Int",
+    "override val foo: Int"
   )
 
   checkSignature(
     "int-val-literal",
     "def foo@@: Int with String",
-    "def foo: Int with String",
+    "def foo: Int with String"
   )
 
   checkSignature(
     "annotated",
     "def foo@@: Int @deprecated(\"\", \"\") ",
-    "def foo: Int",
+    "def foo: Int"
   )
 
   checkSignature(
     "by-name",
     "def foo@@(x: => Int): Unit",
-    "def foo(x: => Int): Unit",
+    "def foo(x: => Int): Unit"
   )
 
   checkSignature(
     "vararg",
     "def foo@@(x: Int*): Unit",
-    "def foo(x: Int*): Unit",
+    "def foo(x: Int*): Unit"
   )
 
   checkSignature(
     "forSome",
     "def foo@@: Option[T] forSome { type T }",
-    "def foo: Option[_]",
+    "def foo: Option[_]"
   )
 
   checkSignature(
     "forSome2",
     "def foo@@: Option[T] forSome { type T <: Int }",
-    "def foo: Option[_ <: Int]",
+    "def foo: Option[_ <: Int]"
   )
 
   checkSignature(
     "forSome3",
     "def foo@@: Map[T, T] forSome { type T <: Int }",
-    "def foo: Map[T,T] forSome { type T <: Int }",
+    "def foo: Map[T,T] forSome { type T <: Int }"
   )
 
   checkSignature(
     "function",
     "def foo@@(fn: Int => String): Unit",
-    "def foo(fn: Int => String): Unit",
+    "def foo(fn: Int => String): Unit"
   )
 
   checkSignature(
     "tuple",
     "def foo@@(tuple: (Int, String)): Unit",
-    "def foo(tuple: (Int, String)): Unit",
+    "def foo(tuple: (Int, String)): Unit"
   )
 
   checkSignature(
     "upper-bound",
     "def foo@@[T <: CharSequence](arg: T): T",
-    "def foo[T <: CharSequence](arg: T): T",
+    "def foo[T <: CharSequence](arg: T): T"
   )
 
   checkSignature(
     "lower-bound",
     "def foo@@[T >: CharSequence](arg: T): T",
-    "def foo[T >: CharSequence](arg: T): T",
+    "def foo[T >: CharSequence](arg: T): T"
   )
 
   checkSignature(
     "upper-lower-bound",
     "def foo@@[T >: String <: CharSequence](arg: T): T",
-    "def foo[T >: String <: CharSequence](arg: T): T",
+    "def foo[T >: String <: CharSequence](arg: T): T"
   )
 
   checkSignature(
     "context-bound",
     "def foo@@[T:Ordering](arg: T): T",
-    "def foo[T: Ordering](arg: T): T",
+    "def foo[T: Ordering](arg: T): T"
   )
 
   checkSignature(
     "view-bound",
     "def foo@@[T <% String](arg: T): T",
     // View bounds are not resugared into `<% String` because they're considered a bad practice.
-    "def foo[T](arg: T)(implicit evidence$1: T => String): T",
+    "def foo[T](arg: T)(implicit evidence$1: T => String): T"
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/SelectionRangeCommentSuite.scala b/tests/cross/src/test/scala/tests/pc/SelectionRangeCommentSuite.scala
index b124ec8d71c..0c945cad355 100644
--- a/tests/cross/src/test/scala/tests/pc/SelectionRangeCommentSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/SelectionRangeCommentSuite.scala
@@ -30,8 +30,8 @@ class SelectionRangeCommentSuite extends BaseSelectionRangeSuite {
          |    b <- Some(2)
          |  } yield a + b<<region<<
          |}
-         |""".stripMargin,
-    ),
+         |""".stripMargin
+    )
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/SelectionRangeSuite.scala b/tests/cross/src/test/scala/tests/pc/SelectionRangeSuite.scala
index 0cd89a3b4c6..1d9bcfb5737 100644
--- a/tests/cross/src/test/scala/tests/pc/SelectionRangeSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/SelectionRangeSuite.scala
@@ -46,7 +46,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite {
          |    case Some(name) => println("Hello! " + name)
          |    case None =>
          |  }
-         |}<<region<<""".stripMargin,
+         |}<<region<<""".stripMargin
     ),
     Map(
       "3" ->
@@ -86,9 +86,9 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite {
              |    case Some(name) => println("Hello! " + name)
              |    case None =>
              |  }
-             |}<<region<<""".stripMargin,
+             |}<<region<<""".stripMargin
         )
-    ),
+    )
   )
 
   check(
@@ -135,7 +135,7 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite {
          |    a <- Some(1)
          |    b <- Some(2)
          |  } yield a + b
-         |}<<region<<""".stripMargin,
+         |}<<region<<""".stripMargin
     ),
     Map(
       "3" -> List(
@@ -174,9 +174,9 @@ class SelectionRangeSuite extends BaseSelectionRangeSuite {
            |    a <- Some(1)
            |    b <- Some(2)
            |  } yield a + b
-           |}<<region<<""".stripMargin,
+           |}<<region<<""".stripMargin
       )
-    ),
+    )
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/ShadowingCompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/ShadowingCompletionSuite.scala
index 55f93eb5234..0ad5fb9fe1a 100644
--- a/tests/cross/src/test/scala/tests/pc/ShadowingCompletionSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/ShadowingCompletionSuite.scala
@@ -5,6 +5,10 @@ import tests.BaseCompletionSuite
 
 class ShadowingCompletionSuite extends BaseCompletionSuite {
 
+  override protected def ignoreScalaVersion: Option[IgnoreScalaVersion] = Some(
+    IgnoreScala211
+  )
+
   override protected def extraDependencies(
       scalaVersion: String
   ): Seq[Dependency] = Seq(
@@ -24,6 +28,6 @@ class ShadowingCompletionSuite extends BaseCompletionSuite {
        |""".stripMargin,
     compat = Map(
       "2" -> "ListBuffer - scala.collection.mutable"
-    ),
+    )
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/SignatureHelpDocSuite.scala b/tests/cross/src/test/scala/tests/pc/SignatureHelpDocSuite.scala
index ed137277803..75f3f4ac21e 100644
--- a/tests/cross/src/test/scala/tests/pc/SignatureHelpDocSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/SignatureHelpDocSuite.scala
@@ -63,7 +63,7 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
        |                       ^^^^^^^^^^^
        |  @param ifEmpty the expression to evaluate if empty.
        |  @param f the function to apply if nonempty.
-        """.stripMargin,
+        """.stripMargin
   )
 
   checkDoc(
@@ -93,7 +93,7 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
             |  @param ifEmpty the expression to evaluate if empty.
             |  @param f the function to apply if nonempty.
             |""".stripMargin
-    ),
+    )
   )
 
   val addedSpace: String = {
@@ -189,8 +189,8 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
            |          Returns `z` if this collection is empty.
            |foldLeft[B](z: B)(op: (B, Int) => B): B
            |                  ^^^^^^^^^^^^^^^^^
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkDoc(
@@ -204,7 +204,7 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
     """|
        |curry(a: Int, b: Int)(c: Int): Int
        |                      ^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   checkDoc(
@@ -214,45 +214,45 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
       |  List(1).map(x => @@)
       |}
     """.stripMargin,
-    """|Builds a new collection by applying a function to all elements of this collection.
+    """|Builds a new collection by applying a function to all elements of this general collection.
        |
        |
        |**Type Parameters**
        |- `B`: the element type of the returned collection.
+       |- `That`: the class of the returned collection. Where possible, `That` is
+       |the same class as the current collection class `Repr`, but this
+       |depends on the element type `B` being admissible for that class,
+       |which means that an implicit instance of type `CanBuildFrom[Repr, B, That]`
+       |is found.
        |
        |**Parameters**
        |- `f`: the function to apply to each element.
+       |- `bf`: an implicit value of class `CanBuildFrom` which determines
+       |the result class `That` from the current representation type `Repr` and
+       |the new element type `B`.
        |
-       |**Returns:** a new collection resulting from applying the given function
-       |               `f` to each element of this collection and collecting the results.
-       |map[B](f: Int => B): List[B]
-       |       ^^^^^^^^^^^
+       |**Returns:** a new general collection resulting from applying the given function
+       |                 `f` to each element of this general collection and collecting the results.
+       |map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
+       |             ^^^^^^^^^^^
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
-        """|Builds a new collection by applying a function to all elements of this general collection.
+      ">=2.13.0" ->
+        """|Builds a new collection by applying a function to all elements of this collection.
            |
            |
            |**Type Parameters**
            |- `B`: the element type of the returned collection.
-           |- `That`: the class of the returned collection. Where possible, `That` is
-           |the same class as the current collection class `Repr`, but this
-           |depends on the element type `B` being admissible for that class,
-           |which means that an implicit instance of type `CanBuildFrom[Repr, B, That]`
-           |is found.
            |
            |**Parameters**
            |- `f`: the function to apply to each element.
-           |- `bf`: an implicit value of class `CanBuildFrom` which determines
-           |the result class `That` from the current representation type `Repr` and
-           |the new element type `B`.
            |
-           |**Returns:** a new general collection resulting from applying the given function
-           |                 `f` to each element of this general collection and collecting the results.
-           |map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
-           |             ^^^^^^^^^^^
+           |**Returns:** a new collection resulting from applying the given function
+           |               `f` to each element of this collection and collecting the results.
+           |map[B](f: Int => B): List[B]
+           |       ^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   checkDoc(
@@ -300,8 +300,8 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
            |apply[A](x: A): Option[A]
            |         ^^^^
            |  @param x the value
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkDoc(
@@ -333,8 +333,8 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
            |singleton[T](o: T): java.util.Set[T]
            |             ^^^^
            |  @param o o the sole object to be stored in the returned set.
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkDoc(
@@ -384,7 +384,7 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
            |  @param fin Finally logic which if defined will be invoked after catch logic
            |  @param rethrow Predicate on throwables determining when to rethrow a caught [Throwable](Throwable)
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -406,7 +406,7 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
                 |File(parent: String, child: String)
                 |File(pathname: String)
                 |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -426,7 +426,7 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
            |substring(beginIndex: Int): String
            |          ^^^^^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -460,7 +460,7 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
            |valueOf(data: Array[Char]): String
            |valueOf(obj: Object): String
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -505,8 +505,8 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
            |valueOf(data: Array[Char], offset: Int, count: Int): String
            |valueOf(data: Array[Char]): String
            |valueOf(obj: Object): String
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   checkDoc(
@@ -527,8 +527,14 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
            | `A`.
            |Some[A](value: A)
            |        ^^^^^^^^
+           |""".stripMargin,
+      "2.11" ->
+        """|Class `Some[A]` represents existing values of type
+           | `A`.
+           |<init>(x: Int): Some[Int]
+           |       ^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   checkDoc(
@@ -546,6 +552,6 @@ class SignatureHelpDocSuite extends BaseSignatureHelpSuite {
        |**Returns:** a new range with a different step
        |by(step: Int): Range
        |   ^^^^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 }
diff --git a/tests/cross/src/test/scala/tests/pc/SignatureHelpPatternSuite.scala b/tests/cross/src/test/scala/tests/pc/SignatureHelpPatternSuite.scala
index 01f5e12ce06..8290aed4ccb 100644
--- a/tests/cross/src/test/scala/tests/pc/SignatureHelpPatternSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/SignatureHelpPatternSuite.scala
@@ -13,15 +13,14 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
       |  }
       |}
       |""".stripMargin,
-    """|map[B](f: ((Int, Int)) => B): List[B]
-       |       ^^^^^^^^^^^^^^^^^^^^
+    """|map[B, That](f: ((Int, Int)) => B)(implicit bf: CanBuildFrom[List[(Int, Int)],B,That]): That
+       |             ^^^^^^^^^^^^^^^^^^^^
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
-        """|map[B, That](f: ((Int, Int)) => B)(implicit bf: CanBuildFrom[List[(Int, Int)],B,That]): That
-           |             ^^^^^^^^^^^^^^^^^^^^
-           |""".stripMargin
-    ),
+      ">=2.13.0" -> """|map[B](f: ((Int, Int)) => B): List[B]
+                       |       ^^^^^^^^^^^^^^^^^^^^
+                       |""".stripMargin
+    )
   )
 
   check(
@@ -37,7 +36,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|(Int)
        | ^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -58,7 +57,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
         """|(a: T, b: T)
            | ^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -79,7 +78,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
         """|(a: C[T])
            | ^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -102,7 +101,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
         """|(a: Int, b: String)
            | ^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -124,7 +123,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|(Int, String)
        | ^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -144,7 +143,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|(Int, Int)
        | ^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -164,7 +163,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|(Int, Int)
        |      ^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -186,7 +185,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
         """|(name: String, age: Int)
            | ^^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -206,7 +205,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|(String, Int)
        | ^^^^^^
-       | """.stripMargin,
+       | """.stripMargin
   )
 
   check(
@@ -233,8 +232,8 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
                   |""".stripMargin,
       "3" -> """|(List[String])
                 | ^^^^^^^^^^^^
-                |""".stripMargin,
-    ),
+                |""".stripMargin
+    )
   )
 
   check(
@@ -253,7 +252,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|(String, String)
        |         ^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -283,8 +282,8 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|(String, String)
            |         ^^^^^^
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -304,7 +303,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|(Int)
        | ^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -328,7 +327,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
         """|(Option[Int])
            | ^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -343,7 +342,7 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|unapply[A](a: A): Some[(A, A)]
        |           ^^^^
-       | """.stripMargin,
+       | """.stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/pc/SignatureHelpSuite.scala b/tests/cross/src/test/scala/tests/pc/SignatureHelpSuite.scala
index c060fef7840..b6cd7c81e85 100644
--- a/tests/cross/src/test/scala/tests/pc/SignatureHelpSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/SignatureHelpSuite.scala
@@ -21,7 +21,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
            |assert(assertion: Boolean, message: => Any): Unit
            |                           ^^^^^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
   check(
     "empty",
@@ -40,7 +40,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
            |       ^^^^^^^^^^^^^^^^^^
            |assert(assertion: Boolean, message: => Any): Unit
            |""".stripMargin
-    ),
+    )
   )
   check(
     "erroneous",
@@ -51,7 +51,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|fold[B](ifEmpty: => B)(f: Int => B): B
        |                       ^^^^^^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -61,15 +61,15 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |  List(1).map(@@)
       |}
     """.stripMargin,
-    """|map[B](f: Int => B): List[B]
-       |       ^^^^^^^^^^^
+    """|map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
+       |             ^^^^^^^^^^^
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
-        """|map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
-           |             ^^^^^^^^^^^
+      ">=2.13.0" ->
+        """|map[B](f: Int => B): List[B]
+           |       ^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -91,7 +91,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
            |Random(seed: Long)
            |Random(self: java.util.Random)
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -109,7 +109,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
                 |               ^^^^^^^^^^^^
                 |ProcessBuilder(x$0: java.util.List[String])
                 |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -126,8 +126,11 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|Some[A](value: A)
            |        ^^^^^^^^
-           |""".stripMargin
-    ),
+           |""".stripMargin,
+      "2.11" -> """|<init>(x: Int): Some[Int]
+                   |       ^^^^^^
+                   |""".stripMargin
+    )
   )
 
   check(
@@ -151,7 +154,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
            |File(x$0: String, x$1: String)
            |File(x$0: String)
            |""".stripMargin
-    ),
+    )
   )
   check(
     "ctor4",
@@ -173,7 +176,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
            |File(x$0: String, x$1: String)
            |File(x$0: String)
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -188,7 +191,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """|apply(b: String): String
        |      ^^^^^^^^^
        |apply(a: Int): Int
-       |""".stripMargin,
+       |""".stripMargin
   )
   check(
     "partial",
@@ -207,7 +210,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|collect[B](pf: PartialFunction[Int, B]): Option[B]
            |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -219,7 +222,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|apply[A](x: A): Option[A]
        |         ^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
   check(
     "nested2",
@@ -228,15 +231,15 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |  List(Opt@@ion(1))
       |}
     """.stripMargin,
-    """|apply[A](elems: A*): List[A]
-       |         ^^^^^^^^^
+    """|apply[A](xs: A*): List[A]
+       |         ^^^^^^
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
-        """|apply[A](xs: A*): List[A]
-           |         ^^^^^^
+      ">=2.13.0" ->
+        """|apply[A](elems: A*): List[A]
+           |         ^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
   check(
     "nested3",
@@ -247,7 +250,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|apply[A](x: A): Option[A]
        |         ^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
   check(
     // https://github.com/lampepfl/dotty/issues/15244
@@ -260,14 +263,14 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |  List(1, 2@@
       |}
     """.stripMargin,
-    """|apply[A](elems: A*): List[A]
-       |         ^^^^^^^^^
+    """|apply[A](xs: A*): List[A]
+       |         ^^^^^^
        |""".stripMargin,
     compat = Map(
-      "2.12" -> """|apply[A](xs: A*): List[A]
-                   |         ^^^^^^
-                   |""".stripMargin
-    ),
+      ">=2.13.0" -> """|apply[A](elems: A*): List[A]
+                       |         ^^^^^^^^^
+                       |""".stripMargin
+    )
   )
 
   check(
@@ -281,7 +284,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|identity[A](x: A): A
        |         ^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -295,7 +298,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|empty[A]: Option[A]
        |      ^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -309,7 +312,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|apply[A](x: A): Option[A]
        |      ^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -327,8 +330,11 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     compat = Map(
       "3" -> """|empty[K, V]: Map[K, V]
                 |      ^
-                |""".stripMargin
-    ),
+                |""".stripMargin,
+      "2.11" -> """|empty[A, B]: Map[A,B]
+                   |      ^
+                   |""".stripMargin
+    )
   )
 
   check(
@@ -351,8 +357,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|lengthCompare(len: Int): Int
            |              ^^^^^^^^
            |lengthCompare(that: Iterable[?]): Int
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -371,7 +377,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|apply[K, V](elems: (K, V)*): Map[K, V]
            |            ^^^^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
   check(
     "for",
@@ -386,7 +392,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |  } yield l
       |}
     """.stripMargin,
-    "",
+    ""
   )
 
   check(
@@ -403,7 +409,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|apply[A](x: A): Option[A]
        |         ^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -439,7 +445,14 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
            |to(end: Int): scala.collection.immutable.Range.Inclusive
            |to(end: Int, step: Int): scala.collection.immutable.Range.Inclusive
            |""".stripMargin,
-    ),
+      "2.11" -> """|^^^^^^
+                   |to(end: Int): immutable.Range.Inclusive
+                   |to(end: Int, step: Int): immutable.Range.Inclusive
+                   |to(end: T): NumericRange.Inclusive[T]
+                   |to(end: T): Range.Partial[T,NumericRange[T]]
+                   |to(end: T, step: T): NumericRange.Inclusive[T]
+                   |""".stripMargin
+    )
   )
 
   check(
@@ -452,6 +465,11 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """|applyOrElse[K1 <: Int, V1 >: String](x: K1, default: K1 => V1): V1
        |                                     ^^^^^
        |""".stripMargin,
+    compat = Map(
+      "2.11" -> """|applyOrElse[A1 <: Int, B1 >: String](x: A1, default: A1 => B1): B1
+                   |                                     ^^^^^
+                   |""".stripMargin
+    )
   )
 
   check(
@@ -469,8 +487,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|apply[K, V](elems: (K, V)*): Map[K, V]
            |            ^^^^^^^^^^^^^^
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -513,8 +531,9 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|apply(viewId: String, nodeUri: String, label: String, command: String, icon: String, tooltip: String, collapseState: String): case-class.TreeViewNode
            |      ^^^^^^^^^^^^^^
-           |""".stripMargin
-    ),
+           |""".stripMargin,
+      "2.11" -> ""
+    )
   )
 
   check(
@@ -555,8 +574,9 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|apply(viewId: String, nodeUri: String, label: String, command: String, collapseState: String): case-class2.TreeViewNode
            |      ^^^^^^^^^^^^^^
-           |""".stripMargin
-    ),
+           |""".stripMargin,
+      "2.11" -> ""
+    )
   )
 
   check(
@@ -575,7 +595,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|apply(name: String, age: Int): named.User
            |                    ^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -594,7 +614,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|apply(name: String, age: Int): named1.User
            |                    ^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -607,7 +627,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|user(name: String, age: Int): Int
        |     ^^^^^^^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -629,7 +649,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
            |                             ^^^^^^^^^^^
            |user(name: String, age: Int): Int
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -641,7 +661,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|identity[A](x: A): A
        |            ^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -660,7 +680,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|Catch[T](pf: scala.util.control.Exception.Catcher[T], fin: Option[scala.util.control.Exception.Finally], rethrow: Throwable => Boolean)
            |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -682,8 +702,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|computeIfAbsent(x$0: String, x$1: java.util.function.Function[? >: String, ? <: Int]): Int
            |                ^^^^^^^^^^^
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -697,7 +717,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """|
        |curry(a: Int)(c: Int): Int
        |              ^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
   check(
     "last-arg",
@@ -708,7 +728,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|apply[A](x: A): Option[A]
        |         ^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -718,15 +738,15 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |  List[Int]("").map(a => @@)
       |}
     """.stripMargin,
-    """|map[B](f: Int => B): List[B]
-       |       ^^^^^^^^^^^
+    """|map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
+       |             ^^^^^^^^^^^
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
-        """|map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
-           |             ^^^^^^^^^^^
+      ">=2.13.0" ->
+        """|map[B](f: Int => B): List[B]
+           |       ^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -736,15 +756,15 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |  List(1).map(a => 2 @@)
       |}
     """.stripMargin,
-    """|map[B](f: Int => B): List[B]
-       |       ^^^^^^^^^^^
+    """|map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
+       |             ^^^^^^^^^^^
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
-        """|map[B, That](f: Int => B)(implicit bf: CanBuildFrom[List[Int],B,That]): That
-           |             ^^^^^^^^^^^
+      ">=2.13.0" ->
+        """|map[B](f: Int => B): List[B]
+           |       ^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -769,7 +789,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|map[G[_$3]](fn: Int => G[Int])(using T: last-arg3.TypeClass[F]): G[Int]
            |            ^^^^^^^^^^^^^^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -783,7 +803,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
     """.stripMargin,
     """|empty[T: ClassTag]: Array[T]
        |      ^^^^^^^^^^^
-       | """.stripMargin,
+       | """.stripMargin
   )
 
   check(
@@ -806,7 +826,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|conv[T](e: T): implicit-conv.Text[T]
            |        ^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -826,7 +846,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|Map[K, V]: Map
            |       ^
            | """.stripMargin
-    ),
+    )
   )
 
   check(
@@ -846,7 +866,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|Map[K, V]: Map
            |       ^
            | """.stripMargin
-    ),
+    )
   )
 
   check(
@@ -864,7 +884,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
         """|identity[A](x: A): A
            |            ^^^^
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -876,7 +896,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|identity[A](x: A): A
        |            ^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -895,8 +915,8 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|fold[B](ifEmpty: => B)(f: Int => B): B
            |        ^^^^^^^^^^^^^
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -908,7 +928,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|fold[B](ifEmpty: => B)(f: Int => B): B
        |        ^^^^^^^^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -922,7 +942,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|fold[B](ifEmpty: => B)(f: Int => B): B
        |                       ^^^^^^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -949,8 +969,9 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|deployment(fst: String, snd: Int): Option[Int]
            |           ^^^^^^^^^^^
-           |""".stripMargin
-    ),
+           |""".stripMargin,
+      "2.11" -> ""
+    )
   )
 
   check(
@@ -971,8 +992,9 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|deployment(fst: String, snd: Int): Option[Int]
            |           ^^^^^^^^^^^
-           |""".stripMargin
-    ),
+           |""".stripMargin,
+      "2.11" -> ""
+    )
   )
 
   check(
@@ -995,8 +1017,9 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|deployment(str: String)(fst: String, snd: Int): Option[Int]
            |                        ^^^^^^^^^^^
-           |""".stripMargin
-    ),
+           |""".stripMargin,
+      "2.11" -> ""
+    )
   )
 
   check(
@@ -1019,8 +1042,9 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|deployment(str: String)(opt: Option[Int])(fst: String, snd: Int): Option[Int]
            |                                          ^^^^^^^^^^^
-           |""".stripMargin
-    ),
+           |""".stripMargin,
+      "2.11" -> ""
+    )
   )
 
   check(
@@ -1043,8 +1067,9 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       "3" ->
         """|deployment(str: String)(opt: Option[Int])(fst: String, snd: Int): Option[Int]
            |                        ^^^^^^^^^^^^^^^^
-           |""".stripMargin
-    ),
+           |""".stripMargin,
+      "2.11" -> ""
+    )
   )
 
   check(
@@ -1062,7 +1087,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |""".stripMargin,
     """|deployment(using str: String)(fst: String, snd: Int): Option[Int]
        |                              ^^^^^^^^^^^
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/tokens/SemanticTokensScala3Suite.scala b/tests/cross/src/test/scala/tests/tokens/SemanticTokensScala3Suite.scala
index 72d352ad7ef..df3f0347e47 100644
--- a/tests/cross/src/test/scala/tests/tokens/SemanticTokensScala3Suite.scala
+++ b/tests/cross/src/test/scala/tests/tokens/SemanticTokensScala3Suite.scala
@@ -14,7 +14,7 @@ class SemanticTokensScala3Suite extends BaseSemanticTokensSuite {
        |enum <<FooEnum>>/*enum,abstract*/:
        |  case <<Bar>>/*enum*/, <<Baz>>/*enum*/
        |object <<FooEnum>>/*class*/
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -26,7 +26,7 @@ class SemanticTokensScala3Suite extends BaseSemanticTokensSuite {
        |  case <<B>>/*enum*/(<<a>>/*variable,declaration,readonly*/: <<Int>>/*class,abstract*/, <<b>>/*variable,declaration,readonly*/: <<Int>>/*class,abstract*/)
        |  case <<C>>/*enum*/(<<a>>/*variable,declaration,readonly*/: <<Int>>/*class,abstract*/, <<b>>/*variable,declaration,readonly*/: <<Int>>/*class,abstract*/, <<c>>/*variable,declaration,readonly*/: <<Int>>/*class,abstract*/)
        |
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   // Issue: Sequential parameters are not highlighted
@@ -37,7 +37,7 @@ class SemanticTokensScala3Suite extends BaseSemanticTokensSuite {
         |
         |def <<m>>/*method,definition*/(<<xs>>/*parameter,declaration,readonly*/: <<Int>>/*class,abstract*/*) = <<xs>>/*parameter,readonly*/.<<map>>/*method*/(<<_>>/*parameter,readonly*/ <<+>>/*method*/ 1)
         |val <<a>>/*variable,definition,readonly*/ = <<m>>/*method*/(xs = 1,2,3)
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   // Issue: Structural types are not highlighted
@@ -88,7 +88,7 @@ class SemanticTokensScala3Suite extends BaseSemanticTokensSuite {
             |  <<V>>/*variable,readonly*/.<<scalameta>>/*method*/
             |end StructuralTypes
             |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -100,7 +100,7 @@ class SemanticTokensScala3Suite extends BaseSemanticTokensSuite {
         |  var <<b>>/*variable,definition*/ = 2
         |  val <<c>>/*variable,definition,readonly*/ = <<List>>/*class*/(1,<<a>>/*variable,readonly*/,<<b>>/*variable*/)
         |  <<b>>/*variable*/ = <<a>>/*variable,readonly*/
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   check(
@@ -111,7 +111,7 @@ class SemanticTokensScala3Suite extends BaseSemanticTokensSuite {
       |  val <<y>>/*variable,definition,readonly*/ = <<Vector>>/*class*/(1,2)
       |  val <<z>>/*variable,definition,readonly*/ = <<Set>>/*class*/(1,2,3)
       |  val <<w>>/*variable,definition,readonly*/ = <<Right>>/*class*/(1)
-      |}""".stripMargin,
+      |}""".stripMargin
   )
 
   check(
@@ -121,7 +121,7 @@ class SemanticTokensScala3Suite extends BaseSemanticTokensSuite {
        |object <<A>>/*class*/ {
        |  val <<f>>/*variable,definition,readonly*/ = <<Foo>>/*class*/(1,2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -137,13 +137,13 @@ class SemanticTokensScala3Suite extends BaseSemanticTokensSuite {
        |object <<Tag>>/*class*/ {
        |  type <<@@>>/*type,definition*/ = <<Int>>/*class,abstract*/
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
     "main-annot",
     """|@<<main>>/*class*/ def <<main>>/*method,definition*/(<<args>>/*parameter,declaration,readonly*/: <<Array>>/*class*/[<<String>>/*type*/]): <<Unit>>/*class,abstract*/ = ()
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/tokens/SemanticTokensSuite.scala b/tests/cross/src/test/scala/tests/tokens/SemanticTokensSuite.scala
index 56ed4a6b987..0461cbfaffd 100644
--- a/tests/cross/src/test/scala/tests/tokens/SemanticTokensSuite.scala
+++ b/tests/cross/src/test/scala/tests/tokens/SemanticTokensSuite.scala
@@ -31,7 +31,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
         |   <<println>>/*method*/(<<msg>>/*parameter,readonly*/)
         | }
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   check(
@@ -66,7 +66,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
             |   }
             |}
             |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -108,7 +108,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
             |  }
             |}
             |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -188,7 +188,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
             |
             |
             |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -203,7 +203,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
         |     <<println>>/*method*/("Hello, world!"<<+>>/*method*/ <<str>>/*variable,readonly*/)
         |  }
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
   check(
     "import(Out of File)",
@@ -217,7 +217,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
         |     = <<SortedSet>>/*class*/(<<x>>/*parameter,readonly*/)
         |}
         |
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   check(
@@ -250,7 +250,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
                  |    override def <<method>>/*method,definition*/(<<adf>>/*parameter,declaration,readonly*/: <<String>>/*type*/): <<Int>>/*class,abstract*/ = 321
                  |  }
                  |}""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -262,7 +262,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
         |class <<Imports>>/*class*/ {
         |  // rename reference
         |  <<NoBad>>/*class*/(null)
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   check(
@@ -277,7 +277,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
         |    case <<Some>>/*class*/(<<b>>/*variable,definition,readonly*/) => <<b>>/*variable,readonly*/
         |    case <<other>>/*variable,definition,readonly*/ => 
         |  }
-        |}""".stripMargin,
+        |}""".stripMargin
   )
 
   check(
@@ -290,7 +290,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
         |  val <<Some>>/*class*/(<<s1>>/*variable,definition,readonly*/) = <<s>>/*variable,readonly*/
         |  val <<Some>>/*class*/(<<s2>>/*variable,definition,readonly*/) = <<s>>/*variable,readonly*/
         |}
-        |""".stripMargin,
+        |""".stripMargin
   )
 
   // When for-comprehension includes line with `=`, we get `scala.x$1`, `scala.x$2` symbols on `foo`.
@@ -318,7 +318,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
            |  } yield <<foo>>/*variable,readonly*/
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -329,7 +329,7 @@ class SemanticTokensSuite extends BaseSemanticTokensSuite {
        |    <<`type`>>/*parameter,readonly*/ = "abc"
        |  )
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
 }
diff --git a/tests/cross/src/test/scala/tests/typedef/TypeDefinitionSuite.scala b/tests/cross/src/test/scala/tests/typedef/TypeDefinitionSuite.scala
index 47cac5c56d2..fa674fc2b68 100644
--- a/tests/cross/src/test/scala/tests/typedef/TypeDefinitionSuite.scala
+++ b/tests/cross/src/test/scala/tests/typedef/TypeDefinitionSuite.scala
@@ -34,7 +34,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            |object Main {
            |  val tst = new TClass(2)
            |}""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -48,7 +48,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |    if y < /*scala/Int# Int.scala*/@@x
        |  } yield y
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -60,7 +60,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |    y <- Option(x)
        |  } yield y
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -72,7 +72,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |    y /*scala/Option# Option.scala*/@@<- Option(x)
        |  } yield y
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -85,7 +85,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |    /*scala/Option#WithFilter# Option.scala*/@@if y > 2
        |  } yield y
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -108,7 +108,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            |  tst(new TClass(2))
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -118,7 +118,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |  val increment: Int => Int = _ + 2
        |  incre/*scala/Int# Int.scala*/@@ment(1)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -128,7 +128,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  @@(1, 2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -137,7 +137,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |  def tst(): Unit = {}
        |
        |  ts@@/*scala/Unit# Unit.scala*/t()
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -146,7 +146,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |  def tst(par1: Int, par2: String, par3: Boolean): Unit = {}
        |
        |  tst(1, p/*scala/Boolean# Boolean.scala*/@@ar3 = true, par2 = "")
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -155,7 +155,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |  def tst(par1: Int, par2: String): Unit = {}
        |
        |  tst(p/*scala/Predef.String# Predef.scala*/@@ar2 = "foo", par1 = 1)
-       |}""".stripMargin,
+       |}""".stripMargin
   )
 
   check(
@@ -165,7 +165,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |
        |  foo(a/*scala/Int# Int.scala*/@@rg = 42)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -180,7 +180,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            |  assert(a/*scala/Boolean# Boolean.scala*/@@ssertion = true)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -188,7 +188,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
     """|object Main {
        | List(1).hea/*scala/Int# Int.scala*/@@d
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -203,7 +203,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            | class <<>>Foo(val x: Int)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -211,7 +211,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
     """|object Main {
        | va@@l x = 42
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -219,7 +219,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
     """|object Main {
        | val x = 4/*scala/Int# Int.scala*/@@2
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -227,20 +227,20 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
     """|object Main {
        | for {
        |   x <- List(1)
-       |   i/*scala/collection/WithFilter# WithFilter.scala*/@@f x > 1
+       |   i/*scala/collection/generic/FilterMonadic# FilterMonadic.scala*/@@f x > 1
        | } println(x)
        |}
        |""".stripMargin,
     compat = Map(
-      "2.12" ->
+      ">=2.13.0" ->
         """|object Main {
            | for {
            |   x <- List(1)
-           |   i/*scala/collection/generic/FilterMonadic# FilterMonadic.scala*/f x > 1
+           |   i/*scala/collection/WithFilter# WithFilter.scala*/f x > 1
            | } println(x)
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -248,7 +248,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
     """|object Main {
        | "".stripS/*java/lang/String# String.java*/@@uffix("foo")
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -263,7 +263,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            | def foo[<<>>T](param: T): T = param
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -274,7 +274,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        | println(A.fo/*scala/Int# Int.scala*/@@o(2))
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -296,8 +296,8 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            |object Main {
            |  /*scala/collection/immutable/List# List.scala*/List(1)
            |}
-           |""".stripMargin,
-    ),
+           |""".stripMargin
+    )
   )
 
   check(
@@ -306,7 +306,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  ne@@w java.io.File("")
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -314,7 +314,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
     """|
        |object Main ex@@tends java.io.Serializable {
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -331,7 +331,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            |object Main {
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -340,7 +340,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |imp@@ort scala.concurrent.Future
        |object Main {
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -349,7 +349,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |import scala.co@@ncurrent.Future
        |object Main {
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -358,7 +358,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  val lst = 1 /*scala/collection/immutable/List# List.scala*/@@:: Nil
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -367,7 +367,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  val n = ma@@th.max(1, 2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -376,7 +376,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  List(1).map(/*scala/Int# Int.scala*/@@_ + 2)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -385,7 +385,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  List(1).foldLeft(0)(_ + /*scala/Int# Int.scala*/@@_)
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -394,7 +394,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |object Main {
        |  def x: /*scala/Int# Int.scala*/@@Int = 42
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -403,7 +403,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
        |class Main {
        |  val all = Option(42)./*scala/Int# Int.scala*/@@get :: List("1", "2")
        |}
-       |""".stripMargin,
+       |""".stripMargin
   )
 
   check(
@@ -424,7 +424,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            |  hello(User())
            |}
            |""".stripMargin
-    ),
+    )
   )
 
   check(
@@ -445,7 +445,7 @@ class TypeDefinitionSuite extends BasePcDefinitionSuite {
            |  hello(new Us@@er())
            |}
            |""".stripMargin
-    ),
+    )
   )
 
 }
diff --git a/tests/mtest/src/main/scala/tests/Assertions.scala b/tests/mtest/src/main/scala/tests/Assertions.scala
index bff97dc093a..07e8dd470f2 100644
--- a/tests/mtest/src/main/scala/tests/Assertions.scala
+++ b/tests/mtest/src/main/scala/tests/Assertions.scala
@@ -34,7 +34,7 @@ trait Assertions extends munit.Assertions {
   def assertDiffNotEqual[T](
       obtained: T,
       expected: T,
-      hint: String = "",
+      hint: String = ""
   )(implicit loc: Location): Unit = {
     if (obtained == expected) {
       val hintMsg = if (hint.isEmpty) "" else s" (hint: $hint)"
diff --git a/tests/mtest/src/main/scala/tests/BaseSuite.scala b/tests/mtest/src/main/scala/tests/BaseSuite.scala
index 5892b842e07..ba74663b83c 100644
--- a/tests/mtest/src/main/scala/tests/BaseSuite.scala
+++ b/tests/mtest/src/main/scala/tests/BaseSuite.scala
@@ -49,7 +49,7 @@ abstract class BaseSuite extends munit.FunSuite with Assertions {
   def isValidScalaVersionForEnv(scalaVersion: String): Boolean =
     this.isJava8 || SemVer.isCompatibleVersion(
       BaseSuite.minScalaVersionForJDK9OrHigher,
-      scalaVersion,
+      scalaVersion
     ) || scalaVersion.startsWith("3.")
 
   override def munitTimeout: Duration = Duration("10min")
@@ -63,9 +63,9 @@ abstract class BaseSuite extends munit.FunSuite with Assertions {
         "FlakyWindows",
         test =>
           if (test.tags(FlakyWindows) && Properties.isWin) test.tag(Flaky)
-          else test,
+          else test
       ),
-      munitFlakyTransform,
+      munitFlakyTransform
     )
 
   val compatProcess: Map[String, String => String] =
@@ -74,7 +74,7 @@ abstract class BaseSuite extends munit.FunSuite with Assertions {
   def getExpected(
       default: String,
       compat: Map[String, String],
-      scalaVersion: String,
+      scalaVersion: String
   ): String = {
     val postProcess = compatProcess
       .collectFirst {
@@ -90,7 +90,7 @@ abstract class BaseSuite extends munit.FunSuite with Assertions {
   def compatOrDefault[A](
       default: A,
       compat: Map[String, A],
-      scalaVersion: String,
+      scalaVersion: String
   ): A =
     Compat
       .forScalaVersion(scalaVersion, compat)
diff --git a/tests/mtest/src/main/scala/tests/Compat.scala b/tests/mtest/src/main/scala/tests/Compat.scala
index e7ce3000035..a99e3bc5505 100644
--- a/tests/mtest/src/main/scala/tests/Compat.scala
+++ b/tests/mtest/src/main/scala/tests/Compat.scala
@@ -11,7 +11,7 @@ object Compat {
    */
   def forScalaVersion[A](
       scalaVersion: String,
-      cases: Map[String, A],
+      cases: Map[String, A]
   ): Option[A] = {
     val (startsWith, gt) =
       cases.partition { case (v, _) => !v.startsWith(">=") }
@@ -31,7 +31,7 @@ object Compat {
 
   private def matchesGte[A](
       version: String,
-      gtCases: Map[String, A],
+      gtCases: Map[String, A]
   ): Option[A] = {
     val parsed = SemVer.Version.fromString(version)
     val less = gtCases
diff --git a/tests/mtest/src/main/scala/tests/DelegatingGlobalSymbolIndex.scala b/tests/mtest/src/main/scala/tests/DelegatingGlobalSymbolIndex.scala
index 1f29a1f1c57..6d439242638 100644
--- a/tests/mtest/src/main/scala/tests/DelegatingGlobalSymbolIndex.scala
+++ b/tests/mtest/src/main/scala/tests/DelegatingGlobalSymbolIndex.scala
@@ -25,19 +25,19 @@ class DelegatingGlobalSymbolIndex(
   def addSourceFile(
       file: AbsolutePath,
       sourceDirectory: Option[AbsolutePath],
-      dialect: Dialect,
+      dialect: Dialect
   ): List[String] = {
     underlying.addSourceFile(file, sourceDirectory, dialect)
   }
   def addSourceJar(
       jar: AbsolutePath,
-      dialect: Dialect,
+      dialect: Dialect
   ): List[(String, AbsolutePath)] = {
     underlying.addSourceJar(jar, dialect)
   }
   def addSourceDirectory(
       dir: AbsolutePath,
-      dialect: Dialect,
+      dialect: Dialect
   ): List[(String, AbsolutePath)] = {
     underlying.addSourceDirectory(dir, dialect)
   }
diff --git a/tests/mtest/src/main/scala/tests/PCSuite.scala b/tests/mtest/src/main/scala/tests/PCSuite.scala
index b751ade9026..79f40b5b226 100644
--- a/tests/mtest/src/main/scala/tests/PCSuite.scala
+++ b/tests/mtest/src/main/scala/tests/PCSuite.scala
@@ -37,8 +37,10 @@ trait PCSuite {
     .create()
     .withRepositories(allRepos: _*)
 
-  protected def indexJdkSources: Unit =
-    JdkSources().foreach(jdk => index.addSourceJar(jdk, dialects.Scala213))
+  protected def indexJdkSources: Unit = JdkSources() match {
+    case Right(jdk) => index.addSourceJar(jdk, dialects.Scala213)
+    case _ =>
+  }
 
   protected def extraLibraries(f: Fetch): Seq[Path] = f
     .fetch()
@@ -54,7 +56,7 @@ trait PCSuite {
         .fromClasspath(myclasspath, ExcludedPackagesHandler.default),
       new Docstrings(index),
       workspace,
-      index,
+      index
     )
   }
 
@@ -71,7 +73,7 @@ trait PCSuite {
 
   def hoverParams(
       code: String,
-      filename: String = "test.java",
+      filename: String = "test.java"
   ): (String, Int, Int) = {
     val code2 = code.replace("@@", "").replace("%<%", "").replace("%>%", "")
     val positionOffset =
diff --git a/tests/mtest/src/main/scala/tests/RangeReplace.scala b/tests/mtest/src/main/scala/tests/RangeReplace.scala
index 56724295980..866d6f0d89e 100644
--- a/tests/mtest/src/main/scala/tests/RangeReplace.scala
+++ b/tests/mtest/src/main/scala/tests/RangeReplace.scala
@@ -10,7 +10,7 @@ trait RangeReplace {
 
   def renderHighlightsAsString(
       code: String,
-      highlights: List[DocumentHighlight],
+      highlights: List[DocumentHighlight]
   ): String = {
     highlights
       .foldLeft((code, List.empty[(Int, Int)])) {
@@ -19,7 +19,7 @@ trait RangeReplace {
             code,
             base,
             location.getRange,
-            alreadyAddedMarkings,
+            alreadyAddedMarkings
           )
       }
       ._1
@@ -29,7 +29,7 @@ trait RangeReplace {
       base: String,
       range: Range,
       prefix: String = "<<",
-      suffix: String = ">>",
+      suffix: String = ">>"
   ): String =
     replaceInRangeWithAdjustmens(base, base, range, List(), prefix, suffix)._1
 
@@ -39,7 +39,7 @@ trait RangeReplace {
       range: Range,
       alreadyAddedMarkings: List[(Int, Int)],
       prefix: String = "<<",
-      suffix: String = ">>",
+      suffix: String = ">>"
   ): (String, List[(Int, Int)]) = {
     val input = Input.String(code)
     val pos = range
@@ -64,8 +64,8 @@ trait RangeReplace {
         .toString,
       (pos.start, prefix.length) :: (
         pos.end,
-        suffix.length,
-      ) :: alreadyAddedMarkings,
+        suffix.length
+      ) :: alreadyAddedMarkings
     )
   }
 
diff --git a/tests/mtest/src/main/scala/tests/TestHovers.scala b/tests/mtest/src/main/scala/tests/TestHovers.scala
index 536be07dfca..2e92d32b219 100644
--- a/tests/mtest/src/main/scala/tests/TestHovers.scala
+++ b/tests/mtest/src/main/scala/tests/TestHovers.scala
@@ -18,7 +18,7 @@ trait TestHovers {
             expressionType,
             Some(symbolSignature),
             "",
-            forceExpressionType = true,
+            forceExpressionType = true
           )
         case _ =>
           string
@@ -34,7 +34,7 @@ trait TestHovers {
             expressionType,
             symbolSignature,
             "",
-            forceExpressionType = true,
+            forceExpressionType = true
           )
         case _ =>
           string
@@ -50,7 +50,7 @@ trait TestHovers {
             expressionType,
             Some(symbolSignature),
             "",
-            forceExpressionType = true,
+            forceExpressionType = true
           )
         case _ =>
           string
@@ -60,7 +60,7 @@ trait TestHovers {
   def renderAsString(
       code: String,
       hover: Option[Hover],
-      includeRange: Boolean,
+      includeRange: Boolean
   ): String = {
     hover match {
       case Some(value) =>
@@ -76,7 +76,7 @@ trait TestHovers {
               )
             codeFence(
               pos.text,
-              "range",
+              "range"
             )
           case _ => ""
         }
diff --git a/tests/mtest/src/main/scala/tests/TestSemanticTokens.scala b/tests/mtest/src/main/scala/tests/TestSemanticTokens.scala
index 88792d4c114..1ffd08b2092 100644
--- a/tests/mtest/src/main/scala/tests/TestSemanticTokens.scala
+++ b/tests/mtest/src/main/scala/tests/TestSemanticTokens.scala
@@ -67,7 +67,7 @@ object TestSemanticTokens {
             val candidates = head :: rest.takeWhile(nxt =>
               nxt.start() == head.start() && isIdentifier(
                 nxt.start(),
-                nxt.end(),
+                nxt.end()
               )
             )
             val node = candidates.maxBy(node =>
@@ -107,12 +107,12 @@ object TestSemanticTokens {
               deltaStartChar,
               length,
               tokenType,
-              tokenModifier,
+              tokenModifier
             ) => // modifiers ignored for now
           (
             new l.Position(deltaLine, deltaStartChar),
             length,
-            decorationString(tokenType, tokenModifier),
+            decorationString(tokenType, tokenModifier)
           )
         case _ =>
           throw new RuntimeException("Expected output dividable by 5")
@@ -122,7 +122,7 @@ object TestSemanticTokens {
     @tailrec
     def toAbsolutePositions(
         positions: List[(l.Position, Int, String)],
-        last: l.Position,
+        last: l.Position
     ): Unit = {
       positions match {
         case (head, _, _) :: next =>
diff --git a/tests/mtest/src/main/scala/tests/TestingSymbolSearch.scala b/tests/mtest/src/main/scala/tests/TestingSymbolSearch.scala
index 5e0a638aa77..be7051dadec 100644
--- a/tests/mtest/src/main/scala/tests/TestingSymbolSearch.scala
+++ b/tests/mtest/src/main/scala/tests/TestingSymbolSearch.scala
@@ -32,12 +32,12 @@ class TestingSymbolSearch(
     docs: Docstrings = Docstrings.empty(EmptyReportContext),
     workspace: TestingWorkspaceSearch =
       TestingWorkspaceSearch.empty(EmptyReportContext),
-    index: GlobalSymbolIndex = OnDemandSymbolIndex.empty()(EmptyReportContext),
+    index: GlobalSymbolIndex = OnDemandSymbolIndex.empty()(EmptyReportContext)
 )(implicit rc: ReportContext = EmptyReportContext)
     extends SymbolSearch {
   override def documentation(
       symbol: String,
-      parents: ParentSymbols,
+      parents: ParentSymbols
   ): Optional[SymbolDocumentation] = {
     docs.documentation(symbol, parents)
   }
@@ -54,7 +54,7 @@ class TestingSymbolSearch(
         ju.Collections.singletonList(
           new Location(
             uri,
-            new Range(new Position(0, 0), new Position(0, 0)),
+            new Range(new Position(0, 0), new Position(0, 0))
           )
         )
     }
@@ -62,7 +62,7 @@ class TestingSymbolSearch(
 
   override def definitionSourceToplevels(
       symbol: String,
-      source: URI,
+      source: URI
   ): ju.List[String] = {
     index.definition(Symbol(symbol)) match {
       case None =>
@@ -77,7 +77,7 @@ class TestingSymbolSearch(
   override def search(
       textQuery: String,
       buildTargetIdentifier: String,
-      visitor: SymbolSearchVisitor,
+      visitor: SymbolSearchVisitor
   ): SymbolSearch.Result = {
     val query = WorkspaceSymbolQuery.exact(textQuery)
     workspace.search(query, visitor)
@@ -87,7 +87,7 @@ class TestingSymbolSearch(
   override def searchMethods(
       textQuery: String,
       buildTargetIdentifier: String,
-      visitor: SymbolSearchVisitor,
+      visitor: SymbolSearchVisitor
   ): SymbolSearch.Result = {
     val query = WorkspaceSymbolQuery.exact(textQuery)
     workspace.search(
@@ -95,7 +95,7 @@ class TestingSymbolSearch(
       visitor,
       (info: WorkspaceSymbolInformation) => {
         info.sematicdbKind == s.SymbolInformation.Kind.METHOD
-      },
+      }
     )
     SymbolSearch.Result.COMPLETE
   }
diff --git a/tests/mtest/src/main/scala/tests/TestingWorkspaceSearch.scala b/tests/mtest/src/main/scala/tests/TestingWorkspaceSearch.scala
index 577c6980fad..06647fbcb6b 100644
--- a/tests/mtest/src/main/scala/tests/TestingWorkspaceSearch.scala
+++ b/tests/mtest/src/main/scala/tests/TestingWorkspaceSearch.scala
@@ -26,7 +26,7 @@ class TestingWorkspaceSearch(implicit rc: ReportContext = EmptyReportContext) {
   def search(
       query: WorkspaceSymbolQuery,
       visitor: SymbolSearchVisitor,
-      filter: WorkspaceSymbolInformation => Boolean = _ => true,
+      filter: WorkspaceSymbolInformation => Boolean = _ => true
   ): Unit =
     for {
       (path, (text, dialect)) <- inputs
@@ -34,7 +34,7 @@ class TestingWorkspaceSearch(implicit rc: ReportContext = EmptyReportContext) {
       SemanticdbDefinition.foreach(
         Input.VirtualFile(path, text),
         dialect,
-        includeMembers = true,
+        includeMembers = true
       ) { defn =>
         if (query.matches(defn.info)) {
           val c = defn.toCached
@@ -43,7 +43,7 @@ class TestingWorkspaceSearch(implicit rc: ReportContext = EmptyReportContext) {
               Paths.get(path),
               c.symbol,
               c.kind,
-              c.range,
+              c.range
             )
           }
         }