diff --git a/.travis.yml b/.travis.yml
index 0c97f233..534d3200 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 
 script:
-- mvn checkstyle:check test
+- mvn checkstyle:check cobertura:cobertura test
 
 after_success:
 - mvn clean cobertura:cobertura coveralls:report
diff --git a/pom.xml b/pom.xml
index 90309157..905b292e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,6 @@
                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
                     <encoding>UTF-8</encoding>
                     <linkXRef>false</linkXRef>
-                    <excludes>**/name/fraser/neil/**/*</excludes>
                     <failOnViolation>true</failOnViolation>
                 </configuration>
                 <version>2.16</version>
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/Application.java b/src/main/java/fi/helsinki/cs/tmc/cli/Application.java
index a4025969..c04859e1 100644
--- a/src/main/java/fi/helsinki/cs/tmc/cli/Application.java
+++ b/src/main/java/fi/helsinki/cs/tmc/cli/Application.java
@@ -17,7 +17,8 @@ public Application() {
     }
 
     private void preinit() {
-        this.commands = new CommandMap(this);
+        this.commands = new CommandMap();
+        this.commands.createCommands(this);
         this.initialized = true;
     }
 
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/CommandMap.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/CommandMap.java
index 36b481b5..c154bbce 100644
--- a/src/main/java/fi/helsinki/cs/tmc/cli/command/CommandMap.java
+++ b/src/main/java/fi/helsinki/cs/tmc/cli/command/CommandMap.java
@@ -15,8 +15,11 @@ public class CommandMap {
     /**
      * Constructor.
      */
-    public CommandMap(Application app) {
+    public CommandMap() {
         this.commands = new HashMap<>();
+    }
+
+    public void createCommands(Application app) {
         createCommand(new TestCommand(app));
         createCommand(new HelpCommand(app));
     }
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/ApplicationTest.java b/src/test/java/fi/helsinki/cs/tmc/cli/ApplicationTest.java
index c6ded2d6..5b1e58d6 100644
--- a/src/test/java/fi/helsinki/cs/tmc/cli/ApplicationTest.java
+++ b/src/test/java/fi/helsinki/cs/tmc/cli/ApplicationTest.java
@@ -6,10 +6,9 @@
 
 
 public class ApplicationTest {
-    Application app = new Application();
-    
     @Test
-    public void testingTest() {
-        assertTrue(true);
+    public void testThatProgramWontCrashWithEmptyArguments() {
+        Application app = new Application();
+        app.run(new String[]{});
     }
 }
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/command/CommandMapTest.java b/src/test/java/fi/helsinki/cs/tmc/cli/command/CommandMapTest.java
index 65083726..824ae53c 100644
--- a/src/test/java/fi/helsinki/cs/tmc/cli/command/CommandMapTest.java
+++ b/src/test/java/fi/helsinki/cs/tmc/cli/command/CommandMapTest.java
@@ -27,7 +27,8 @@ public static void tearDownClass() {
 
     @Before
     public void setUp() {
-        cm = new CommandMap(new Application());
+        cm = new CommandMap();
+        cm.createCommands(new Application());
     }
 
     @After