diff --git a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java b/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
index 28182bb30..51f900f63 100644
--- a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
+++ b/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
@@ -44,17 +44,26 @@ void evaluateResult(@NonNull ExitStatus status, @NonNull ExitCode expectedCode,
   }
 
   private static Stream<Arguments> providesValues() {
-    @SuppressWarnings("serial") List<Arguments> values = new LinkedList<>() {
+    @SuppressWarnings("serial")
+    List<Arguments> values = new LinkedList<>() {
       {
         add(Arguments.of(new String[] {}, ExitCode.INVALID_COMMAND,
             NO_EXCEPTION_CLASS));
         add(Arguments.of(new String[] { "-h" }, ExitCode.OK, NO_EXCEPTION_CLASS));
         add(Arguments.of(new String[] { "generate-schema", "--help" }, ExitCode.OK,
             NO_EXCEPTION_CLASS));
+        add(Arguments.of(new String[] { "generate-diagram", "--help" }, ExitCode.OK,
+            NO_EXCEPTION_CLASS));
         add(Arguments.of(new String[] { "validate", "--help" }, ExitCode.OK,
             NO_EXCEPTION_CLASS));
         add(Arguments.of(new String[] { "validate-content", "--help" }, ExitCode.OK,
             NO_EXCEPTION_CLASS));
+        add(Arguments.of(new String[] { "convert", "--help" }, ExitCode.OK,
+            NO_EXCEPTION_CLASS));
+        add(Arguments.of(new String[] { "metapath", "list-functions", "--help" }, ExitCode.OK,
+            NO_EXCEPTION_CLASS));
+        add(Arguments.of(new String[] { "metapath", "eval", "--help" }, ExitCode.OK,
+            NO_EXCEPTION_CLASS));
         add(Arguments.of(
             new String[] { "validate",
                 "../databind/src/test/resources/metaschema/fields_with_flags/metaschema.xml"
@@ -163,6 +172,14 @@ private static Stream<Arguments> providesValues() {
         add(Arguments.of(
             new String[] { "metapath", "list-functions" },
             ExitCode.OK, NO_EXCEPTION_CLASS));
+        add(Arguments.of(
+            new String[] { "convert",
+                "-m",
+                "../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml",
+                "--to=yaml",
+                "../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml",
+            },
+            ExitCode.OK, NO_EXCEPTION_CLASS));
       }
     };