diff --git a/src/test/java/com/h2/Module05_Test.java b/src/test/java/com/h2/Module05_Test.java
index 9973204f1..86d9e1c76 100644
--- a/src/test/java/com/h2/Module05_Test.java
+++ b/src/test/java/com/h2/Module05_Test.java
@@ -3,24 +3,67 @@
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.function.Try;
 
+import java.lang.reflect.Field;
 import java.util.Optional;
+import java.util.Set;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.platform.commons.util.ReflectionUtils.tryToLoadClass;
+import static org.junit.platform.commons.util.ReflectionUtils.*;
 
 public class Module05_Test {
     private final String classToFind = "Finance";
 
-    public Optional<Class<?>> getAppClass() {
+    public Optional<Class<?>> getFinanceClass() {
         Try<Class<?>> aClass = tryToLoadClass(classToFind);
         return aClass.toOptional();
     }
 
     @Test
     public void m5_01_assertFinanceClassExistence() {
-        final Optional<Class<?>> maybeClass = getAppClass();
+        final Optional<Class<?>> maybeClass = getFinanceClass();
         assertTrue(maybeClass.isPresent(), classToFind + " should be present");
         assertEquals(classToFind, maybeClass.get().getCanonicalName());
     }
+
+    @Test
+    public void m05_02_testCommandConstantFields() throws IllegalAccessException {
+        final Optional<Class<?>> maybeClass = getFinanceClass();
+        assertTrue(maybeClass.isPresent(), classToFind + " should be present");
+        assertEquals(classToFind, maybeClass.get().getCanonicalName());
+
+        final Class<?> aClass = maybeClass.get();
+        final Field[] fields = aClass.getDeclaredFields();
+
+        assertEquals(3, fields.length, classToFind + " should have 3 fields");
+
+        final Set<String> fieldNames = Set.of("BEST_LOAN_RATES", "SAVINGS_CALCULATOR", "MORTGAGE_CALCULATOR");
+        for(Field field: fields) {
+            String fieldName = field.getName();
+            assertTrue(fieldNames.contains(fieldName), fieldName + " is not a valid field name. It should be among BEST_LOAN_RATES, SAVINGS_CALCULATOR, MORTGAGE_CALCULATOR");
+            assertTrue(isPublic(field), fieldName + " must be declared 'public'");
+            assertTrue(isStatic(field), fieldName + " must be declared 'static'");
+            assertTrue(isFinal(field), fieldName + " must be declared 'final'");
+
+            switch (fieldName) {
+                case "BEST_LOAN_RATES":
+                    assertEquals("bestLoanRates", field.get(null), "BEST_LOAN_RATES must have a value of 'bestLoanRates'");
+                    break;
+                case "SAVINGS_CALCULATOR":
+                    assertEquals("savingsCalculator", field.get(null), "SAVINGS_CALCULATOR must have a value of 'savingsCalculator'");
+                    break;
+                case "MORTGAGE_CALCULATOR":
+                    assertEquals("mortgageCalculator", field.get(null), "MORTGAGE_CALCULATOR must have a value of 'mortgageCalculator'");
+                    break;
+            }
+        }
+
+
+        /*
+         * 1. Existence of BEST_LOAN_RATES, SAVINGS_CALCULATOR, MORTGAGE_CALCULATOR
+         * 2. isPublic, isStatic, isFinal
+         * 3. Right values for each field
+         */
+    }
+
 }