diff --git a/package.json b/package.json
index 478c95230..66933259e 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "url": "git://github.com/yeoman/generator-angular.git"
   },
   "scripts": {
-    "test": "mocha test/test-*.js"
+    "test": "mocha test"
   },
   "dependencies": {
     "yeoman-generator": "~0.10.2"
diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js
index cb42a509b..5e970511c 100644
--- a/templates/common/Gruntfile.js
+++ b/templates/common/Gruntfile.js
@@ -38,7 +38,7 @@ module.exports = function (grunt) {
           '<%%= yeoman.app %>/{,*/}*.html',
           '{.tmp,<%%= yeoman.app %>}/styles/{,*/}*.css',
           '{.tmp,<%%= yeoman.app %>}/scripts/{,*/}*.js',
-          '<%%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg}'
+          '<%%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp}'
         ],
         tasks: ['livereload']
       }
@@ -185,7 +185,7 @@ module.exports = function (grunt) {
         files: [{
           expand: true,
           cwd: '<%%= yeoman.app %>',
-          src: ['*.html', 'views/*.html'],
+          src: ['*.html', 'views/{,*/}*.html'],
           dest: '<%%= yeoman.dist %>'
         }]
       }
@@ -224,7 +224,8 @@ module.exports = function (grunt) {
           src: [
             '*.{ico,txt}',
             '.htaccess',
-            'components/**/*'
+            'components/**/*',
+            'images/{,*/}*.{gif,webp}'
           ]
         }]
       }
diff --git a/templates/common/root/.editorconfig b/templates/common/root/.editorconfig
index 8a80734f0..c2cdfb8ad 100644
--- a/templates/common/root/.editorconfig
+++ b/templates/common/root/.editorconfig
@@ -9,7 +9,7 @@ root = true
 
 # Change these settings to your own preference
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 # We recommend you to keep these unchanged
 end_of_line = lf