diff --git a/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseDateTimeFormatterUnitTest.java b/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseDateTimeFormatterUnitTest.java
index 797e0b954a..8ca0066a0d 100644
--- a/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseDateTimeFormatterUnitTest.java
+++ b/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseDateTimeFormatterUnitTest.java
@@ -31,6 +31,6 @@ public class UseDateTimeFormatterUnitTest {
     public void givenALocalDate_whenFormattingWithStyleAndLocale_thenPass() {
         String result = subject.formatWithStyleAndLocale(localDateTime, FormatStyle.MEDIUM, Locale.UK);
 
-        assertThat(result).isEqualTo("25 Jan 2015, 06:30:00");
+        assertThat(result).isEqualTo("25-Jan-2015 06:30:00");
     }
 }
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseToInstantUnitTest.java b/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseToInstantUnitTest.java
index 78d9a647fe..cb6e804284 100644
--- a/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseToInstantUnitTest.java
+++ b/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseToInstantUnitTest.java
@@ -3,6 +3,7 @@ package com.baeldung.datetime;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -24,10 +25,11 @@ public class UseToInstantUnitTest {
 
     @Test
     public void givenADate_whenConvertingToLocalDate_thenAsExpected() {
-        Date givenDate = new Date(1465817690000L);
+        LocalDateTime currentDateTime = LocalDateTime.now();
+        Date givenDate = Date.from(currentDateTime.atZone(ZoneId.systemDefault()).toInstant());
 
         LocalDateTime localDateTime = subject.convertDateToLocalDate(givenDate);
 
-        assertThat(localDateTime).isEqualTo("2016-06-13T13:34:50");
+        assertThat(localDateTime).isEqualTo(currentDateTime);
     }
 }
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java b/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
index 4a39f6056e..0ee0f72d78 100644
--- a/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
+++ b/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/datetime/UseZonedDateTimeUnitTest.java
@@ -54,7 +54,7 @@ public class UseZonedDateTimeUnitTest {
     @Test
     public void givenAStringWithTimeZone_whenParsing_thenEqualsExpected() {
         ZonedDateTime resultFromString = zonedDateTime.getZonedDateTimeUsingParseMethod("2015-05-03T10:15:30+01:00[Europe/Paris]");
-        ZonedDateTime resultFromLocalDateTime = ZonedDateTime.of(2015, 5, 3, 11, 15, 30, 0, ZoneId.of("Europe/Paris"));
+        ZonedDateTime resultFromLocalDateTime = ZonedDateTime.of(2015, 5, 3, 10, 15, 30, 0, ZoneId.of("Europe/Paris"));
 
         assertThat(resultFromString.getZone()).isEqualTo(ZoneId.of("Europe/Paris"));
         assertThat(resultFromLocalDateTime.getZone()).isEqualTo(ZoneId.of("Europe/Paris"));
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 589097cf48..e6fd449c87 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -64,6 +64,7 @@
         <module>core-java-date-operations-2</module>
         <!-- We haven't upgraded to java 9. -->
         <!-- <module>core-java-datetime-computations</module> <module>core-java-datetime-conversion</module> <module>core-java-datetime-java8</module> <module>core-java-datetime-string</module> -->
+        <module>core-java-8-datetime</module>
 
         <module>core-java-exceptions</module>
         <module>core-java-exceptions-2</module>