diff --git a/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/staticfinal/Bike.java b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/staticfinal/Bike.java
new file mode 100644
index 0000000000..bde7b44897
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/staticfinal/Bike.java
@@ -0,0 +1,14 @@
+package com.baeldung.staticfinal;
+
+import java.util.HashMap;
+
+public class Bike {
+    public static final int TIRE = 2;
+    public static final int PEDAL;
+    public static final HashMap<String, Integer> PART = new HashMap<>();
+
+    static {
+        PEDAL = 5;
+    }
+
+}
diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/staticfinal/BikeUnitTest.java b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/staticfinal/BikeUnitTest.java
new file mode 100644
index 0000000000..2201dae4d1
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/staticfinal/BikeUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.staticfinal;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class BikeUnitTest {
+
+    @Test
+    void givenTireConstantSetUponDeclaration_whenGetTire_thenReturnTwo() {
+        assertEquals(2, Bike.TIRE);
+    }
+
+    @Test
+    void givenPedalConstantSetByStaticBlock_whenGetPedal_thenReturnFive() {
+        assertEquals(5, Bike.PEDAL);
+    }
+
+    @Test
+    void givenPartConstantObject_whenObjectStateChanged_thenCorrect() {
+        Bike.PART.put("seat", 1);
+        assertEquals(1, Bike.PART.get("seat"));
+
+        Bike.PART.put("seat", 5);
+        assertEquals(5, Bike.PART.get("seat"));
+    }
+
+    @Test
+    void givenMathClass_whenAccessingPiConstant_thenVerifyPiValueIsCorrect() {
+        assertEquals(3.141592653589793, Math.PI);
+    }
+
+}
\ No newline at end of file