diff --git a/.gitignore b/.gitignore
index 5b5095f..85eda7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 node_modules
 bower_components
+tmp
 .vagrant
 results/*
 coverage
diff --git a/Gruntfile.js b/Gruntfile.js
index 2ef5149..9fd6597 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -68,25 +68,39 @@ module.exports = function(grunt) {
             ]
         },
         clean: {
-            icons: {
+            tmp: {
                 src: ['tmp']
             },
             dev: {
                 src: ['front/src/css']
             },
             coverage: {
-                src: ['coverage/']
+                src: ['tmp', 'coverage/']
             }
         },
         copy: {
+            beforeCoverage: {
+                files: [
+                    {src: ['bin/server.js'], dest: 'tmp/'}
+                ]
+            },
             coverage: {
                 files: [
                     {src: ['test/**'], dest: 'coverage/'},
-                    {src: ['lib/metadata/**'], dest: 'coverage/'},
-                    {src: ['bin/**'], dest: 'coverage/'}
+                    {src: ['lib/metadata/**'], dest: 'coverage/'}
                 ]
             }
         },
+        lineremover: {
+            beforeCoverage: {
+                files: {
+                    'tmp/bin/cli.js': 'bin/cli.js'
+                },
+                options: {
+                    exclusionPattern: /#!\/usr\/bin\/env node/
+                }
+            }
+        },
         blanket: {
             coverageApp: {
                 src: ['app/'],
@@ -97,7 +111,7 @@ module.exports = function(grunt) {
                 dest: 'coverage/lib/'
             },
             coverageBin: {
-                src: ['bin/'],
+                src: ['tmp/bin/'],
                 dest: 'coverage/bin/'
             }
         },
@@ -184,7 +198,7 @@ module.exports = function(grunt) {
     grunt.registerTask('icons', [
         'font:icons',
         'less',
-        'clean:icons'
+        'clean:tmp'
     ]);
 
     grunt.registerTask('build', [
@@ -206,11 +220,14 @@ module.exports = function(grunt) {
         'express:testSuite',
         'clean:coverage',
         'copy-test-server-settings',
+        'lineremover:beforeCoverage',
+        'copy:beforeCoverage',
         'blanket',
         'copy:coverage',
         'express:test',
         'mochaTest:test',
-        'mochaTest:coverage'
+        'mochaTest:coverage',
+        'clean:tmp'
     ]);
 
     grunt.registerTask('test-current-work', [
@@ -219,9 +236,13 @@ module.exports = function(grunt) {
         'express:testSuite',
         'clean:coverage',
         'copy-test-server-settings',
+        'lineremover:beforeCoverage',
+        'copy:beforeCoverage',
         'blanket',
         'copy:coverage',
-        'mochaTest:test-current-work'
+        'express:test',
+        'mochaTest:test-current-work',
+        'clean:tmp'
     ]);
 
 };
\ No newline at end of file
diff --git a/bin/cli.js b/bin/cli.js
index 0524668..88b615a 100644
--- a/bin/cli.js
+++ b/bin/cli.js
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 var debug = require('debug')('ylt:cli');
 
 var YellowLabTools = require('../lib/yellowlabtools');
diff --git a/package.json b/package.json
index 80f6fd9..4c4ad98 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "url": "git://github.com/gmetais/YellowLabTools.git"
   },
   "bin": {
-    "ylt": "./bin/cli.js"
+    "yellowlabtools": "./bin/cli"
   },
   "main": "./lib/yellowlabtools.js",
   "dependencies": {
@@ -31,6 +31,7 @@
     "grunt-contrib-less": "^0.12.0",
     "grunt-express": "^1.4.1",
     "grunt-fontsmith": "^0.9.1",
+    "grunt-line-remover": "^0.0.2",
     "grunt-mocha-test": "^0.12.4",
     "grunt-replace": "^0.8.0",
     "matchdep": "^0.3.0",