diff --git a/batch-bootstrapper/Dockerfile b/batch-bootstrapper/Dockerfile
index 2303208..f8ba1a0 100644
--- a/batch-bootstrapper/Dockerfile
+++ b/batch-bootstrapper/Dockerfile
@@ -8,12 +8,11 @@ WORKDIR /app
 RUN pip install pipenv
 
 # Install dependencies using Pipfile
-COPY ../batch-bootstrapper/Pipfile* ./
+COPY ./Pipfile* ./
 RUN pipenv install
 
 # Copy src files
-COPY ../batch-bootstrapper/*.py ./
-COPY ../lambda-bootstrapper/tabular.py ./
+COPY ./*.py ./
 
 
 # Run batch bootstrapper
diff --git a/batch-bootstrapper/Makefile b/batch-bootstrapper/Makefile
index 6f7cdb6..0f2b472 100644
--- a/batch-bootstrapper/Makefile
+++ b/batch-bootstrapper/Makefile
@@ -1,19 +1,19 @@
 all: build run
 
 build:
-	docker build -t tabular-cdc-batch-bootstrapper
+	docker build -t tabular-cdc-batch-bootstrapper .
 
 fresh:
-	docker build -t tabular-cdc-batch-bootstrapper --no-cache
+	docker build -t tabular-cdc-batch-bootstrapper --no-cache .
 
 run:
 	docker-compose up
 
 test: build
-	docker run --env-file ./.env tabular-cdc-batch-bootstrapper pipenv run pytest -v
+	docker run --env-file .env tabular-cdc-batch-bootstrapper pipenv run pytest -v
 
 test-ci: build
-	docker run --env-file ./.env tabular-cdc-batch-bootstrapper pipenv run pytest -v
+	docker run --env-file .env tabular-cdc-batch-bootstrapper pipenv run pytest -v
 
 run-interactive:
-	docker run -it --env-file ./.env tabular-cdc-batch-bootstrapper sh
\ No newline at end of file
+	docker run -it --env-file .env tabular-cdc-batch-bootstrapper sh
\ No newline at end of file
diff --git a/batch-bootstrapper/test_tabular.py b/batch-bootstrapper/test_tabular.py
new file mode 100644
index 0000000..5911f9a
--- /dev/null
+++ b/batch-bootstrapper/test_tabular.py
@@ -0,0 +1,90 @@
+from io import BytesIO
+import os
+
+import pyarrow as pa
+import pyarrow.parquet as pq
+from pyiceberg.catalog import load_catalog
+import pytest
+
+import tabular
+
+class TestTabular:
+  CATALOG_PROPERTIES = {
+    'type':       'rest',
+    'uri':        os.environ['TABULAR_CATALOG_URI'],
+    'credential': os.environ['TABULAR_CREDENTIAL'],
+    'warehouse':  os.environ['TABULAR_TARGET_WAREHOUSE'],
+  }
+
+  catalog = load_catalog(**CATALOG_PROPERTIES)
+
+
+  def test_extract_database_and_table(self):
+    s3_key = 'cdc-bootstrap/alpha/gazebo/my-file.json'
+
+    database, table = tabular.extract_database_and_table(s3_key)
+    assert database == 'cdc-bootstrap' and table == 'alpha'
+
+    database, table = tabular.extract_database_and_table(s3_key, '')
+    assert database == 'cdc-bootstrap' and table == 'alpha'
+
+    database, table = tabular.extract_database_and_table(s3_key, 'cdc-bootstrap')
+    assert database == 'alpha' and table == 'gazebo'
+    
+    with pytest.raises(ValueError):
+      tabular.extract_database_and_table(s3_key, 'cdc-bootstrap/alpha')
+
+  def test_bootstrap_from_file(self):
+    test_cases = {
+      'table_exists':     ('cdc-bootstrap/system/catalog_events/my-file.json', 'cdc-bootstrap', False),
+      'table_missing':    ('cdc-bootstrap/fingers-crossed-this-doesnt-exist/missing-table/my-file.json', 'cdc-bootstrap', True),
+      'database_missing': ('cdc-bootstrap/pyiceberg/alpha/my-file.json', '', True)
+    }
+
+    for key in test_cases:
+      test_case = test_cases[key]
+      assert tabular.bootstrap_from_file(test_case[0], test_case[1], self.CATALOG_PROPERTIES) == test_case[2]
+    
+    # test some junk
+    with pytest.raises(ValueError):
+      tabular.bootstrap_from_file('lkdfj.jdsfskl', 'fdassdf', {})
+
+  def test_get_table_schema_from_parquet(self):
+    test_sets = [
+      {
+        'Name': ['John', 'Anna', 'Peter', 'Linda'],
+        'Age': [30, 20, 40, 50]
+      },
+    ]
+
+    for test_set in test_sets:
+      # turn the test set into an in-memory parquet file
+      tbl = pa.table(test_set)
+      parquet_file = BytesIO()
+      pq.write_table(tbl, parquet_file)
+
+      # get the actual schema 
+      actual_schema = tabular.get_table_schema_from_parquet(parquet_file)
+
+      # get expected values
+      expected_field_names = set(test_set.keys())
+
+      # assert 💪
+      assert set(actual_schema.names) == expected_field_names
+
+  def test_create_table_from_s3_path(self):
+    mock_s3_key = 'cdc-bootstrap/pyiceberg/_test_create_table_from_s3_path/my-file.json'
+    target_db_name = '_test_cdc_bootloader'
+    target_table_name = '_test_create_table_from_s3_path'
+
+    try:
+      tabular.create_table_from_s3_path(s3_key=mock_s3_key, catalog=self.catalog, database=target_db_name, table=target_table_name)
+      actual_table = self.catalog.load_table(f'{target_db_name}.{target_table_name}')
+
+      expected_table_name = ('default', target_db_name, target_table_name)
+
+      assert actual_table.name() == expected_table_name
+    
+    finally:
+      self.catalog.drop_table(f'{target_db_name}.{target_table_name}')
+      self.catalog.drop_namespace(target_db_name)