diff --git a/tests/test_cli_misc.py b/tests/test_cli_misc.py
index cddfaf07..b5dd2e75 100644
--- a/tests/test_cli_misc.py
+++ b/tests/test_cli_misc.py
@@ -1,27 +1,41 @@
 import schemachange.cli
+import pytest
 
 
-def test_alphanum_convert_integer():
+def test_cli_given__schemachange_version_change():
+    assert schemachange.cli._schemachange_version == "3.6.1"
+
+
+def test_cli_given__constants_exist():
+
+    assert schemachange.cli._config_file_name == "schemachange-config.yml"
+    assert schemachange.cli._metadata_database_name == "METADATA"
+    assert schemachange.cli._metadata_schema_name == "SCHEMACHANGE"
+    assert schemachange.cli._metadata_table_name == "CHANGE_HISTORY"
+    assert schemachange.cli._snowflake_application_name == "schemachange"
+
+
+def test_alphanum_convert_given__integer():
     assert schemachange.cli.alphanum_convert("123") == 123
 
 
-def test_alphanum_convert_lowercase():
+def test_alphanum_convert_given__lowercase():
     assert schemachange.cli.alphanum_convert("TEST") == "test"
 
 
-def test_get_alphanum_key_empty_string():
+def test_get_alphanum_key_given__empty_string():
     assert schemachange.cli.get_alphanum_key("") == [""]
 
 
-def test_get_alphanum_key_numbers_only():
+def test_get_alphanum_key_given__numbers_only():
     assert schemachange.cli.get_alphanum_key("123") == ["", 123, ""]
 
 
-def test_get_alphanum_key_alphabets_only():
+def test_get_alphanum_key_given__alphabets_only():
     assert schemachange.cli.get_alphanum_key("abc") == ["abc"]
 
 
-def test_get_alphanum_key_upper_alphanumeric():
+def test_get_alphanum_key_given__upper_alphanumeric():
     assert schemachange.cli.get_alphanum_key("V1.2.3__") == [
         "v",
         1,
@@ -33,7 +47,7 @@ def test_get_alphanum_key_upper_alphanumeric():
     ]
 
 
-def test_get_alphanum_key_valid_version_string():
+def test_get_alphanum_key_given__valid_version_string():
     assert schemachange.cli.get_alphanum_key("1.2.2") == ["", 1, ".", 2, ".", 2, ""]
 
 
@@ -41,3 +55,81 @@ def test_sorted_alphanumeric_mixed_string():
     assert schemachange.cli.sorted_alphanumeric(
         ["V1.2.3__file.sql", "V1.2.4__file.sql"]
     ) == ["V1.2.3__file.sql", "V1.2.4__file.sql"]
+
+
+@pytest.mark.parametrize(
+    "cht, expected",
+    [
+        (
+            None,
+            {
+                "database_name": schemachange.cli._metadata_database_name.upper(),
+                "schema_name": schemachange.cli._metadata_schema_name.upper(),
+                "table_name": schemachange.cli._metadata_table_name.upper(),
+            },
+        ),
+        (
+            "change_history_table",
+            {
+                "database_name": schemachange.cli._metadata_database_name.upper(),
+                "schema_name": schemachange.cli._metadata_schema_name.upper(),
+                "table_name": "change_history_table".upper(),
+            },
+        ),
+        (
+            "myschema.change_history_table",
+            {
+                "database_name": schemachange.cli._metadata_database_name.upper(),
+                "schema_name": "myschema".upper(),
+                "table_name": "change_history_table".upper(),
+            },
+        ),
+        (
+            "mydb.myschema.change_history_table",
+            {
+                "database_name": "mydb".upper(),
+                "schema_name": "myschema".upper(),
+                "table_name": "change_history_table".upper(),
+            },
+        ),
+        (
+            '"change-history-table"',
+            {
+                "database_name": schemachange.cli._metadata_database_name.upper(),
+                "schema_name": schemachange.cli._metadata_schema_name.upper(),
+                "table_name": '"change-history-table"',
+            },
+        ),
+        (
+            '"my-schema"."change-history-table"',
+            {
+                "database_name": schemachange.cli._metadata_database_name.upper(),
+                "schema_name": '"my-schema"',
+                "table_name": '"change-history-table"',
+            },
+        ),
+        (
+            '"my-db"."my-schema"."change-history-table"',
+            {
+                "database_name": '"my-db"',
+                "schema_name": '"my-schema"',
+                "table_name": '"change-history-table"',
+            },
+        ),
+    ],
+)
+def test_get_change_history_table_details_given__acceptable_values_produces_fully_qualified_change_history_table_name(
+    cht, expected
+):
+    assert schemachange.cli.get_change_history_table_details(cht) == expected
+
+@pytest.mark.parametrize(
+    "cht", [("fifth.fourth.third.two.one"), ("fourth.third.two.one")]
+)
+def test_get_change_history_table_details_given__unacceptable_values_raises_error(
+    cht
+):
+    with pytest.raises(ValueError) as e:
+        schemachange.cli.get_change_history_table_details(cht)
+
+    assert str(e.value).startswith("Invalid change history table name: ")