diff --git a/autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java b/autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
index 74666b2f7d..0aed76b834 100644
--- a/autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
+++ b/autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
@@ -8,6 +8,8 @@ import java.util.Locale;
 public class BingTranslationServiceProvider implements TranslationService {
 
     public String translate(String message, Locale from, Locale to) {
-        return "translated by Bing";
+        
+		// implementation details
+        return message + " (translated by Bing)"; 
     }
 }
diff --git a/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java b/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
index 68889472bf..eb5d191a26 100644
--- a/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
+++ b/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
@@ -8,6 +8,8 @@ import java.util.Locale;
 public class GoogleTranslationServiceProvider implements TranslationService {
 
     public String translate(String message, Locale from, Locale to) {
-        return "translated by Google";
+        
+		// implementation details
+        return message + " (translated by Google)"; 
     }
 }
diff --git a/autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java b/autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
index f167dad6bd..2f39a306c2 100644
--- a/autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
+++ b/autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
@@ -9,26 +9,31 @@ import java.util.stream.StreamSupport;
 import static org.junit.Assert.assertEquals;
 
 public class TranslationServiceUnitTest {
+	
+    private ServiceLoader<TranslationService> loader;
+
+    @Before
+    public void setUp() {
+
+        loader = ServiceLoader.load(TranslationService.class);
+    }
 
     @Test
     public void whenServiceLoaderLoads_thenLoadsAllProviders() {
 
-      ServiceLoader<TranslationService> loader = ServiceLoader.load(TranslationService.class);
-      long count = StreamSupport.stream(loader.spliterator(), false).count();
-      assertEquals(2, count);
+        long count = StreamSupport.stream(loader.spliterator(), false).count();
+        assertEquals(2, count);
     }
 
     @Test
     public void whenServiceLoaderLoadsGoogleService_thenGoogleIsLoaded() {
 
-      ServiceLoader<TranslationService> loader = ServiceLoader.load(TranslationService.class);
-
-      TranslationService googleService = StreamSupport.stream(loader.spliterator(), false)
-        .filter(p -> p.getClass().getSimpleName().equals("GoogleTranslationServiceProvider"))
-        .findFirst()
-        .get();
-
-      assertEquals("translated by Google", googleService.translate("message", null, null));
-
+        TranslationService googleService = StreamSupport.stream(loader.spliterator(), false)
+          .filter(p -> p.getClass().getSimpleName().equals("GoogleTranslationServiceProvider"))
+          .findFirst()
+          .get();
+		
+        String message = "message";
+        assertEquals(message + " (translated by Google)", googleService.translate(message, null, null));
     }
 }
\ No newline at end of file