diff --git a/src/tests/test_modify_entry_validation.py b/src/tests/test_modify_entry_validation.py
index 7ceb9980..a6f87f42 100644
--- a/src/tests/test_modify_entry_validation.py
+++ b/src/tests/test_modify_entry_validation.py
@@ -81,17 +81,10 @@ def test_modify_entry_invalid_fields(
 ):
     """Test that modify_entry raises ValueError for invalid fields based on EntryType."""
     # Setup entry
-    if entry_type == EntryType.TOTP:
-        # add_totp returns a URI string, need to fix the index manually or check implementation
-        # Checking implementation: add_totp returns URI string, but index is predictable (0)
-        # However, we should verify the index.
-        # For simplicity, we assume index 0 as it's the first entry.
-        setup_func(entry_manager)
-        index = 0
-    elif entry_type == EntryType.PASSWORD:
-        index = setup_func(entry_manager)
-    else:
-        index = setup_func(entry_manager)
+    # Some setup functions return the index, but add_totp returns a URI string.
+    # To be consistent and verify the index, we get it before calling setup_func.
+    index = entry_manager.get_next_index()
+    setup_func(entry_manager)
 
     # Verify entry exists and has correct type
     entry = entry_manager.retrieve_entry(index)
diff --git a/verify_fix.py b/verify_fix.py
deleted file mode 100644
index b89b2ac1..00000000
--- a/verify_fix.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import sys
-import os
-from unittest.mock import MagicMock
-from fastapi.testclient import TestClient
-from pathlib import Path
-
-# Add src to sys.path
-sys.path.insert(0, os.path.abspath("src"))
-
-# Mock seedpass.api._pm before importing api
-import seedpass.api
-
-seedpass.api._pm = MagicMock()
-# No need to mock is_valid_filename now as I check inline
-seedpass.api._token = "testtoken"  # Set a dummy token
-
-from seedpass.api import app
-
-client = TestClient(app)
-
-
-def test_fix():
-    evil_path = "/tmp/evil_file"
-    response = client.post(
-        "/api/v1/vault/backup-parent-seed",
-        json={"path": evil_path},
-        headers={"Authorization": "Bearer testtoken"},
-    )
-
-    assert response.status_code == 400, f"Expected 400, got {response.status_code}"
-    assert response.json() == {"detail": "Invalid filename"}
-
-    # Check that handle_backup_reveal_parent_seed was NOT called
-    seedpass.api._pm.handle_backup_reveal_parent_seed.assert_not_called()
-    print("Fix verified: Rejected arbitrary path.")
-
-    # Test valid filename
-    valid_file = "backup.enc"
-    response = client.post(
-        "/api/v1/vault/backup-parent-seed",
-        json={"path": valid_file},
-        headers={"Authorization": "Bearer testtoken"},
-    )
-    assert response.status_code == 200, f"Expected 200, got {response.status_code}"
-    seedpass.api._pm.handle_backup_reveal_parent_seed.assert_called_with(
-        Path(valid_file)
-    )
-    print("Fix verified: Accepted valid filename.")
-
-
-if __name__ == "__main__":
-    test_fix()