diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.kt
index 0a0f80c33c08..5ea251b8cf68 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.kt
@@ -5,7 +5,10 @@ import openfoodfacts.github.scrachx.openfood.BuildConfig
 import openfoodfacts.github.scrachx.openfood.R
 import openfoodfacts.github.scrachx.openfood.models.Product
 import openfoodfacts.github.scrachx.openfood.models.ProductImageField
-import openfoodfacts.github.scrachx.openfood.models.ProductImageField.*
+import openfoodfacts.github.scrachx.openfood.models.ProductImageField.FRONT
+import openfoodfacts.github.scrachx.openfood.models.ProductImageField.INGREDIENTS
+import openfoodfacts.github.scrachx.openfood.models.ProductImageField.NUTRITION
+import openfoodfacts.github.scrachx.openfood.models.ProductImageField.PACKAGING
 import org.jetbrains.annotations.Contract
 
 @Contract(pure = true)
@@ -76,4 +79,3 @@ const val LANGUAGE = "language"
 const val IMAGE_STRING_ID = "id"
 const val IMG_ID = "imgid"
 const val IMAGE_EDIT_SIZE = 400
-const val IMAGE_EDIT_SIZE_FILE = ".$IMAGE_EDIT_SIZE"
\ No newline at end of file
diff --git a/app/src/test/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelperTest.kt b/app/src/test/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelperTest.kt
index 060b6cc51426..384959c2aa0d 100644
--- a/app/src/test/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelperTest.kt
+++ b/app/src/test/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelperTest.kt
@@ -2,33 +2,28 @@ package openfoodfacts.github.scrachx.openfood.images
 
 import com.google.common.truth.Truth.assertThat
 import io.mockk.every
-import io.mockk.mockk
+import io.mockk.impl.annotations.MockK
+import io.mockk.junit5.MockKExtension
 import openfoodfacts.github.scrachx.openfood.BuildConfig
 import openfoodfacts.github.scrachx.openfood.models.Product
 import openfoodfacts.github.scrachx.openfood.models.ProductImageField
-import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
 
+@ExtendWith(MockKExtension::class)
 class ImageKeyHelperTest {
-    private lateinit var mockProduct: Product
-
-    @BeforeEach
-    fun setUp() {
-        mockProduct = mockk()
-    }
 
     @Test
-    fun imageStringKey_returnsCorrectString() {
-        every { mockProduct.lang } returns "de"
+    fun imageStringKey_returnsCorrectString(@MockK product: Product) {
+        every { product.lang } returns "de"
 
-        assertThat(mockProduct.getImageStringKey(ProductImageField.FRONT))
+        assertThat(product.getImageStringKey(ProductImageField.FRONT))
             .isEqualTo("front_de")
     }
 
     @Test
-    fun languageCodeFromUrl_blankURL() {
-        val url = ""
-        assertThat(getLanguageCodeFromUrl(ProductImageField.INGREDIENTS, url)).isNull()
+    fun `languageCode from empty url should be null`() {
+        assertThat(getLanguageCodeFromUrl(ProductImageField.INGREDIENTS, "")).isNull()
     }
 
     @Test
@@ -40,18 +35,18 @@ class ImageKeyHelperTest {
     @Test
     fun imageUrl_BarcodeShorter() {
         val barcode = "303371"
-        val imageName = "Image"
-        val size = "big"
-        val expected = BuildConfig.STATICURL + "/images/products/303371/Imagebig.jpg"
+        val imageName = "123"
+        val size = "987"
+        val expected = BuildConfig.STATICURL + "/images/products/303371/123.987.jpg"
         assertThat(getImageUrl(barcode, imageName, size)).isEqualTo(expected)
     }
 
     @Test
     fun imageUrl_BarcodeLonger() {
         val barcode = "3033710001279"
-        val imageName = "Image"
-        val size = "big"
-        val expected = BuildConfig.STATICURL + "/images/products/303/371/000/1279/Imagebig.jpg"
+        val imageName = "123"
+        val size = "987"
+        val expected = BuildConfig.STATICURL + "/images/products/303/371/000/1279/123.987.jpg"
         assertThat(getImageUrl(barcode, imageName, size)).isEqualTo(expected)
     }
-}
\ No newline at end of file
+}