diff --git a/P/Sda1/Streams/Solution/src/test/java/de/hdm_stuttgart/mi/javastreams/Java8FunctionalTest.java b/P/Sda1/Streams/Solution/src/test/java/de/hdm_stuttgart/mi/javastreams/Java8FunctionalTest.java
index 2e9430d4c5e47fd92f84212e29add6008f6f66ab..57cee719ce23332aa478ef5a405acade034911a7 100644
--- a/P/Sda1/Streams/Solution/src/test/java/de/hdm_stuttgart/mi/javastreams/Java8FunctionalTest.java
+++ b/P/Sda1/Streams/Solution/src/test/java/de/hdm_stuttgart/mi/javastreams/Java8FunctionalTest.java
@@ -2,10 +2,7 @@ package de.hdm_stuttgart.mi.javastreams;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.OptionalDouble;
+import java.util.*;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
@@ -53,14 +50,14 @@ public class Java8FunctionalTest {
       final List<String> emails =
             students.parallelStream().
             filter(s -> s.gender == Sex.MALE).
-            sorted((s1, s2) -> s1.getEmailAddress().compareTo(s2.getEmailAddress())).
+            sorted(Comparator.comparing(Student::getEmailAddress)).
             map(Student::getName).
             distinct().
             collect(Collectors.toList());
 
       assertThat(
             emails,
-            Matchers.<List<String>> equalTo( 
+            Matchers.equalTo(
                   ImmutableList.of("Bob", "Fred", "George") 
                   ) 
             );
@@ -240,7 +237,7 @@ public class Java8FunctionalTest {
                   );
 
       assertThat(frequencyByMark,
-            Matchers.<Map<Integer, Integer>> equalTo( 
+            Matchers.equalTo(
                   ImmutableMap.of(
                         1,   1,
                         2,   3,