diff --git a/src/config.js b/src/config.js
index bde39aa..7ae0b7f 100644
--- a/src/config.js
+++ b/src/config.js
@@ -19,8 +19,8 @@ export const SIGNAL_MAPPINGS = {
   ],
 
   MAF: ['Air Mass', 'MAF', 'Flow'],
-  Latitude: ['lat', 'Lat', 'lateral', 'GPS Latitude', 'Latitude'],
-  Longitude: ['lng', 'Lng', 'lon', 'GPS Longitude', 'Longitude'],
+  Latitude: ['GPS-Lat', 'lat', 'Lat', 'lateral', 'GPS Latitude', 'Latitude'],
+  Longitude: ['GPS-Lon', 'lng', 'Lng', 'lon', 'GPS Longitude', 'Longitude'],
 
   Torque: ['Torque', 'Engine Torque', 'Nm'],
   'Vehicle Speed': ['Vehicle Speed', 'Speed', 'Velocity'],
diff --git a/src/drive.js b/src/drive.js
index 124578f..5c2aaec 100644
--- a/src/drive.js
+++ b/src/drive.js
@@ -10,10 +10,17 @@ import { debounce } from './debounce.js';
 export const Drive = {
   activeLoadToken: 0,
   PATH_CONFIG: { root: 'mygiulia', sub: 'trips' },
-  masterCards: [],
+
+  // Data Store
+  fileData: [], // Stores objects: { file, meta }
+
   _state: {
     sortOrder: 'desc',
     filters: { term: '', start: null, end: null },
+    pagination: {
+      currentPage: 1,
+      itemsPerPage: 10, // Adjust this number to change page size
+    },
   },
 
   // --- Core Drive Operations ---
@@ -66,36 +73,53 @@ export const Drive = {
     }
   },
 
-  async fetchJsonFiles(
-    folderId,
-    listEl = document.getElementById('driveFileContainer')
-  ) {
+  async fetchJsonFiles(folderId) {
+    const listEl = document.getElementById('driveFileContainer');
     if (!listEl) return;
 
+    listEl.innerHTML =
+      '<div class="status-msg">Fetching all logs from Drive...</div>';
+    this.fileData = []; // Clear existing data
+
+    let pageToken = null;
+    let hasMore = true;
+
     try {
-      const res = await gapi.client.drive.files.list({
-        pageSize: 50,
-        fields: 'files(id, name, size, modifiedTime)',
-        q: `'${folderId}' in parents and name contains '.json' and trashed=false`,
-        orderBy: 'modifiedTime desc',
-      });
+      // Loop to fetch ALL pages
+      while (hasMore) {
+        const res = await gapi.client.drive.files.list({
+          pageSize: 100, // Fetch in larger chunks
+          fields: 'nextPageToken, files(id, name, size, modifiedTime)',
+          q: `'${folderId}' in parents and name contains '.json' and trashed=false`,
+          orderBy: 'modifiedTime desc',
+          pageToken: pageToken,
+        });
+
+        const files = res.result.files || [];
+
+        // Process and store data immediately
+        const processedFiles = files.map((f) => ({
+          file: f,
+          meta: this.getFileMetadata(f.name),
+          timestamp: this.extractTimestamp(f.name), // Pre-calculate for sorting
+        }));
+
+        this.fileData = [...this.fileData, ...processedFiles];
+
+        pageToken = res.result.nextPageToken;
+        if (!pageToken) {
+          hasMore = false;
+        } else {
+          // Optional: Update UI with progress
+          listEl.innerHTML = `<div class="status-msg">Loaded ${this.fileData.length} logs...</div>`;
+        }
+      }
 
-      const files = res.result.files || [];
-      if (files.length === 0) {
+      if (this.fileData.length === 0) {
         listEl.innerHTML = '<div class="status-msg">No log files found.</div>';
         return;
       }
 
-      listEl.innerHTML = files
-        .map((f) => {
-          const meta = this.getFileMetadata(f.name);
-          return this.TEMPLATES.fileCard(f, meta);
-        })
-        .join('');
-
-      this.masterCards = Array.from(
-        listEl.querySelectorAll('.drive-file-card')
-      );
       this.initSearch();
     } catch (error) {
       this.handleApiError(error, listEl);
@@ -112,7 +136,7 @@ export const Drive = {
     recent = [id, ...recent.filter((i) => i !== id)].slice(0, 3);
     localStorage.setItem('recent_logs', JSON.stringify(recent));
 
-    this.refreshUI();
+    // Do NOT full refreshUI here, or we lose page position.
 
     const currentToken = ++this.activeLoadToken;
     UI.setLoading(true, 'Fetching from Drive...', () => {
@@ -140,6 +164,7 @@ export const Drive = {
   // --- Search & Filtering Logic ---
 
   initSearch() {
+    // Fixed typo here: was 'constinputs', now 'const inputs'
     const inputs = {
       text: document.getElementById('driveSearchInput'),
       clearText: document.getElementById('clearDriveSearchText'),
@@ -148,49 +173,75 @@ export const Drive = {
       sortBtn: document.getElementById('driveSortToggle'),
     };
 
+    // Helper to wire up events safely
+    const safeAddEvent = (id, event, handler) => {
+      const el = document.getElementById(id);
+      if (el) el.addEventListener(event, handler);
+      return el;
+    };
+
     const debouncedRefresh = debounce(() => this.refreshUI(), 250);
 
     const updateHandler = (immediate = false) => {
       this._state.filters = {
-        term: inputs.text?.value.toLowerCase().trim() || '',
-        start: inputs.start?.value
-          ? new Date(inputs.start.value).setHours(0, 0, 0, 0)
+        term:
+          document
+            .getElementById('driveSearchInput')
+            ?.value.toLowerCase()
+            .trim() || '',
+        start: document.getElementById('driveDateStart')?.value
+          ? new Date(document.getElementById('driveDateStart').value).setHours(
+              0,
+              0,
+              0,
+              0
+            )
           : null,
-        end: inputs.end?.value
-          ? new Date(inputs.end.value).setHours(23, 59, 59, 999)
+        end: document.getElementById('driveDateEnd')?.value
+          ? new Date(document.getElementById('driveDateEnd').value).setHours(
+              23,
+              59,
+              59,
+              999
+            )
           : null,
       };
 
-      if (inputs.clearText)
-        inputs.clearText.style.display = this._state.filters.term
+      const clearTextBtn = document.getElementById('clearDriveSearchText');
+      if (clearTextBtn)
+        clearTextBtn.style.display = this._state.filters.term
           ? 'block'
           : 'none';
 
+      // Reset to page 1 on filter change
+      this._state.pagination.currentPage = 1;
+
       if (immediate) this.refreshUI();
       else debouncedRefresh();
     };
 
-    inputs.clearText?.addEventListener('click', () => {
-      if (inputs.text) inputs.text.value = '';
+    safeAddEvent('clearDriveSearchText', 'click', () => {
+      const input = document.getElementById('driveSearchInput');
+      if (input) input.value = '';
+      updateHandler(true);
+    });
+
+    safeAddEvent('clearDriveFilters', 'click', () => {
+      const start = document.getElementById('driveDateStart');
+      const end = document.getElementById('driveDateEnd');
+      if (start) start.value = '';
+      if (end) end.value = '';
       updateHandler(true);
     });
-    document
-      .getElementById('clearDriveFilters')
-      ?.addEventListener('click', () => {
-        if (inputs.start) inputs.start.value = '';
-        if (inputs.end) inputs.end.value = '';
-        updateHandler(true);
-      });
 
-    [inputs.text, inputs.start, inputs.end].forEach((el) =>
-      el?.addEventListener('input', () => updateHandler(el.type !== 'text'))
+    ['driveSearchInput', 'driveDateStart', 'driveDateEnd'].forEach((id) =>
+      safeAddEvent(id, 'input', () => updateHandler(id !== 'driveSearchInput'))
     );
 
-    inputs.sortBtn?.addEventListener('click', () => {
+    safeAddEvent('driveSortToggle', 'click', (e) => {
+      const btn = e.currentTarget;
       this._state.sortOrder = this._state.sortOrder === 'desc' ? 'asc' : 'desc';
-      inputs.sortBtn.innerHTML = this.TEMPLATES.sortBtnContent(
-        this._state.sortOrder
-      );
+      btn.innerHTML = this.TEMPLATES.sortBtnContent(this._state.sortOrder);
       this.refreshUI();
     });
 
@@ -201,34 +252,46 @@ export const Drive = {
     const container = document.getElementById('driveFileContainer');
     if (!container) return;
 
-    const filtered = this.masterCards.filter((card) =>
-      this._applyFilters(card)
-    );
+    const filtered = this.fileData.filter((item) => this._applyFilters(item));
 
     filtered.sort((a, b) => {
-      const diff = this.parseDateFromCard(a) - this.parseDateFromCard(b);
+      const diff = a.timestamp - b.timestamp;
       return this._state.sortOrder === 'desc' ? -diff : diff;
     });
 
+    const { currentPage, itemsPerPage } = this._state.pagination;
+    const totalPages = Math.ceil(filtered.length / itemsPerPage);
+
+    // Ensure current page is valid
+    if (currentPage > totalPages && totalPages > 0)
+      this._state.pagination.currentPage = totalPages;
+    if (currentPage < 1) this._state.pagination.currentPage = 1;
+
+    const startIdx = (this._state.pagination.currentPage - 1) * itemsPerPage;
+    const paginatedItems = filtered.slice(startIdx, startIdx + itemsPerPage);
+
     container.innerHTML = '';
+
+    // Only show recent section on first page and if no filters are active
     const isFiltering =
       this._state.filters.term ||
       this._state.filters.start ||
       this._state.filters.end;
+    if (!isFiltering && this._state.pagination.currentPage === 1) {
+      this.renderRecentSection(container);
+    }
 
-    if (!isFiltering) this.renderRecentSection(container);
-    this.renderGroupedCards(container, filtered);
+    this.renderGroupedCards(container, paginatedItems);
+    this.renderPaginationControls(container, filtered.length, totalPages);
 
     const countEl = document.getElementById('driveResultCount');
-    if (countEl)
-      countEl.innerText = `Showing ${filtered.length} of ${this.masterCards.length} logs`;
+    if (countEl) countEl.innerText = `Found ${filtered.length} logs`;
   },
 
-  _applyFilters(card) {
+  _applyFilters(item) {
     const { term, start, end } = this._state.filters;
-    const fileDate = this.parseDateFromCard(card);
-    const titleEl = card.querySelector('.file-name-title');
-    const name = (titleEl?.textContent || '').toLowerCase();
+    const fileDate = item.timestamp;
+    const name = item.file.name.toLowerCase();
 
     const matchesText = name.includes(term);
     const matchesDate =
@@ -239,23 +302,39 @@ export const Drive = {
 
   // --- Rendering Helpers ---
 
-  renderGroupedCards(container, cards) {
+  renderGroupedCards(container, items) {
+    if (items.length === 0) {
+      container.innerHTML +=
+        '<div class="status-msg">No logs match your criteria.</div>';
+      return;
+    }
+
     let lastMonth = '';
     let currentGroup = null;
 
-    cards.forEach((card) => {
-      const monthYear = new Date(this.parseDateFromCard(card)).toLocaleString(
-        'en-US',
-        { month: 'long', year: 'numeric' }
-      );
+    items.forEach((item) => {
+      const dateObj = new Date(item.timestamp);
+      // Fallback if timestamp is invalid
+      const validDate = isNaN(dateObj.getTime()) ? new Date() : dateObj;
+
+      const monthYear = validDate.toLocaleString('en-US', {
+        month: 'long',
+        year: 'numeric',
+      });
 
       if (monthYear !== lastMonth) {
         currentGroup = this.createMonthGroup(monthYear);
         container.appendChild(currentGroup);
         lastMonth = monthYear;
       }
-      card.style.display = 'flex';
-      currentGroup.querySelector('.month-list').appendChild(card);
+
+      const cardHtml = this.TEMPLATES.fileCard(item.file, item.meta);
+      // We need to convert string to DOM element to append
+      const tempDiv = document.createElement('div');
+      tempDiv.innerHTML = cardHtml;
+      const cardEl = tempDiv.firstElementChild;
+
+      currentGroup.querySelector('.month-list').appendChild(cardEl);
     });
   },
 
@@ -263,24 +342,27 @@ export const Drive = {
     const recentIds = JSON.parse(localStorage.getItem('recent_logs') || '[]');
     if (recentIds.length === 0) return;
 
+    // Find full file objects for recent IDs
+    const recentItems = recentIds
+      .map((id) => this.fileData.find((f) => f.file.id === id))
+      .filter((item) => item !== undefined);
+
+    if (recentItems.length === 0) return;
+
     const section = document.createElement('div');
     section.className = 'recent-section';
     section.innerHTML = this.TEMPLATES.recentSectionHeader();
-
-    const list = document.createElement('div');
-    recentIds.forEach((id) => {
-      const original = this.masterCards.find((c) =>
-        c.getAttribute('onclick')?.includes(id)
-      );
-      if (original) {
-        const clone = original.cloneNode(true);
-        clone.style.borderLeft = '3px solid #4285F4';
-        clone.style.marginBottom = '8px';
-        list.appendChild(clone);
-      }
+    const list = section.querySelector('.recent-list-container') || section; // Fallback
+
+    recentItems.forEach((item) => {
+      const tempDiv = document.createElement('div');
+      tempDiv.innerHTML = this.TEMPLATES.fileCard(item.file, item.meta);
+      const card = tempDiv.firstElementChild;
+      card.style.borderLeft = '3px solid #4285F4';
+      card.style.marginBottom = '8px';
+      list.appendChild(card);
     });
 
-    section.appendChild(list);
     container.appendChild(section);
 
     document
@@ -291,6 +373,39 @@ export const Drive = {
       });
   },
 
+  renderPaginationControls(container, totalItems, totalPages) {
+    if (totalItems === 0) return;
+
+    const { currentPage, itemsPerPage } = this._state.pagination;
+    const start = (currentPage - 1) * itemsPerPage + 1;
+    const end = Math.min(currentPage * itemsPerPage, totalItems);
+
+    const navDiv = document.createElement('div');
+    navDiv.innerHTML = this.TEMPLATES.paginationControls(
+      currentPage,
+      totalPages,
+      start,
+      end,
+      totalItems
+    );
+    container.appendChild(navDiv);
+
+    // Bind Events
+    navDiv.querySelector('#prevPageBtn')?.addEventListener('click', () => {
+      if (currentPage > 1) {
+        this._state.pagination.currentPage--;
+        this.refreshUI();
+      }
+    });
+
+    navDiv.querySelector('#nextPageBtn')?.addEventListener('click', () => {
+      if (currentPage < totalPages) {
+        this._state.pagination.currentPage++;
+        this.refreshUI();
+      }
+    });
+  },
+
   createMonthGroup(monthYear) {
     const group = document.createElement('div');
     group.className = 'month-group';
@@ -312,18 +427,14 @@ export const Drive = {
 
   getFileMetadata(fileName) {
     const match = fileName.match(/-(\d+)-(\d+)\.json$/);
-    if (!match) return null;
+    if (!match) return { date: 'Unknown', length: '?' };
     const date = new Date(parseInt(match[1]));
     return { date: date.toISOString(), length: match[2] };
   },
 
-  parseDateFromCard(card) {
-    const dateEl =
-      card?.querySelector('.meta-item span') ||
-      card?.querySelector('.meta-item');
-    if (!dateEl) return 0;
-    const ts = Date.parse(dateEl.textContent.trim());
-    return isNaN(ts) ? 0 : ts;
+  extractTimestamp(fileName) {
+    const match = fileName.match(/-(\d+)-(\d+)\.json$/);
+    return match ? parseInt(match[1]) : 0;
   },
 
   handleApiError(error, listEl) {
@@ -344,6 +455,7 @@ export const Drive = {
   clearRecentHistory() {
     if (confirm('Clear recently viewed history?')) {
       localStorage.removeItem('recent_logs');
+      // No need to fetch again, just refresh UI
       this.refreshUI();
     }
   },
@@ -393,16 +505,30 @@ export const Drive = {
       <div class="month-list"></div>
     `,
     recentSectionHeader: () => `
-      <div class="month-header" style="display: flex; justify-content: space-between;">
+      <div class="month-header" style="display: flex; justify-content: space-between; margin-bottom: 5px;">
         <span><i class="fas fa-history" style="margin-right: 8px;"></i> Recently Viewed</span>
         <span id="clearRecentHistory" style="font-size: 0.8em; cursor: pointer; opacity: 0.8;" title="Clear History">
           <i class="fas fa-trash-alt"></i> Clear
         </span>
       </div>
+      <div class="recent-list-container"></div>
     `,
     sortBtnContent: (order) => `
       <i class="fas fa-sort-amount-${order === 'desc' ? 'down' : 'up'}"></i> 
       ${order === 'desc' ? 'Newest' : 'Oldest'}
     `,
+    paginationControls: (current, total, start, end, totalItems) => `
+      <div class="pagination-controls" style="display: flex; justify-content: space-between; align-items: center; padding: 15px 10px; border-top: 1px solid var(--border-color); margin-top: 10px; font-size: 0.8em;">
+        <button id="prevPageBtn" class="btn btn-sm" ${current === 1 ? 'disabled style="opacity:0.5"' : ''}>
+           <i class="fas fa-chevron-left"></i> Prev
+        </button>
+        <span style="color: var(--text-muted);">
+           ${start}-${end} of ${totalItems}
+        </span>
+        <button id="nextPageBtn" class="btn btn-sm" ${current === total ? 'disabled style="opacity:0.5"' : ''}>
+           Next <i class="fas fa-chevron-right"></i>
+        </button>
+      </div>
+    `,
   },
 };
diff --git a/tests/drive.test.js b/tests/drive.test.js
new file mode 100644
index 0000000..b851ca5
--- /dev/null
+++ b/tests/drive.test.js
@@ -0,0 +1,554 @@
+import { jest, describe, test, expect, beforeEach } from '@jest/globals';
+import { Drive } from '../src/drive.js';
+import { DOM } from '../src/config.js';
+import { UI } from '../src/ui.js';
+import { dataProcessor } from '../src/dataprocessor.js';
+
+// --- Global Mocks ---
+global.gapi = {
+  client: {
+    drive: {
+      files: {
+        list: jest.fn(),
+        get: jest.fn(),
+      },
+    },
+    setToken: jest.fn(),
+  },
+};
+
+global.confirm = jest.fn();
+
+describe('Drive Module Combined Suite', () => {
+  let container;
+
+  beforeEach(() => {
+    // 1. Reset Jest Mocks
+    jest.clearAllMocks();
+
+    // 2. Reset DOM
+    document.body.innerHTML = `
+      <div id="driveList"></div>
+      <div id="driveFileContainer"></div>
+      <input type="text" id="driveSearchInput" />
+      <i id="clearDriveSearchText"></i>
+      <input type="date" id="driveDateStart" />
+      <input type="date" id="driveDateEnd" />
+      <button id="clearDriveFilters"></button>
+      <button id="driveSortToggle"></button>
+      <div id="driveResultCount"></div>
+    `;
+    container = document.getElementById('driveFileContainer');
+
+    // 3. Mock Module Dependencies
+    DOM.get = jest.fn((id) => document.getElementById(id));
+    UI.setLoading = jest.fn();
+    dataProcessor.process = jest.fn();
+    global.confirm.mockReturnValue(true);
+
+    // 4. Reset Drive Module Internal State
+    Drive.fileData = [];
+    Drive._state = {
+      sortOrder: 'desc',
+      filters: { term: '', start: null, end: null },
+      pagination: { currentPage: 1, itemsPerPage: 10 },
+    };
+
+    // 5. Clear LocalStorage
+    localStorage.clear();
+  });
+
+  // =========================================================================
+  // 1. INITIALIZATION & LIST FILES (Lines 47-72)
+  // =========================================================================
+  describe('Initialization & listFiles', () => {
+    test('listFiles returns early if driveList DOM element is missing', async () => {
+      document.body.innerHTML = ''; // Remove DOM
+      DOM.get.mockReturnValue(null);
+
+      await Drive.listFiles();
+
+      expect(gapi.client.drive.files.list).not.toHaveBeenCalled();
+    });
+
+    test('listFiles renders search interface and calls fetchJsonFiles on success', async () => {
+      // Mock finding Root Folder
+      gapi.client.drive.files.list
+        .mockResolvedValueOnce({
+          result: { files: [{ id: 'root-123', name: 'mygiulia' }] },
+        })
+        // Mock finding Sub Folder
+        .mockResolvedValueOnce({
+          result: { files: [{ id: 'sub-123', name: 'trips' }] },
+        })
+        // Mock fetchJsonFiles list call
+        .mockResolvedValueOnce({ result: { files: [], nextPageToken: null } });
+
+      await Drive.listFiles();
+
+      const listEl = document.getElementById('driveList');
+      expect(listEl.style.display).toBe('block');
+      // Check if search interface template was injected
+      expect(document.getElementById('driveSearchInput')).not.toBeNull();
+      // Check if fetch flow was triggered (3 calls: root, sub, files)
+      expect(gapi.client.drive.files.list).toHaveBeenCalledTimes(3);
+    });
+
+    test('listFiles handles error when required folders are missing', async () => {
+      // Mock finding Root Folder success
+      gapi.client.drive.files.list.mockResolvedValueOnce({
+        result: { files: [{ id: 'root-123' }] },
+      });
+      // Mock finding Sub Folder FAILURE (empty array)
+      gapi.client.drive.files.list.mockResolvedValueOnce({
+        result: { files: [] },
+      });
+
+      await Drive.listFiles();
+
+      const container = document.getElementById('driveFileContainer');
+      expect(container.innerHTML).toContain('Required folders not found');
+    });
+
+    test('listFiles handles API errors gracefully', async () => {
+      // 1. Mock Root Folder Discovery (Success)
+      gapi.client.drive.files.list.mockResolvedValueOnce({
+        result: { files: [{ id: 'root-id' }] },
+      });
+
+      // 2. Mock Sub Folder Discovery (Success)
+      gapi.client.drive.files.list.mockResolvedValueOnce({
+        result: { files: [{ id: 'sub-id' }] },
+      });
+
+      // 3. Mock File Listing (Failure) - This will trigger the top-level catch block
+      gapi.client.drive.files.list.mockRejectedValueOnce({
+        message: 'Network Error',
+      });
+
+      await Drive.listFiles();
+
+      const container = document.getElementById('driveFileContainer');
+      expect(container.innerHTML).toContain('Drive error: Network Error');
+    });
+  });
+
+  // =========================================================================
+  // 2. UTILITY FUNCTIONS
+  // =========================================================================
+  describe('Utilities', () => {
+    test('getFileMetadata correctly parses valid filenames', () => {
+      const fileName = 'trip-log-1704556800000-3600.json'; // Jan 6, 2024
+      const meta = Drive.getFileMetadata(fileName);
+
+      expect(meta.length).toBe('3600');
+      expect(meta.date).toContain('2024-01-06');
+    });
+
+    test('getFileMetadata returns default object for invalid filenames', () => {
+      const fileName = 'invalid-file.json';
+      const result = Drive.getFileMetadata(fileName);
+      expect(result).toEqual({ date: 'Unknown', length: '?' });
+    });
+
+    test('extractTimestamp extracts timestamp correctly from filename', () => {
+      const fileName = 'trip-log-1766840037973-3600.json';
+      const timestamp = Drive.extractTimestamp(fileName);
+
+      expect(timestamp).toBe(1766840037973); // Matches number in filename
+    });
+
+    test('extractTimestamp returns 0 for invalid filenames', () => {
+      const fileName = 'invalid.json';
+      expect(Drive.extractTimestamp(fileName)).toBe(0);
+    });
+  });
+
+  // =========================================================================
+  // 3. API INTERACTIONS & FETCHING
+  // =========================================================================
+  describe('API & Data Fetching', () => {
+    test('findFolderId handles different name casing variants', async () => {
+      gapi.client.drive.files.list.mockResolvedValue({
+        result: { files: [{ id: '123', name: 'MyGiulia' }] },
+      });
+
+      const id = await Drive.findFolderId('mygiulia');
+
+      expect(gapi.client.drive.files.list).toHaveBeenCalledWith(
+        expect.objectContaining({
+          q: expect.stringContaining(
+            "name = 'mygiulia' or name = 'mygiulia' or name = 'Mygiulia'"
+          ),
+        })
+      );
+      expect(id).toBe('123');
+    });
+
+    test('findFolderId handles API errors returns null', async () => {
+      gapi.client.drive.files.list.mockRejectedValue(new Error('Fail'));
+      const id = await Drive.findFolderId('folder');
+      expect(id).toBeNull();
+    });
+
+    test('fetchJsonFiles populates fileData and renders UI', async () => {
+      // Mock API returning one file
+      const mockFiles = [
+        { id: 'f1', name: 'trip-2026-1766840037973-3600.json', size: '2048' },
+      ];
+      global.gapi.client.drive.files.list.mockResolvedValue({
+        result: { files: mockFiles, nextPageToken: null },
+      });
+
+      await Drive.fetchJsonFiles('folder-id');
+
+      // Verify Data Store
+      expect(Drive.fileData).toHaveLength(1);
+      expect(Drive.fileData[0].file.id).toBe('f1');
+      expect(Drive.fileData[0].timestamp).toBe(1766840037973);
+
+      // Verify UI Render
+      expect(container.innerHTML).toContain('trip-2026');
+      expect(container.innerHTML).toContain('2 KB');
+    });
+
+    test('fetchJsonFiles loops until nextPageToken is null (Pagination Fetching)', async () => {
+      // First call returns token
+      gapi.client.drive.files.list
+        .mockResolvedValueOnce({
+          result: {
+            files: [{ id: '1', name: 'f1.json' }],
+            nextPageToken: 'token-abc',
+          },
+        })
+        .mockResolvedValueOnce({
+          result: {
+            files: [{ id: '2', name: 'f2.json' }],
+            nextPageToken: null,
+          },
+        });
+
+      await Drive.fetchJsonFiles('folder-id');
+
+      expect(gapi.client.drive.files.list).toHaveBeenCalledTimes(2);
+      expect(Drive.fileData).toHaveLength(2);
+    });
+
+    test('fetchJsonFiles handles empty results', async () => {
+      gapi.client.drive.files.list.mockResolvedValue({ result: { files: [] } });
+      await Drive.fetchJsonFiles('folder-id');
+      expect(container.innerHTML).toContain('No log files found');
+    });
+
+    test('handleApiError clears token on 401 error', () => {
+      const error = { status: 401, message: 'Unauthorized' };
+      Drive.handleApiError(error, container);
+
+      expect(gapi.client.setToken).toHaveBeenCalledWith(null);
+      expect(container.innerHTML).toContain('Session expired');
+    });
+
+    test('handleApiError handles 403 error same as 401', () => {
+      const error = { status: 403, message: 'Forbidden' };
+      Drive.handleApiError(error, container);
+      expect(gapi.client.setToken).toHaveBeenCalledWith(null);
+    });
+  });
+
+  // =========================================================================
+  // 4. LOGIC: FILTERING, SORTING & LOADING
+  // =========================================================================
+  describe('Logic: Filtering & Loading', () => {
+    test('_applyFilters handles null/empty filter states', () => {
+      const item = { file: { name: 'Trip.json' }, timestamp: 1000 };
+      Drive._state.filters = { term: '', start: null, end: null };
+      expect(Drive._applyFilters(item)).toBe(true);
+    });
+
+    test('_applyFilters correctly matches text', () => {
+      const item = { file: { name: 'Speed-Test.json' }, timestamp: 1000 };
+
+      Drive._state.filters.term = 'speed';
+      expect(Drive._applyFilters(item)).toBe(true);
+
+      Drive._state.filters.term = 'trip';
+      expect(Drive._applyFilters(item)).toBe(false);
+    });
+
+    test('_applyFilters correctly matches date range', () => {
+      const item = { file: { name: 'A.json' }, timestamp: 1000 };
+      // Valid Range
+      Drive._state.filters = { term: '', start: 500, end: 1500 };
+      expect(Drive._applyFilters(item)).toBe(true);
+
+      // Outside Range
+      Drive._state.filters = { term: '', start: 1500, end: 2000 };
+      expect(Drive._applyFilters(item)).toBe(false);
+    });
+
+    test('loadFile ignores old requests if a new one starts (Token check)', async () => {
+      gapi.client.drive.files.get.mockResolvedValue({
+        result: { data: 'old' },
+      });
+
+      const p1 = Drive.loadFile('file1', 'id1');
+      const p2 = Drive.loadFile('file2', 'id2'); // Increments token
+
+      await Promise.all([p1, p2]);
+
+      expect(dataProcessor.process).toHaveBeenCalledTimes(1);
+      expect(dataProcessor.process).toHaveBeenCalledWith(
+        expect.anything(),
+        'file2'
+      );
+    });
+
+    test('loadFile handles API errors', async () => {
+      // Mock Alert.showAlert behavior (since Alert module isn't mocked in this file specifically)
+      // We'll just ensure it doesn't crash and console logs or similar
+      const consoleSpy = jest
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
+      // Mock Global Alert object if it exists or rely on the imported module
+      // For this test, we verify that dataProcessor is NOT called
+      gapi.client.drive.files.get.mockRejectedValue({ message: 'Load Failed' });
+
+      await Drive.loadFile('file', 'id');
+
+      expect(dataProcessor.process).not.toHaveBeenCalled();
+      consoleSpy.mockRestore();
+    });
+  });
+
+  // =========================================================================
+  // 5. UI RENDERING & EVENT LISTENERS (Lines 186-245)
+  // =========================================================================
+  describe('UI Interactions & Event Listeners', () => {
+    beforeEach(() => {
+      // Re-inject search template to ensure listeners attach to fresh elements
+      const listEl = document.getElementById('driveList');
+      if (listEl) listEl.innerHTML = Drive.TEMPLATES.searchInterface();
+    });
+
+    test('initSearch attaches listeners and handles input changes', () => {
+      // 1. Call initSearch to bind listeners
+      Drive.initSearch();
+
+      const input = document.getElementById('driveSearchInput');
+      const clearBtn = document.getElementById('clearDriveSearchText');
+
+      // 2. Simulate typing
+      input.value = 'test';
+      input.dispatchEvent(new Event('input'));
+
+      // 3. Since logic is debounced, verify state update (immediate updateHandler logic for checking Clear Btn visibility)
+      // We might need to manually trigger the handler logic or rely on the immediate updateHandler call in initSearch
+
+      // Let's test the "Clear Text" button click
+      // Manually show it first
+      clearBtn.style.display = 'block';
+
+      // Click Clear
+      clearBtn.click();
+
+      // Assertions
+      expect(input.value).toBe('');
+      // The click handler calls updateHandler(true) -> immediate refresh
+      expect(Drive._state.filters.term).toBe('');
+    });
+
+    test('Clear Date Filters resets inputs and updates state', () => {
+      Drive.initSearch();
+      const start = document.getElementById('driveDateStart');
+      const end = document.getElementById('driveDateEnd');
+      const clearBtn = document.getElementById('clearDriveFilters');
+
+      start.value = '2023-01-01';
+      end.value = '2023-01-31';
+
+      clearBtn.click();
+
+      expect(start.value).toBe('');
+      expect(end.value).toBe('');
+    });
+
+    test('Sort toggle switches order and triggers refresh', () => {
+      Drive.initSearch();
+      const sortBtn = document.getElementById('driveSortToggle');
+
+      // Initial state is desc
+      Drive._state.sortOrder = 'desc';
+
+      sortBtn.click();
+
+      expect(Drive._state.sortOrder).toBe('asc');
+      expect(sortBtn.innerHTML).toContain('Oldest');
+    });
+
+    test('Date inputs trigger update on change', () => {
+      Drive.initSearch();
+      const start = document.getElementById('driveDateStart');
+
+      start.value = '2023-01-01';
+      start.dispatchEvent(new Event('input')); // Trigger listener
+
+      // Should update internal state (immediate = false, so it debounces)
+      // We verify the listener is attached by checking if logic *would* run
+      // For unit test, we can check if filter state is eventually updated or
+      // trust that the previous tests covered logic, this verifies binding.
+    });
+  });
+
+  // =========================================================================
+  // 6. PAGINATION & GROUPING (Lines 371-397)
+  // =========================================================================
+  describe('Pagination & Grouping', () => {
+    // Helper to generate mock data
+    const generateMockData = (count) => {
+      return Array.from({ length: count }, (_, i) => ({
+        file: { id: `${i}`, name: `log-${i}.json`, size: 1000 },
+        meta: { date: '2026-01-01', length: '100' },
+        timestamp: new Date('2026-01-01').getTime() + i, // Different timestamps for sorting
+      }));
+    };
+
+    test('refreshUI renders only itemsPerPage', () => {
+      Drive.fileData = generateMockData(15); // 15 items
+      Drive._state.pagination.itemsPerPage = 10;
+      Drive._state.pagination.currentPage = 1;
+
+      Drive.refreshUI();
+
+      const cards = container.querySelectorAll('.drive-file-card');
+      expect(cards).toHaveLength(10); // Only 1st page shown
+
+      const pageInfo = container.querySelector('.pagination-controls span');
+      expect(pageInfo.textContent).toContain('1-10 of 15');
+    });
+
+    test('Next Page button increments page and updates UI', () => {
+      Drive.fileData = generateMockData(15);
+      Drive._state.pagination.itemsPerPage = 10;
+      Drive.refreshUI();
+
+      const nextBtn = container.querySelector('#nextPageBtn');
+      nextBtn.click(); // Trigger event listener
+
+      const cards = container.querySelectorAll('.drive-file-card');
+      expect(cards).toHaveLength(5); // Remaining 5 items (Page 2)
+      expect(Drive._state.pagination.currentPage).toBe(2);
+    });
+
+    test('Prev Page button decrements page', () => {
+      Drive.fileData = generateMockData(15);
+      Drive._state.pagination.itemsPerPage = 10;
+      Drive._state.pagination.currentPage = 2; // Start on page 2
+      Drive.refreshUI();
+
+      const prevBtn = container.querySelector('#prevPageBtn');
+      prevBtn.click();
+
+      expect(Drive._state.pagination.currentPage).toBe(1);
+    });
+
+    test('Pagination buttons respect bounds', () => {
+      // Test "Next" on last page
+      Drive.fileData = generateMockData(5);
+      Drive._state.pagination.itemsPerPage = 10;
+      Drive._state.pagination.currentPage = 1; // Only 1 page exists
+      Drive.refreshUI();
+
+      const nextBtn = container.querySelector('#nextPageBtn');
+      nextBtn.click();
+      expect(Drive._state.pagination.currentPage).toBe(1); // Should not increase
+
+      // Test "Prev" on first page
+      const prevBtn = container.querySelector('#prevPageBtn');
+      prevBtn.click();
+      expect(Drive._state.pagination.currentPage).toBe(1); // Should not decrease
+    });
+
+    test('Month Header Toggles visibility (Expand/Collapse)', () => {
+      Drive.fileData = [
+        {
+          file: { name: 'Jan' },
+          timestamp: new Date('2026-01-01').getTime(),
+          meta: {},
+        },
+      ];
+      Drive.refreshUI();
+
+      const header = container.querySelector('.month-header');
+      const list = container.querySelector('.month-list');
+
+      // 1. Initial State: Visible
+      expect(list.style.display).not.toBe('none');
+
+      // 2. Click to Collapse
+      header.click();
+      expect(list.style.display).toBe('none');
+      expect(header.querySelector('i').className).toContain('fa-chevron-right');
+
+      // 3. Click to Expand
+      header.click();
+      expect(list.style.display).toBe('block');
+      expect(header.querySelector('i').className).toContain('fa-chevron-down');
+    });
+  });
+
+  // =========================================================================
+  // 7. RECENT HISTORY (Lines 451-466)
+  // =========================================================================
+  describe('Recent History', () => {
+    test('Recent History renders if localStorage has items', () => {
+      Drive.fileData = [
+        {
+          file: { id: 'rec1', name: 'Recent.json' },
+          meta: {},
+          timestamp: 1000,
+        },
+      ];
+      localStorage.setItem('recent_logs', JSON.stringify(['rec1']));
+
+      Drive.refreshUI();
+
+      const recentSection = container.querySelector('.recent-section');
+      expect(recentSection).not.toBeNull();
+      expect(recentSection.innerHTML).toContain('Recent.json');
+    });
+
+    test('clearRecentHistory wipes localStorage and updates UI', () => {
+      Drive.fileData = [
+        {
+          file: { id: 'rec1', name: 'Recent.json' },
+          meta: {},
+          timestamp: 1000,
+        },
+      ];
+      localStorage.setItem('recent_logs', JSON.stringify(['rec1']));
+      Drive.refreshUI();
+
+      // Find the clear button created by renderRecentSection
+      const clearBtn = document.getElementById('clearRecentHistory');
+
+      // Mock confirm true
+      global.confirm.mockReturnValue(true);
+
+      // Trigger click
+      clearBtn.click();
+
+      expect(localStorage.getItem('recent_logs')).toBeNull();
+      // UI should update (section removed)
+      expect(container.querySelector('.recent-section')).toBeNull();
+    });
+
+    test('clearRecentHistory does nothing if confirm is cancelled', () => {
+      localStorage.setItem('recent_logs', JSON.stringify(['rec1']));
+      global.confirm.mockReturnValue(false);
+
+      Drive.clearRecentHistory();
+
+      expect(localStorage.getItem('recent_logs')).not.toBeNull();
+    });
+  });
+});
diff --git a/tests/drive/drive.api.test.js b/tests/drive/drive.api.test.js
deleted file mode 100644
index 95697de..0000000
--- a/tests/drive/drive.api.test.js
+++ /dev/null
@@ -1,144 +0,0 @@
-import { jest, describe, test, expect, beforeEach } from '@jest/globals';
-import { Drive } from '../../src/drive.js';
-import { DOM } from '../../src/config.js';
-import { UI } from '../../src/ui.js';
-import { dataProcessor } from '../../src/dataprocessor.js';
-
-describe('Drive Module - API & Folder Discovery', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    document.body.innerHTML = `<div id="driveList"></div>`;
-    DOM.get = jest.fn((id) => document.getElementById(id));
-    UI.setLoading = jest.fn();
-
-    // Global GAPI mock
-    global.gapi = {
-      client: {
-        drive: {
-          files: {
-            list: jest.fn(),
-            get: jest.fn(),
-          },
-        },
-        setToken: jest.fn(),
-      },
-    };
-  });
-
-  test('findFolderId handles different name casing variants', async () => {
-    gapi.client.drive.files.list.mockResolvedValue({
-      result: { files: [{ id: '123', name: 'MyGiulia' }] },
-    });
-
-    const id = await Drive.findFolderId('mygiulia');
-
-    expect(gapi.client.drive.files.list).toHaveBeenCalledWith(
-      expect.objectContaining({
-        q: expect.stringContaining(
-          "name = 'mygiulia' or name = 'mygiulia' or name = 'Mygiulia'"
-        ),
-      })
-    );
-    expect(id).toBe('123');
-  });
-
-  test('findFolderId returns ID on success', async () => {
-    gapi.client.drive.files.list.mockResolvedValue({
-      result: { files: [{ id: 'folder-123', name: 'mygiulia' }] },
-    });
-
-    const id = await Drive.findFolderId('mygiulia');
-    expect(id).toBe('folder-123');
-    // Verify query format (Line 13-16)
-    expect(gapi.client.drive.files.list).toHaveBeenCalledWith(
-      expect.objectContaining({
-        q: expect.stringContaining("name = 'mygiulia'"),
-      })
-    );
-  });
-
-  test('listFiles handles missing subfolder error', async () => {
-    // Mock root found, but subfolder not found
-    gapi.client.drive.files.list
-      .mockResolvedValueOnce({ result: { files: [{ id: 'root-id' }] } }) // find root
-      .mockResolvedValueOnce({ result: { files: [] } }); // find sub (trips)
-
-    await Drive.listFiles();
-
-    const container = document.getElementById('driveFileContainer');
-    expect(container.innerHTML).toContain('Required folders');
-  });
-});
-
-describe('Drive Module - Various Tests', () => {
-  beforeEach(() => {
-    document.body.innerHTML = `
-      <div id="driveList"></div>
-      <div id="driveFileContainer"></div>
-    `;
-
-    localStorage.clear();
-    jest.clearAllMocks();
-
-    dataProcessor.process = jest.fn();
-
-    // Global GAPI mock
-    global.gapi = {
-      client: {
-        drive: {
-          files: {
-            list: jest.fn(),
-            get: jest.fn(),
-          },
-        },
-        setToken: jest.fn(),
-      },
-    };
-  });
-
-  test('_applyFilters handles null/empty filter states', () => {
-    const card = document.createElement('div');
-    card.innerHTML =
-      '<div class="file-name-title">Trip-Log</div><div class="meta-item"><span>2026-01-01</span></div>';
-
-    // Reset state to empty filters
-    Drive._state.filters = { term: '', start: null, end: null };
-
-    expect(Drive._applyFilters(card)).toBe(true);
-  });
-
-  test('_applyFilters correctly rejects mismatching text', () => {
-    const card = document.createElement('div');
-    card.innerHTML =
-      '<div class="file-name-title">Speed-Test</div><div class="meta-item"><span>2026-01-01</span></div>';
-
-    Drive._state.filters = { term: 'trip', start: null, end: null };
-
-    expect(Drive._applyFilters(card)).toBe(false);
-  });
-
-  test('loadFile ignores old requests if a new one starts (Token check)', async () => {
-    const fileId1 = 'id-1';
-    const fileId2 = 'id-2';
-
-    // Setup gapi.get to return successfully
-    gapi.client.drive.files.get.mockResolvedValue({
-      result: { data: 'old-data' },
-    });
-
-    // Start first load
-    const promise1 = Drive.loadFile('file1', fileId1);
-
-    // Start second load immediately (increments activeLoadToken)
-    const promise2 = Drive.loadFile('file2', fileId2);
-
-    await Promise.all([promise1, promise2]);
-
-    // DataProcessor should only be called for the second file
-    expect(dataProcessor.process).toHaveBeenCalledTimes(1);
-    expect(dataProcessor.process).not.toHaveBeenCalledWith(
-      expect.anything(),
-      'file1'
-    );
-  });
-});
diff --git a/tests/drive/drive.error-handling.test.js b/tests/drive/drive.error-handling.test.js
deleted file mode 100644
index aab61c6..0000000
--- a/tests/drive/drive.error-handling.test.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { jest, describe, test, expect, beforeEach } from '@jest/globals';
-import { Drive } from '../../src/drive.js';
-import { dataProcessor } from '../../src/dataprocessor.js';
-
-describe('Drive Module - Error Handling Tests', () => {
-  let container;
-
-  beforeEach(() => {
-    document.body.innerHTML = `
-      <div id="driveList"></div>
-      <div id="driveFileContainer"></div>
-    `;
-    container = document.getElementById('driveFileContainer');
-    localStorage.clear();
-    jest.clearAllMocks();
-
-    dataProcessor.process = jest.fn();
-
-    // Global GAPI mock
-    global.gapi = {
-      client: {
-        drive: {
-          files: {
-            list: jest.fn(),
-            get: jest.fn(),
-          },
-        },
-        setToken: jest.fn(),
-      },
-    };
-  });
-
-  test('handleApiError clears token on 401 error', () => {
-    const error = { status: 401, message: 'Unauthorized' };
-    Drive.handleApiError(error, container);
-
-    expect(gapi.client.setToken).toHaveBeenCalledWith(null);
-    expect(container.innerHTML).toContain('Session expired');
-  });
-
-  test('handleApiError displays generic error message', () => {
-    const error = { status: 500, message: 'Internal Server Error' };
-    Drive.handleApiError(error, container);
-
-    expect(container.innerHTML).toContain('Drive error: Internal Server Error');
-  });
-
-  test('handleApiError sets expired session on 401 ', () => {
-    const mockListEl = document.createElement('div');
-    const error401 = { status: 401, message: 'Unauthorized' };
-
-    Drive.handleApiError(error401, mockListEl);
-
-    expect(gapi.client.setToken).toHaveBeenCalledWith(null);
-    expect(mockListEl.innerHTML).toContain('Session expired');
-  });
-});
diff --git a/tests/drive/drive.fetch-json.test.js b/tests/drive/drive.fetch-json.test.js
deleted file mode 100644
index 3757d96..0000000
--- a/tests/drive/drive.fetch-json.test.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import { jest, describe, test, expect, beforeEach } from '@jest/globals';
-import { Drive } from '../../src/drive.js';
-import { DOM } from '../../src/config.js';
-import { UI } from '../../src/ui.js';
-
-describe('Drive Module - Fetch JSON Test', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    document.body.innerHTML = `<div id="driveList"></div>`;
-    DOM.get = jest.fn((id) => document.getElementById(id));
-    UI.setLoading = jest.fn();
-
-    // Global GAPI mock
-    global.gapi = {
-      client: {
-        drive: {
-          files: {
-            list: jest.fn(),
-            get: jest.fn(),
-          },
-        },
-        setToken: jest.fn(),
-      },
-    };
-  });
-
-  test('fetchJsonFiles populates masterCards and renders rows', async () => {
-    // 1. Setup the mock files response
-    const mockFiles = [
-      { id: 'f1', name: 'trip-2026-1766840037973-3600.json', size: '2048' },
-    ];
-
-    global.gapi.client.drive.files.list.mockResolvedValue({
-      result: { files: mockFiles },
-    });
-
-    // 2. Setup DOM with the search interface template
-    // This provides the elements that initSearch() needs to add listeners to
-    document.body.innerHTML = `
-    <div id="driveList">
-      ${Drive.TEMPLATES.searchInterface()}
-    </div>
-  `;
-
-    const container = document.getElementById('driveFileContainer');
-
-    // 3. Execute fetch
-    await Drive.fetchJsonFiles('folder-id', container);
-
-    // 4. Assertions
-    // Verify masterCards were captured
-    expect(Drive.masterCards).toHaveLength(1);
-
-    // Verify the filename and size rendering logic
-    expect(container.innerHTML).toContain('trip-2026');
-    expect(container.innerHTML).toContain('2 KB'); // (2048 / 1024)
-  });
-
-  test('fetchJsonFiles handles API rejection', async () => {
-    gapi.client.drive.files.list.mockRejectedValue({ message: 'API Down' });
-    const container = document.createElement('div');
-
-    await Drive.fetchJsonFiles('id', container);
-
-    expect(container.innerHTML).toContain('Drive error: API Down');
-  });
-
-  test('fetchJsonFiles handles empty results', async () => {
-    gapi.client.drive.files.list.mockResolvedValue({ result: { files: [] } });
-    const container = document.createElement('div');
-
-    await Drive.fetchJsonFiles('id', container);
-
-    expect(container.innerHTML).toContain('No log files found.');
-  });
-});
diff --git a/tests/drive/drive.month.grouping.test.js b/tests/drive/drive.month.grouping.test.js
deleted file mode 100644
index b717441..0000000
--- a/tests/drive/drive.month.grouping.test.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import { jest, describe, test, expect, beforeEach } from '@jest/globals'; // Add this line
-import { Drive } from '../../src/drive.js';
-import { DOM } from '../../src/config.js';
-
-// Mocking global dependencies
-global.gapi = {
-  client: {
-    drive: { files: { list: jest.fn(), get: jest.fn() } },
-  },
-};
-
-describe('Drive Module - Month Grouping & Interactions', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    document.body.innerHTML = `
-      <div id="driveList"></div>
-      <div id="driveFileContainer"></div>
-      ${Drive.TEMPLATES.searchInterface()}
-    `;
-    DOM.get = jest.fn((id) => document.getElementById(id));
-
-    // Create two cards in the same month
-    const card1 = document.createElement('div');
-    card1.className = 'drive-file-card';
-    card1.innerHTML = `<div class="file-name-title">Log A</div><div class="meta-item"><span>2026-01-10T10:00:00Z</span></div>`;
-
-    const card2 = document.createElement('div');
-    card2.className = 'drive-file-card';
-    card2.innerHTML = `<div class="file-name-title">Log B</div><div class="meta-item"><span>2026-01-15T10:00:00Z</span></div>`;
-
-    Drive.masterCards = [card1, card2];
-  });
-
-  test('renderGroupedCards creates a single month header for same-month logs', () => {
-    const container = document.getElementById('driveFileContainer');
-    Drive.initSearch(); // Triggers the render sequence
-
-    const headers = container.querySelectorAll('.month-header');
-    const cards = container.querySelectorAll('.drive-file-card');
-
-    // Should only have one "January 2026" header for both cards
-    expect(headers).toHaveLength(1);
-    expect(headers[0].textContent).toContain('January 2026');
-    expect(cards).toHaveLength(2);
-  });
-
-  test('Clicking month header toggles the visibility of the card list', () => {
-    Drive.initSearch();
-    const container = document.getElementById('driveFileContainer');
-    const header = container.querySelector('.month-header');
-    const list = container.querySelector('.month-list');
-
-    // Initial state: visible
-    expect(list.style.display).not.toBe('none');
-
-    // First Click: Collapse
-    header.click();
-    expect(list.style.display).toBe('none');
-    expect(header.querySelector('.toggle-icon').className).toContain(
-      'fa-chevron-right'
-    );
-
-    // Second Click: Expand
-    header.click();
-    expect(list.style.display).toBe('block');
-    expect(header.querySelector('.toggle-icon').className).toContain(
-      'fa-chevron-down'
-    );
-  });
-
-  test('renderRecentSection handles missing card references gracefully', () => {
-    document.body.innerHTML = `
-      <div id="driveList"></div>
-      <div id="driveFileContainer"></div>
-    `;
-    let container = document.getElementById('driveFileContainer');
-
-    localStorage.setItem('recent_logs', JSON.stringify(['missing-id']));
-    Drive.masterCards = []; // No cards loaded to simulate a mismatch
-
-    Drive.renderRecentSection(container);
-
-    // Target the specific DIV created for the list, not the header
-    const recentList =
-      container.querySelector('.recent-section').lastElementChild;
-
-    // This will now correctly be 0 because no matching cards were found to append
-    expect(recentList.children.length).toBe(0);
-  });
-});
diff --git a/tests/drive/drive.test.filtering.sorting.js b/tests/drive/drive.test.filtering.sorting.js
deleted file mode 100644
index 7f471ef..0000000
--- a/tests/drive/drive.test.filtering.sorting.js
+++ /dev/null
@@ -1,161 +0,0 @@
-import { jest, describe, test, expect, beforeEach } from '@jest/globals'; // Add this line
-import { Drive } from '../../src/drive.js';
-import { DOM } from '../../src/config.js';
-
-describe('Drive Module - UI Filtering Logic', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    document.body.innerHTML = `
-      <div id="driveList"></div>
-      ${Drive.getSearchInterfaceTemplate()}
-    `;
-
-    DOM.get = jest.fn((id) => document.getElementById(id));
-
-    const card1 = document.createElement('div');
-    card1.className = 'drive-file-card';
-    card1.innerHTML = `
-      <div class="file-name-title">engine_log_warmup</div>
-      <div class="meta-item"><span>2026-01-01T10:00:00.000Z</span></div>
-    `;
-
-    const card2 = document.createElement('div');
-    card2.className = 'drive-file-card';
-    card2.innerHTML = `
-      <div class="file-name-title">track_session_fast</div>
-      <div class="meta-item"><span>2026-01-05T14:00:00.000Z</span></div>
-    `;
-
-    Drive.masterCards = [card1, card2];
-  });
-
-  test('Internal updateUI filters cards by text input', () => {
-    Drive.initSearch();
-
-    const searchInput = document.getElementById('driveSearchInput');
-
-    // Simulate user typing "track"
-    searchInput.value = 'track';
-    searchInput.dispatchEvent(new Event('input'));
-
-    // Verify Visibility
-    expect(
-      Drive.masterCards[0].querySelector('.file-name-title').textContent
-    ).toBe('track_session_fast');
-    expect(Drive.masterCards[0].style.display).toBe('flex');
-
-    expect(
-      Drive.masterCards[1].querySelector('.file-name-title').textContent
-    ).toBe('engine_log_warmup');
-    expect(Drive.masterCards[1].style.display).toBe('none');
-
-    const countEl = document.getElementById('driveResultCount');
-    expect(countEl.innerText).toContain('Showing 1 of 2');
-  });
-
-  test('Internal updateUI filters by Date Range', () => {
-    Drive.initSearch();
-
-    const startInput = document.getElementById('driveDateStart');
-    const endInput = document.getElementById('driveDateEnd');
-
-    // Filter to only show the first log (Jan 1st)
-    startInput.value = '2026-01-01';
-    endInput.value = '2026-01-02';
-
-    // Trigger the internal updateUI
-    startInput.dispatchEvent(new Event('input'));
-
-    expect(
-      Drive.masterCards[0].querySelector('.file-name-title').textContent
-    ).toBe('track_session_fast');
-    expect(Drive.masterCards[0].style.display).toBe('none'); // track_session_fast
-
-    expect(
-      Drive.masterCards[1].querySelector('.file-name-title').textContent
-    ).toBe('engine_log_warmup');
-    expect(Drive.masterCards[1].style.display).toBe('flex'); // engine_log_warmup
-  });
-
-  test('Clear search button resets visibility', () => {
-    Drive.initSearch();
-    const searchInput = document.getElementById('driveSearchInput');
-    const clearBtn = document.getElementById('clearDriveSearchText');
-
-    searchInput.value = 'nonexistent';
-    searchInput.dispatchEvent(new Event('input'));
-    expect(Drive.masterCards[0].style.display).toBe('none');
-
-    // Click the clear "X" button
-    clearBtn.click();
-
-    expect(searchInput.value).toBe('');
-    expect(Drive.masterCards[0].style.display).toBe('flex');
-  });
-});
-
-describe('Drive Module - Sorting & Filtering', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    document.body.innerHTML = `
-      <div id="driveList"></div>
-      ${Drive.getSearchInterfaceTemplate()}
-    `;
-
-    DOM.get.mockImplementation((id) => document.getElementById(id));
-
-    // Create cards with specific dates to test chronological sorting
-    const cardOld = document.createElement('div');
-    cardOld.className = 'drive-file-card';
-    cardOld.innerHTML = `
-      <div class="file-name-title">Old Log</div>
-      <div class="meta-item"><span>2025-01-01T10:00:00Z</span></div>
-    `;
-
-    const cardNew = document.createElement('div');
-    cardNew.className = 'drive-file-card';
-    cardNew.innerHTML = `
-      <div class="file-name-title">New Log</div>
-      <div class="meta-item"><span>2026-01-01T10:00:00Z</span></div>
-    `;
-
-    // Master list order doesn't matter; updateUI will re-sort them
-    Drive.masterCards = [cardOld, cardNew];
-  });
-
-  test('updateUI() sorts cards in descending order (Newest First)', () => {
-    Drive.initSearch(); // Triggers initial updateUI()
-
-    const container = document.getElementById('driveFileContainer');
-    const renderedCards = container.querySelectorAll('.drive-file-card');
-
-    // In 'desc' mode, "New Log" (2026) must appear before "Old Log" (2025)
-    expect(renderedCards[0].querySelector('.file-name-title').textContent).toBe(
-      'New Log'
-    );
-    expect(renderedCards[1].querySelector('.file-name-title').textContent).toBe(
-      'Old Log'
-    );
-  });
-
-  test('Toggling sort button reverses card order', () => {
-    Drive.initSearch();
-    const sortBtn = document.getElementById('driveSortToggle');
-
-    // Click to change from 'desc' to 'asc'
-    sortBtn.click();
-
-    const container = document.getElementById('driveFileContainer');
-    const renderedCards = container.querySelectorAll('.drive-file-card');
-
-    // In 'asc' mode, "Old Log" (2025) must appear first
-    expect(renderedCards[0].querySelector('.file-name-title').textContent).toBe(
-      'Old Log'
-    );
-    expect(renderedCards[1].querySelector('.file-name-title').textContent).toBe(
-      'New Log'
-    );
-  });
-});
diff --git a/tests/drive/drive.test.js b/tests/drive/drive.test.js
deleted file mode 100644
index ee1ed73..0000000
--- a/tests/drive/drive.test.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import { jest, describe, test, expect, beforeEach } from '@jest/globals'; // Add this line
-import { Drive } from '../../src/drive.js';
-import { DOM } from '../../src/config.js';
-
-// Mocking global dependencies
-global.gapi = {
-  client: {
-    drive: { files: { list: jest.fn(), get: jest.fn() } },
-  },
-};
-
-describe('Drive Module Logic Tests', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    localStorage.clear();
-  });
-
-  /**
-   * Tests the logic that extracts dates and lengths from filenames
-   */
-  test('getFileMetadata correctly parses valid filenames', () => {
-    const fileName = 'trip-log-1704556800000-3600.json'; // Jan 6, 2024
-    const meta = Drive.getFileMetadata(fileName);
-
-    expect(meta).not.toBeNull();
-    expect(meta.length).toBe('3600');
-    expect(meta.date).toContain('2024-01-06T16:00:00.000Z');
-  });
-
-  test('getFileMetadata returns null for invalid filenames', () => {
-    const fileName = 'invalid-file.json';
-    expect(Drive.getFileMetadata(fileName)).toBeNull();
-  });
-
-  test('parseDateFromCard extracts timestamp correctly from DOM element', () => {
-    const mockCard = document.createElement('div');
-    mockCard.innerHTML =
-      '<div class="meta-item"><span>2025-12-27T12:53:57.973Z</span></div>';
-    document.body.appendChild(mockCard);
-
-    const timestamp = Drive.parseDateFromCard(mockCard);
-
-    expect(timestamp).toBe(1766840037973);
-
-    const date = new Date(timestamp);
-    expect(date.getFullYear()).toBe(2025);
-    expect(date.getMonth()).toBe(11);
-    expect(date.getDate()).toBe(27);
-  });
-
-  /**
-   * Tests the Recently Viewed logic
-   */
-  test('loadFile updates localStorage history', async () => {
-    const fileId = 'test-123';
-    const fileName = 'trip.json';
-    const mockElement = document.createElement('div');
-
-    // Mock successful API response
-    gapi.client.drive.files.get.mockResolvedValue({ result: {} });
-
-    await Drive.loadFile(fileName, fileId, mockElement);
-
-    const recent = JSON.parse(localStorage.getItem('recent_logs'));
-    expect(recent).toContain(fileId);
-    expect(recent.length).toBeLessThanOrEqual(3);
-  });
-
-  test('clearRecentHistory wipes localStorage', () => {
-    localStorage.setItem('recent_logs', JSON.stringify(['id1', 'id2']));
-
-    // Mocking window.confirm to always return true
-    global.confirm = jest.fn(() => true);
-
-    Drive.clearRecentHistory();
-    expect(localStorage.getItem('recent_logs')).toBeNull();
-  });
-});