diff --git a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java b/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
index b906acfad9..024d5dabdb 100644
--- a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
+++ b/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Executor.java
@@ -1,45 +1,19 @@
 package com.baeldung.spliteratorAPI;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Spliterator;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 public class Executor {
-	public void executeCustomSpliterator() {
-        Article article = new Article(Arrays.asList(new Author("Ahmad", 0), new Author("Eugen", 0), new Author("Alice", 1), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
-            new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
-            new Author("Alice", 1), new Author("Mike", 0), new Author("Michał", 0), new Author("Loredana", 1)), 0);
-        Stream<Author> stream = IntStream.range(0, article.getListOfAuthors()
-            .size())
-            .mapToObj(article.getListOfAuthors()::get);
-        System.out.println("count= " + countAutors(stream.parallel()));
-        Spliterator<Author> spliterator = new RelatedAuthorSpliterator(article.getListOfAuthors());
-        Stream<Author> stream2 = StreamSupport.stream(spliterator, true);
-        System.out.println("count= " + countAutors(stream2.parallel()));
-    }
 
-    public void executeSpliterator() {
-        Spliterator<Article> split1 = generateElements().spliterator();
-        Spliterator<Article> split2 = split1.trySplit();
-        ExecutorService service = Executors.newCachedThreadPool();
-        service.execute(new Task(split1));
-        service.execute(new Task(split2));
-    }
+	public static int countAutors(Stream<Author> stream) {
+		RelatedAuthorCounter wordCounter = stream.reduce(new RelatedAuthorCounter(0, true),
+				RelatedAuthorCounter::accumulate, RelatedAuthorCounter::combine);
+		return wordCounter.getCounter();
+	}
 
-    private static int countAutors(Stream<Author> stream) {
-        RelatedAuthorCounter wordCounter = stream.reduce(new RelatedAuthorCounter(0, true), RelatedAuthorCounter::accumulate, RelatedAuthorCounter::combine);
-        return wordCounter.getCounter();
-    }
+	public static List<Article> generateElements() {
+		return Stream.generate(() -> new Article("Java")).limit(35000).collect(Collectors.toList());
+	}
 
-    private List<Article> generateElements() {
-        return Stream.generate(() -> new Article("Java"))
-            .limit(35000)
-            .collect(Collectors.toList());
-    }
-}
+}
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java b/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
index 108fdc52aa..70435d1c75 100644
--- a/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
+++ b/core-java-8/src/main/java/com/baeldung/spliteratorAPI/Task.java
@@ -1,8 +1,9 @@
 package com.baeldung.spliteratorAPI;
 
 import java.util.Spliterator;
+import java.util.concurrent.Callable;
 
-public class Task implements Runnable {
+public class Task implements Callable<String> {
     private Spliterator<Article> spliterator;
     private final static String SUFFIX = "- published by Baeldung";
 
@@ -11,7 +12,7 @@ public class Task implements Runnable {
     }
 
     @Override
-    public void run() {
+    public String call() {
         int current = 0;
         while (spliterator.tryAdvance(article -> {
             article.setName(article.getName()
@@ -20,7 +21,7 @@ public class Task implements Runnable {
             current++;
         }
         ;
-        System.out.println(Thread.currentThread()
-            .getName() + ":" + current);
+        return Thread.currentThread()
+            .getName() + ":" + current;
     }
 }
diff --git a/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorTest.java b/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorTest.java
new file mode 100644
index 0000000000..64dd65cf5e
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/spliteratorAPI/ExecutorTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.spliteratorAPI;
+
+import java.util.Arrays;
+import java.util.Spliterator;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static org.assertj.core.api.Assertions.*;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExecutorTest {
+	Article article;
+	Stream<Author> stream;
+	Spliterator<Author> spliterator;
+	Spliterator<Article> split1;
+	Spliterator<Article> split2;
+
+	@Before
+	public void init() {
+		article = new Article(Arrays.asList(new Author("Ahmad", 0), new Author("Eugen", 0), new Author("Alice", 1),
+				new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
+				new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0),
+				new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
+				new Author("Mike", 0), new Author("Alice", 1), new Author("Mike", 0), new Author("Alice", 1),
+				new Author("Mike", 0), new Author("Michał", 0), new Author("Loredana", 1)), 0);
+		stream = article.getListOfAuthors().stream();
+		split1 = Executor.generateElements().spliterator();
+		split2 = split1.trySplit();
+		spliterator = new RelatedAuthorSpliterator(article.getListOfAuthors());
+	}
+
+	@Test
+	public void givenAstreamOfAuthors_whenProcessedInParallelWithCustomSpliterator_coubtProducessRightOutput() {
+		Stream<Author> stream2 = StreamSupport.stream(spliterator, true);
+		assertThat(Executor.countAutors(stream2.parallel())).isEqualTo(9);
+	}
+
+	@Test
+	public void givenSpliterator_whenAppliedToAListOfArticle_thenSplittedInHalf() {
+		assertThat(new Task(split1).call()).containsSequence(Executor.generateElements().size() / 2 + "");
+		assertThat(new Task(split2).call()).containsSequence(Executor.generateElements().size() / 2 + "");
+	}
+}