diff --git a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/collectors/Java8CollectorsUnitTest.java b/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/collectors/Java8CollectorsUnitTest.java
index 085c1b5d7f..1faada9d23 100644
--- a/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/collectors/Java8CollectorsUnitTest.java
+++ b/core-java-modules/core-java-streams-simple/src/test/java/com/baeldung/streams/collectors/Java8CollectorsUnitTest.java
@@ -3,6 +3,7 @@ package com.baeldung.streams.collectors;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
+
 import org.junit.Test;
 
 import java.util.*;
@@ -23,142 +24,159 @@ public class Java8CollectorsUnitTest {
     private final List<String> listWithDuplicates = Arrays.asList("a", "bb", "c", "d", "bb");
 
     @Test
-    public void whenCollectingToList_shouldCollectToList() throws Exception {
-        final List<String> result = givenList.stream().collect(toList());
+    public void whenCollectingToList_shouldCollectToList() {
+        final List<String> result = givenList.stream()
+            .collect(toList());
 
         assertThat(result).containsAll(givenList);
     }
 
     @Test
     public void whenCollectingToUnmodifiableList_shouldCollectToUnmodifiableList() {
-        final List<String> result = givenList.stream().collect(toUnmodifiableList());
+        final List<String> result = givenList.stream()
+            .collect(toUnmodifiableList());
 
-        assertThatThrownBy(() -> result.add("foo"))
-          .isInstanceOf(UnsupportedOperationException.class);
+        assertThatThrownBy(() -> result.add("foo")).isInstanceOf(UnsupportedOperationException.class);
     }
 
     @Test
-    public void whenCollectingToSet_shouldCollectToSet() throws Exception {
-        final Set<String> result = givenList.stream().collect(toSet());
+    public void whenCollectingToSet_shouldCollectToSet() {
+        final Set<String> result = givenList.stream()
+            .collect(toSet());
 
         assertThat(result).containsAll(givenList);
     }
 
     @Test
     public void whenCollectingToUnmodifiableSet_shouldCollectToUnmodifiableSet() {
-        final Set<String> result = givenList.stream().collect(toUnmodifiableSet());
+        final Set<String> result = givenList.stream()
+            .collect(toUnmodifiableSet());
 
-        assertThatThrownBy(() -> result.add("foo"))
-          .isInstanceOf(UnsupportedOperationException.class);
+        assertThatThrownBy(() -> result.add("foo")).isInstanceOf(UnsupportedOperationException.class);
     }
 
     @Test
     public void givenContainsDuplicateElements_whenCollectingToSet_shouldAddDuplicateElementsOnlyOnce() throws Exception {
-        final Set<String> result = listWithDuplicates.stream().collect(toSet());
+        final Set<String> result = listWithDuplicates.stream()
+            .collect(toSet());
 
         assertThat(result).hasSize(4);
     }
 
     @Test
-    public void whenCollectingToCollection_shouldCollectToCollection() throws Exception {
-        final List<String> result = givenList.stream().collect(toCollection(LinkedList::new));
+    public void whenCollectingToCollection_shouldCollectToCollection() {
+        final List<String> result = givenList.stream()
+            .collect(toCollection(LinkedList::new));
 
-        assertThat(result).containsAll(givenList).isInstanceOf(LinkedList.class);
+        assertThat(result).containsAll(givenList)
+            .isInstanceOf(LinkedList.class);
     }
 
     @Test
-    public void whenCollectingToImmutableCollection_shouldThrowException() throws Exception {
+    public void whenCollectingToImmutableCollection_shouldThrowException() {
         assertThatThrownBy(() -> {
-            givenList.stream().collect(toCollection(ImmutableList::of));
+            givenList.stream()
+                .collect(toCollection(ImmutableList::of));
         }).isInstanceOf(UnsupportedOperationException.class);
 
     }
 
     @Test
-    public void whenCollectingToMap_shouldCollectToMap() throws Exception {
-        final Map<String, Integer> result = givenList.stream().collect(toMap(Function.identity(), String::length));
+    public void whenCollectingToMap_shouldCollectToMap() {
+        final Map<String, Integer> result = givenList.stream()
+            .collect(toMap(Function.identity(), String::length));
 
-        assertThat(result).containsEntry("a", 1).containsEntry("bb", 2).containsEntry("ccc", 3).containsEntry("dd", 2);
+        assertThat(result).containsEntry("a", 1)
+            .containsEntry("bb", 2)
+            .containsEntry("ccc", 3)
+            .containsEntry("dd", 2);
     }
 
     @Test
     public void whenCollectingToUnmodifiableMap_shouldCollectToUnmodifiableMap() {
         final Map<String, Integer> result = givenList.stream()
-          .collect(toUnmodifiableMap(Function.identity(), String::length));
+            .collect(toUnmodifiableMap(Function.identity(), String::length));
 
-        assertThatThrownBy(() -> result.put("foo", 3))
-                .isInstanceOf(UnsupportedOperationException.class);
+        assertThatThrownBy(() -> result.put("foo", 3)).isInstanceOf(UnsupportedOperationException.class);
     }
 
     @Test
     public void whenCollectingToMapwWithDuplicates_shouldCollectToMapMergingTheIdenticalItems() throws Exception {
-        final Map<String, Integer> result = listWithDuplicates.stream().collect(
-          toMap(
-            Function.identity(),
-            String::length,
-            (item, identicalItem) -> item
-          )
-        );
+        final Map<String, Integer> result = listWithDuplicates.stream()
+            .collect(toMap(Function.identity(), String::length, (item, identicalItem) -> item));
 
-        assertThat(result).containsEntry("a", 1).containsEntry("bb", 2).containsEntry("c", 1).containsEntry("d", 1);
+        assertThat(result).containsEntry("a", 1)
+            .containsEntry("bb", 2)
+            .containsEntry("c", 1)
+            .containsEntry("d", 1);
     }
 
     @Test
-    public void givenContainsDuplicateElements_whenCollectingToMap_shouldThrowException() throws Exception {
+    public void givenContainsDuplicateElements_whenCollectingToMap_shouldThrowException() {
         assertThatThrownBy(() -> {
-            listWithDuplicates.stream().collect(toMap(Function.identity(), String::length));
+            listWithDuplicates.stream()
+                .collect(toMap(Function.identity(), String::length));
         }).isInstanceOf(IllegalStateException.class);
     }
 
     @Test
-    public void whenCollectingAndThen_shouldCollect() throws Exception {
-        final List<String> result = givenList.stream().collect(collectingAndThen(toList(), ImmutableList::copyOf));
+    public void whenCollectingAndThen_shouldCollect() {
+        final List<String> result = givenList.stream()
+            .collect(collectingAndThen(toList(), ImmutableList::copyOf));
 
-        assertThat(result).containsAll(givenList).isInstanceOf(ImmutableList.class);
+        assertThat(result).containsAll(givenList)
+            .isInstanceOf(ImmutableList.class);
     }
 
     @Test
-    public void whenJoining_shouldJoin() throws Exception {
-        final String result = givenList.stream().collect(joining());
+    public void whenJoining_shouldJoin() {
+        final String result = givenList.stream()
+            .collect(joining());
 
         assertThat(result).isEqualTo("abbcccdd");
     }
 
     @Test
-    public void whenJoiningWithSeparator_shouldJoinWithSeparator() throws Exception {
-        final String result = givenList.stream().collect(joining(" "));
+    public void whenJoiningWithSeparator_shouldJoinWithSeparator() {
+        final String result = givenList.stream()
+            .collect(joining(" "));
 
         assertThat(result).isEqualTo("a bb ccc dd");
     }
 
     @Test
-    public void whenJoiningWithSeparatorAndPrefixAndPostfix_shouldJoinWithSeparatorPrePost() throws Exception {
-        final String result = givenList.stream().collect(joining(" ", "PRE-", "-POST"));
+    public void whenJoiningWithSeparatorAndPrefixAndPostfix_shouldJoinWithSeparatorPrePost() {
+        final String result = givenList.stream()
+            .collect(joining(" ", "PRE-", "-POST"));
 
         assertThat(result).isEqualTo("PRE-a bb ccc dd-POST");
     }
 
     @Test
-    public void whenPartitioningBy_shouldPartition() throws Exception {
-        final Map<Boolean, List<String>> result = givenList.stream().collect(partitioningBy(s -> s.length() > 2));
+    public void whenPartitioningBy_shouldPartition() {
+        final Map<Boolean, List<String>> result = givenList.stream()
+            .collect(partitioningBy(s -> s.length() > 2));
 
-        assertThat(result).containsKeys(true, false).satisfies(booleanListMap -> {
-            assertThat(booleanListMap.get(true)).contains("ccc");
+        assertThat(result).containsKeys(true, false)
+            .satisfies(booleanListMap -> {
+                assertThat(booleanListMap.get(true)).contains("ccc");
 
-            assertThat(booleanListMap.get(false)).contains("a", "bb", "dd");
-        });
+                assertThat(booleanListMap.get(false)).contains("a", "bb", "dd");
+            });
     }
 
     @Test
-    public void whenCounting_shouldCount() throws Exception {
-        final Long result = givenList.stream().collect(counting());
+    public void whenCounting_shouldCount() {
+        final Long result = givenList.stream()
+            .collect(counting());
 
         assertThat(result).isEqualTo(4);
     }
 
     @Test
-    public void whenSummarizing_shouldSummarize() throws Exception {
-        final DoubleSummaryStatistics result = givenList.stream().collect(summarizingDouble(String::length));
+    public void whenSummarizing_shouldSummarize() {
+        final DoubleSummaryStatistics result = givenList.stream()
+            .collect(summarizingDouble(String::length));
 
         assertThat(result.getAverage()).isEqualTo(2);
         assertThat(result.getCount()).isEqualTo(4);
@@ -168,38 +186,47 @@ public class Java8CollectorsUnitTest {
     }
 
     @Test
-    public void whenAveraging_shouldAverage() throws Exception {
-        final Double result = givenList.stream().collect(averagingDouble(String::length));
+    public void whenAveraging_shouldAverage() {
+        final Double result = givenList.stream()
+            .collect(averagingDouble(String::length));
 
         assertThat(result).isEqualTo(2);
     }
 
     @Test
-    public void whenSumming_shouldSum() throws Exception {
-        final Double result = givenList.stream().filter(i -> true).collect(summingDouble(String::length));
+    public void whenSumming_shouldSum() {
+        final Double result = givenList.stream()
+            .collect(summingDouble(String::length));
 
         assertThat(result).isEqualTo(8);
     }
 
     @Test
-    public void whenMaxingBy_shouldMaxBy() throws Exception {
-        final Optional<String> result = givenList.stream().collect(maxBy(Comparator.naturalOrder()));
+    public void whenMaxingBy_shouldMaxBy() {
+        final Optional<String> result = givenList.stream()
+            .collect(maxBy(Comparator.naturalOrder()));
 
-        assertThat(result).isPresent().hasValue("dd");
+        assertThat(result).isPresent()
+            .hasValue("dd");
     }
 
     @Test
-    public void whenGroupingBy_shouldGroupBy() throws Exception {
-        final Map<Integer, Set<String>> result = givenList.stream().collect(groupingBy(String::length, toSet()));
+    public void whenGroupingBy_shouldGroupBy() {
+        final Map<Integer, Set<String>> result = givenList.stream()
+            .collect(groupingBy(String::length, toSet()));
 
-        assertThat(result).containsEntry(1, newHashSet("a")).containsEntry(2, newHashSet("bb", "dd")).containsEntry(3, newHashSet("ccc"));
+        assertThat(result).containsEntry(1, newHashSet("a"))
+            .containsEntry(2, newHashSet("bb", "dd"))
+            .containsEntry(3, newHashSet("ccc"));
     }
 
     @Test
-    public void whenCreatingCustomCollector_shouldCollect() throws Exception {
-        final ImmutableSet<String> result = givenList.stream().collect(toImmutableSet());
+    public void whenCreatingCustomCollector_shouldCollect() {
+        final ImmutableSet<String> result = givenList.stream()
+            .collect(toImmutableSet());
 
-        assertThat(result).isInstanceOf(ImmutableSet.class).contains("a", "bb", "ccc", "dd");
+        assertThat(result).isInstanceOf(ImmutableSet.class)
+            .contains("a", "bb", "ccc", "dd");
 
     }