diff --git a/LICENSE.md b/LICENSE.md
index d2ab96d..e833d19 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -4,4 +4,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/pyproject.toml b/pyproject.toml
index d40bb02..316fa9d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "nbsapi_verify"
-version = "0.1.5"
+version = "0.1.6"
 description = "Verify an nbsinfra API implementation"
 readme = "README.md"
 license = {text = "MIT License"}
@@ -12,6 +12,9 @@ dependencies = [
 authors = [
     { name = "Stephan Hügel", email = "urschrei@gmail.com" },
 ]
+maintainers = [
+    { name = "Hrishi Ballal", email = "hrishi@geodesignhub.com" },
+]
 keywords = ["nbsinfra", "nbsapi"]
 
 [project.urls]
diff --git a/src/nbsapi_verify/cli.py b/src/nbsapi_verify/cli.py
index 513ff2b..eab5024 100644
--- a/src/nbsapi_verify/cli.py
+++ b/src/nbsapi_verify/cli.py
@@ -148,6 +148,23 @@ def cli(
                 err=True,
             )
             sys.exit(1)
+            
+    # Load config to check available test types
+    with open(config_path) as f:
+        config = yaml.safe_load(f)
+        
+    # Check for test type mismatch
+    has_auth_config = "username" in config.get("variables", {}) and "password" in config.get("variables", {})
+    
+    # Detect test type mismatch
+    if test_type in (TestType.AUTH, TestType.ALL) and not has_auth_config:
+        click.echo(
+            f"Error: Test type '{test_type}' requested but auth configuration is missing.\n"
+            "Auth tests require 'username' and 'password' in the configuration.\n"
+            "Please regenerate the configuration with --username and --password parameters.",
+            err=True,
+        )
+        sys.exit(1)
 
     # Get the package's test directory
     package_dir = Path(__file__).parent
@@ -157,6 +174,54 @@ def cli(
         click.echo(f"Error: Test directory not found at {test_dir}", err=True)
         sys.exit(1)
 
+    # Verify that requested test types have matching test files
+    import glob
+    
+    # Get all test files and check for their markers
+    test_files = glob.glob(str(test_dir / "*.tavern.yaml"))
+    
+    # Check if there are any test files with requested markers
+    has_auth_tests = False
+    has_public_tests = False
+    
+    for test_file in test_files:
+        with open(test_file) as f:
+            content = f.read()
+            if "marks:\n- auth" in content:
+                has_auth_tests = True
+            if "marks:\n- public" in content:
+                has_public_tests = True
+    
+    # Verify requested test type has matching test files
+    if test_type == TestType.AUTH and not has_auth_tests:
+        click.echo(
+            f"Error: Test type '{test_type}' requested but no auth test files found.\n"
+            "Make sure auth test files are generated and properly marked.",
+            err=True,
+        )
+        sys.exit(1)
+    
+    if test_type == TestType.PUBLIC and not has_public_tests:
+        click.echo(
+            f"Error: Test type '{test_type}' requested but no public test files found.\n"
+            "Make sure public test files are generated and properly marked.",
+            err=True,
+        )
+        sys.exit(1)
+        
+    if test_type == TestType.ALL and not (has_auth_tests and has_public_tests):
+        missing = []
+        if not has_auth_tests:
+            missing.append("auth")
+        if not has_public_tests:
+            missing.append("public")
+        click.echo(
+            f"Error: Test type '{test_type}' requested but some test types are missing: {', '.join(missing)}.\n"
+            "Make sure all test types are generated before running 'all' tests.",
+            err=True,
+        )
+        sys.exit(1)
+
     # Prepare pytest arguments
     pytest_args = [
         str(test_dir),