diff --git a/front-controller/pom.xml b/front-controller/pom.xml
index 33a30c258..91ad6c1ab 100644
--- a/front-controller/pom.xml
+++ b/front-controller/pom.xml
@@ -15,5 +15,10 @@
junit
test
+
+ org.mockito
+ mockito-core
+ test
+
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java
new file mode 100644
index 000000000..18bdf0d13
--- /dev/null
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/ApplicationExceptionTest.java
@@ -0,0 +1,20 @@
+package com.iluwatar.front.controller;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Date: 12/13/15 - 1:35 PM
+ *
+ * @author Jeroen Meulemeester
+ */
+public class ApplicationExceptionTest {
+
+ @Test
+ public void testCause() throws Exception {
+ final Exception cause = new Exception();
+ assertSame(cause, new ApplicationException(cause).getCause());
+ }
+
+}
\ No newline at end of file
diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java
new file mode 100644
index 000000000..fa85caa39
--- /dev/null
+++ b/front-controller/src/test/java/com/iluwatar/front/controller/CommandTest.java
@@ -0,0 +1,62 @@
+package com.iluwatar.front.controller;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+/**
+ * Date: 12/13/15 - 1:39 PM
+ *
+ * @author Jeroen Meulemeester
+ */
+@RunWith(Parameterized.class)
+public class CommandTest extends StdOutTest {
+
+ @Parameters
+ public static List