diff --git a/pom.xml b/pom.xml
index 1b379ed..f745ab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,6 +240,15 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.2.5</version>
+                <configuration>
+                    <!-- Enable ByteBuddy experimental mode for Java 25 support -->
+                    <!-- Mockito requires this for Java 24+ -->
+                    <argLine>
+                        -Dnet.bytebuddy.experimental=true
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                    </argLine>
+                </configuration>
             </plugin>
             <!--            <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/com/auction/DatabaseService.java b/src/main/java/com/auction/DatabaseService.java
index 31c7662..d0716c3 100644
--- a/src/main/java/com/auction/DatabaseService.java
+++ b/src/main/java/com/auction/DatabaseService.java
@@ -352,7 +352,7 @@ public class DatabaseService {
             }
         } catch (SQLException e) {
             // Table might not exist in scraper format - that's ok
-            Console.println("ℹ️  Scraper auction table not found or incompatible schema");
+            IO.println("ℹ️  Scraper auction table not found or incompatible schema");
         }
 
         return imported;
diff --git a/src/main/java/com/auction/ImageProcessingService.java b/src/main/java/com/auction/ImageProcessingService.java
index aea4b56..534fd59 100644
--- a/src/main/java/com/auction/ImageProcessingService.java
+++ b/src/main/java/com/auction/ImageProcessingService.java
@@ -44,7 +44,13 @@ class ImageProcessingService {
                 var dir = baseDir.resolve(String.valueOf(saleId)).resolve(String.valueOf(lotId));
                 Files.createDirectories(dir);
 
-                var fileName = Paths.get(imageUrl).getFileName().toString();
+                // Extract filename from URL
+                var fileName = imageUrl.substring(imageUrl.lastIndexOf('/') + 1);
+                // Remove query parameters if present
+                int queryIndex = fileName.indexOf('?');
+                if (queryIndex > 0) {
+                    fileName = fileName.substring(0, queryIndex);
+                }
                 var dest = dir.resolve(fileName);
 
                 Files.write(dest, response.body());
diff --git a/src/test/java/com/auction/ImageProcessingServiceTest.java b/src/test/java/com/auction/ImageProcessingServiceTest.java
index 9dfa05e..0cce585 100644
--- a/src/test/java/com/auction/ImageProcessingServiceTest.java
+++ b/src/test/java/com/auction/ImageProcessingServiceTest.java
@@ -70,9 +70,13 @@ class ImageProcessingServiceTest {
 
     @Test
     @DisplayName("Should handle image download failure gracefully")
-    void testDownloadImageFailure() {
-        // Invalid URL should return null
-        String result = service.downloadImage("invalid-url", 123, 456);
+    void testDownloadImageFailure() throws Exception {
+        // Mock HTTP client to throw exception
+        when(mockHttpClient.sendGetBytes(anyString()))
+            .thenThrow(new java.io.IOException("Connection failed"));
+
+        // Should return null on failure
+        String result = service.downloadImage("http://example.com/image.jpg", 123, 456);
         assertNull(result);
     }
 
@@ -164,7 +168,14 @@ class ImageProcessingServiceTest {
 
     @Test
     @DisplayName("Should handle database errors during image save")
-    void testDatabaseErrorHandling() throws SQLException {
+    void testDatabaseErrorHandling() throws Exception {
+        // Mock successful HTTP download
+        @SuppressWarnings("unchecked")
+        var mockResponse = mock(java.net.http.HttpResponse.class);
+        when(mockResponse.statusCode()).thenReturn(200);
+        when(mockResponse.body()).thenReturn(new byte[]{1, 2, 3});
+        when(mockHttpClient.sendGetBytes(anyString())).thenReturn(mockResponse);
+
         when(mockDetector.detectObjects(anyString()))
             .thenReturn(List.of("object"));