diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
deleted file mode 100644
index f36bb72bd..000000000
--- a/.github/workflows/sonar.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: SonarCloud
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  sonarcloud:
-    name: SonarCloud
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
\ No newline at end of file
diff --git a/testkit/src/main/scala/com/reactific/riddl/testkit/TranslatingTestBase.scala b/testkit/src/main/scala/com/reactific/riddl/testkit/TranslatingTestBase.scala
deleted file mode 100644
index 1be0ffafa..000000000
--- a/testkit/src/main/scala/com/reactific/riddl/testkit/TranslatingTestBase.scala
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2019 Ossum, Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package com.reactific.riddl.testkit
-
-import com.reactific.riddl.language.*
-import com.reactific.riddl.utils.Logger
-import com.reactific.riddl.utils.StringLogger
-
-import java.nio.file.Path
-
-abstract class TranslatingTestBase[OPTS <: TranslatingOptions]
-    extends ValidatingTest {
-
-  val commonOptions: CommonOptions = CommonOptions(
-    showTimes = true,
-    showWarnings = false,
-    showMissingWarnings = false,
-    showStyleWarnings = false
-  )
-  val directory = "examples/src/riddl/"
-  val output = "examples/target/translator/"
-  val roots: Map[String, String] =
-    Map("Reactive BBQ" -> "ReactiveBBQ/ReactiveBBQ.riddl")
-  val logger: Logger = StringLogger()
-
-  def makeInputFile(partialFilePath: String): Path = {
-    Path.of(directory).resolve(partialFilePath)
-  }
-
-  def makeTranslatorOptions(fileName: String): OPTS
-
-  def getTranslator: Translator[OPTS]
-
-  def runTests(testName: String): Unit = {
-    testName should {
-      for { (name, fileName) <- roots } {
-        s"translate $name" in {
-          val options = makeTranslatorOptions(fileName)
-          val translator = getTranslator
-          translator
-            .parseValidateTranslate(logger, commonOptions, options) match {
-            case Right(_)       => succeed
-            case Left(messages) => fail(messages.format)
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/testkit/src/main/scala/com/reactific/riddl/testkit/IncludeAndImportTest.scala b/testkit/src/test/scala/com/reactific/riddl/testkit/IncludeAndImportTest.scala
similarity index 100%
rename from testkit/src/main/scala/com/reactific/riddl/testkit/IncludeAndImportTest.scala
rename to testkit/src/test/scala/com/reactific/riddl/testkit/IncludeAndImportTest.scala
diff --git a/testkit/src/test/scala/com/reactific/riddl/testkit/RiddlFilesTestBaseTest.scala b/testkit/src/test/scala/com/reactific/riddl/testkit/RiddlFilesTestBaseTest.scala
new file mode 100644
index 000000000..3d60518ae
--- /dev/null
+++ b/testkit/src/test/scala/com/reactific/riddl/testkit/RiddlFilesTestBaseTest.scala
@@ -0,0 +1,35 @@
+package com.reactific.riddl.testkit
+
+import org.scalatest.Assertion
+
+import java.io.File
+import java.nio.file.Path
+
+class RiddlFilesTestBaseTest extends RiddlFilesTestBase {
+
+  def checkAFile(rootDir: Path, file: File): Assertion = {
+    succeed
+  }
+
+  "RiddlFilesTestBase" should {
+    "find riddl files" in {
+      val dir = "testkit/src/test/input"
+      val files = findRiddlFiles(new File(dir), true)
+      files.size must be > 0
+    }
+    "not find non-files" in {
+      intercept[org.scalatest.exceptions.TestFailedException] {
+        processAFile("foo.txt")
+      }
+    }
+    "require .riddl suffix" in {
+      intercept[org.scalatest.exceptions.TestFailedException] {
+        processAFile("testkit/src/test/input/hugo.conf")
+      }
+    }
+    "handle a file or directory" in {
+      processADirectory("testkit/src/test/input/hugo.conf")
+      processADirectory("testkit/src/test/input/domains")
+    }
+  }
+}