diff --git a/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java b/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
index 731a2119..daf734cd 100644
--- a/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
+++ b/src/main/java/guru/springframework/sfgpetclinic/controllers/IndexController.java
@@ -3,11 +3,10 @@
 public class IndexController {
 
     public String index(){
-
         return "index";
     }
 
     public String oupsHandler(){
-        return "notimplemented";
+        return "notimplemented_new";
     }
 }
diff --git a/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java b/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java
new file mode 100644
index 00000000..b91ea22e
--- /dev/null
+++ b/src/test/java/guru/springframework/sfgpetclinic/controllers/IndexControllerTest.java
@@ -0,0 +1,32 @@
+package guru.springframework.sfgpetclinic.controllers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class IndexControllerTest {
+
+  IndexController controller;
+
+  // new_branch
+  @BeforeEach
+  void setUp() {
+    controller = new IndexController();
+  }
+
+  @Test
+  void index() {
+    assertEquals("index", controller.index());
+    assertEquals("index", controller.index(), "Wrong View Returned");
+
+    assertEquals("index", controller.index(),
+        () -> "Another Expensive Message " + "Make me only if you have to");
+  }
+
+  @Test
+  void oupsHandler() {
+    assertTrue("notimplemented".equals(controller.oupsHandler()),
+        () -> "This is some expensive " + "Message to build" + "for my test");
+  }
+}