diff --git a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/nosuchfielderror/FieldErrorExample.java b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/nosuchfielderror/FieldErrorExample.java
new file mode 100644
index 0000000000..71099201b8
--- /dev/null
+++ b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/nosuchfielderror/FieldErrorExample.java
@@ -0,0 +1,16 @@
+package com.baeldung.exceptions.nosuchfielderror;
+
+public class FieldErrorExample {
+
+    public static void main(String... args) {
+        fetchAndPrint();
+    }
+
+    public static String getDependentMessage() {
+        return Dependent.message;
+    }
+
+    public static void fetchAndPrint() {
+        System.out.println(getDependentMessage());
+    }
+}
diff --git a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/nosuchfielderror/NoSuchFieldErrorExample.java b/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/nosuchfielderror/NoSuchFieldErrorExample.java
deleted file mode 100644
index 727f10581d..0000000000
--- a/core-java-modules/core-java-exceptions-3/src/main/java/com/baeldung/exceptions/nosuchfielderror/NoSuchFieldErrorExample.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.exceptions.nosuchfielderror;
-
-public class NoSuchFieldErrorExample {
-
-    public static String getDependentMessage() {
-        return Dependent.message;
-    }
-}
diff --git a/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/nosuchfielderror/FieldErrorExampleUnitTest.java b/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/nosuchfielderror/FieldErrorExampleUnitTest.java
new file mode 100644
index 0000000000..d9ffd294e6
--- /dev/null
+++ b/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/nosuchfielderror/FieldErrorExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.exceptions.nosuchfielderror;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class FieldErrorExampleUnitTest {
+
+    @Test
+    public void whenDependentMessage_returnMessage() {
+        String dependentMessage = FieldErrorExample.getDependentMessage();
+        assertTrue("Hello Baeldung!!".equals(dependentMessage));
+    }
+
+}
diff --git a/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/nosuchfielderror/NoSuchFieldErrorExampleUnitTest.java b/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/nosuchfielderror/NoSuchFieldErrorExampleUnitTest.java
deleted file mode 100644
index 8f2dc45aa0..0000000000
--- a/core-java-modules/core-java-exceptions-3/src/test/java/com/baeldung/exceptions/nosuchfielderror/NoSuchFieldErrorExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.baeldung.exceptions.nosuchfielderror;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class NoSuchFieldErrorExampleUnitTest {
-
-    @Test
-    public void whenDependentMessage_returnMessage() {
-        String dependentMessage = NoSuchFieldErrorExample.getDependentMessage();
-        assertTrue("Hello Baeldung".equals(dependentMessage));
-    }
-
-}