diff --git a/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/date/Date.java b/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/date/Date.java
new file mode 100644
index 0000000000..38b7fdffa5
--- /dev/null
+++ b/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/date/Date.java
@@ -0,0 +1,18 @@
+package com.baeldung.date;
+
+public class Date {
+
+    private long currentTimeMillis;
+
+    public Date() {
+        this(System.currentTimeMillis());
+    }
+
+    public Date(long currentTimeMillis) {
+        this.currentTimeMillis = currentTimeMillis;
+    }
+
+    public long getTime() {
+        return currentTimeMillis;
+    }
+}
diff --git a/core-java-modules/core-java-lang-5/src/test/java/com/baeldung/date/DateUnitTest.java b/core-java-modules/core-java-lang-5/src/test/java/com/baeldung/date/DateUnitTest.java
new file mode 100644
index 0000000000..390b80b8e5
--- /dev/null
+++ b/core-java-modules/core-java-lang-5/src/test/java/com/baeldung/date/DateUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.date;
+
+import java.util.Date;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DateUnitTest {
+
+    @Test
+    public void whenUsingFullyQualifiedClassNames() {
+
+        java.util.Date javaDate = new java.util.Date();
+        com.baeldung.date.Date baeldungDate = new com.baeldung.date.Date(javaDate.getTime());
+
+        Assert.assertEquals(javaDate.getTime(), baeldungDate.getTime());
+    }
+
+    @Test
+    public void whenImportTheMostUsedOne() {
+
+        Date javaDate = new Date();
+        com.baeldung.date.Date baeldungDate = new com.baeldung.date.Date(javaDate.getTime());
+
+        Assert.assertEquals(javaDate.getTime(), baeldungDate.getTime());
+    }
+}