diff --git a/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java b/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java
index 30f6fc713f..12143c3c19 100644
--- a/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java
+++ b/core-java-8/src/test/java/com/baeldung/file/FileOperationsTest.java
@@ -114,6 +114,7 @@ public class FileOperationsTest {
                 resultStringBuilder.append(line).append("\n");
             }
         }
+
         return resultStringBuilder.toString();
     }
 }
\ No newline at end of file
diff --git a/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeTest.java b/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeTest.java
index 599d5a5894..da9027060e 100644
--- a/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeTest.java
+++ b/core-java-8/src/test/java/com/baeldung/util/CurrentDateTimeTest.java
@@ -1,31 +1,15 @@
 package com.baeldung.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
+import org.junit.Test;
 
-import java.time.Clock;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
+import java.time.*;
 import java.time.temporal.ChronoField;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.Mockito;
+import static org.junit.Assert.assertEquals;
 
 public class CurrentDateTimeTest {
 
-    private static Clock clock;
-
-    @BeforeClass
-    public static void setup() {
-        final Instant currentTime = Instant.parse("2016-10-09T15:10:30.00Z");
-
-        clock = Mockito.mock(Clock.class);
-        when(clock.instant()).thenAnswer((invocation) -> currentTime);
-        when(clock.getZone()).thenAnswer((invocation) -> ZoneId.of("UTC"));
-    }
+    private static final Clock clock = Clock.fixed(Instant.parse("2016-10-09T15:10:30.00Z"), ZoneId.of("UTC"));
 
     @Test
     public void shouldReturnCurrentDate() {