diff --git a/cratedb_sqlparse_py/tests/test_enricher.py b/cratedb_sqlparse_py/tests/test_enricher.py
new file mode 100644
index 0000000..8d02d4c
--- /dev/null
+++ b/cratedb_sqlparse_py/tests/test_enricher.py
@@ -0,0 +1,46 @@
+def test_table_metadata():
+    from cratedb_sqlparse import sqlparse
+    from cratedb_sqlparse.parser import Metadata
+
+    query = "SELECT 1; SELECT 2;"
+    stmts = sqlparse(query)
+    for stmt in stmts:
+        assert hasattr(stmt, "metadata")
+        assert isinstance(stmt.metadata, Metadata)
+
+
+def test_table_name_statement():
+    from cratedb_sqlparse import sqlparse
+
+    query = "CREATE TABLE doc.tbl2 (a TEXT)"
+
+    stmts = sqlparse(query)
+    stmt = stmts[0]
+
+    assert stmt.metadata.schema == "doc"
+    assert stmt.metadata.table_name == "tbl2"
+
+
+def test_table_name_statements():
+    from cratedb_sqlparse import sqlparse
+
+    query = """
+    SELECT A,B,C,D,E FROM doc.tbl1;
+    SELECT A,B FROM "doc"."tbl1";
+    SELECT A,B FROM "tbl1";
+    SELECT A,B FROM tbl1;
+    """
+
+    stmts = sqlparse(query=query)
+
+    assert stmts[0].metadata.schema == "doc"
+    assert stmts[0].metadata.table_name == "tbl1"
+
+    assert stmts[1].metadata.schema == "doc"
+    assert stmts[1].metadata.table_name == "tbl1"
+
+    assert stmts[2].metadata.schema is None
+    assert stmts[2].metadata.table_name == "tbl1"
+
+    assert stmts[3].metadata.schema is None
+    assert stmts[3].metadata.table_name == "tbl1"