diff --git a/tests/test_database.py b/tests/test_database.py
index 6ab1e1e1..3f699996 100644
--- a/tests/test_database.py
+++ b/tests/test_database.py
@@ -168,15 +168,23 @@ class TestSchemaMigrations:
         # Run migrations
         _run_schema_migrations(engine)
 
-        # Verify columns were added
+        # Verify columns were added with correct types
         from sqlalchemy import inspect
 
         inspector = inspect(engine)
-        columns = [col["name"] for col in inspector.get_columns("files")]
+        columns = {col["name"]: col for col in inspector.get_columns("files")}
+        
         assert "original_file_path" in columns
+        assert columns["original_file_path"]["type"].__class__.__name__ in ("VARCHAR", "String", "TEXT")
+        
         assert "processed_file_path" in columns
+        assert columns["processed_file_path"]["type"].__class__.__name__ in ("VARCHAR", "String", "TEXT")
+        
         assert "is_duplicate" in columns
+        assert columns["is_duplicate"]["type"].__class__.__name__ in ("BOOLEAN", "Integer")
+        
         assert "duplicate_of_id" in columns
+        assert columns["duplicate_of_id"]["type"].__class__.__name__ in ("INTEGER", "Integer")
 
         engine.dispose()
 
diff --git a/tests/test_upload_email.py b/tests/test_upload_email.py
index cf284c47..4d60318e 100644
--- a/tests/test_upload_email.py
+++ b/tests/test_upload_email.py
@@ -63,8 +63,8 @@ class TestGetEmailTemplate:
     @patch("app.tasks.upload_to_email.os.path.exists")
     @patch("app.tasks.upload_to_email.FileSystemLoader")
     @patch("app.tasks.upload_to_email.Environment")
-    def test_handles_custom_template_exception_gracefully(self, mock_env, mock_loader, mock_exists):
-        """Test handles custom template loading exception and falls back to built-in."""
+    def test_fallback_to_builtin_template_when_custom_template_fails(self, mock_env, mock_loader, mock_exists):
+        """Test fallback to built-in template when custom template loading fails."""
         # Workdir exists, but template loading fails; falls back to built-in
         mock_exists.return_value = True
         mock_template = Mock()
@@ -161,35 +161,44 @@ class TestAttachLogo:
 
     @patch("app.tasks.upload_to_email.os.path.exists")
     @patch("builtins.open", new_callable=mock_open, read_data=b"fake_svg_data")
-    def test_attaches_svg_logo(self, mock_file, mock_exists):
-        """Test attaches SVG logo with correct MIME type."""
-        # Mock exists to return True for custom logo path with .svg extension
-        def exists_side_effect(path):
-            return path.endswith(".svg") or "logo.png" in path
+    def test_attaches_svg_logo_with_correct_mime_type(self, mock_file, mock_exists):
+        """Test attaches SVG logo with correct MIME type (image/svg+xml)."""
+        # Create a custom side effect that returns True only for SVG path
+        def custom_exists(path):
+            return "logo.svg" in path
 
-        mock_exists.side_effect = exists_side_effect
+        mock_exists.side_effect = custom_exists
         msg = MIMEMultipart()
 
-        # Patch the logo path to be SVG
+        # Patch the logo filename to be SVG
         with patch("app.tasks.upload_to_email._LOGO_FILENAME", "logo.svg"):
-            result = attach_logo(msg)
+            with patch("app.tasks.upload_to_email.settings") as mock_settings:
+                mock_settings.workdir = "/tmp"
+                result = attach_logo(msg)
 
         assert result is True
         assert len(msg.get_payload()) > 0
+        
+        # Verify SVG MIME type is used (the function detects .svg extension)
+        # Note: MIMEImage may default to a different subtype, but the key is that 
+        # the function passes 'image/svg+xml' as mimetype parameter
+        # Since we're using mock_open, we can't verify the exact MIME in the attachment,
+        # but we verified the code path is exercised
 
     @patch("app.tasks.upload_to_email.os.path.exists")
     @patch("builtins.open", new_callable=mock_open, read_data=b"fake_logo_data")
     def test_checks_multiple_logo_locations(self, mock_file, mock_exists):
         """Test checks custom location first, then falls back to app locations."""
         # Simulate custom logo not existing, but app logo existing
-        mock_exists.side_effect = [False, False, True]  # workdir, app/static, frontend/static
+        # First call: workdir custom, Second: app/static, Third: frontend/static
+        mock_exists.side_effect = [False, False, True]
         msg = MIMEMultipart()
 
         result = attach_logo(msg)
 
         assert result is True
-        # Verify multiple paths were checked
-        assert mock_exists.call_count >= 2
+        # Verify exactly three paths were checked as configured
+        assert mock_exists.call_count == 3
 
 
 @pytest.mark.unit