diff --git a/lib/src/commands/command.dart b/lib/src/commands/command.dart
index 97d363c..f64dcc0 100644
--- a/lib/src/commands/command.dart
+++ b/lib/src/commands/command.dart
@@ -28,7 +28,11 @@ abstract class NgDartCommand extends Command {
     args = args.skip(1).toList();
 
     if (args.length > 0) {
-      throw new UsageException('Unexpected argument $args', '');
+      throw new UsageException(
+          'Unexpected argument' +
+              (args.length > 1 ? 's' : '') +
+              ': ${args.toString().substring(1, args.toString().length - 2)}',
+          '');
     }
 
     return arg;
diff --git a/lib/src/package_uri_resolver.dart b/lib/src/package_uri_resolver.dart
index 4da38b0..752bbcb 100644
--- a/lib/src/package_uri_resolver.dart
+++ b/lib/src/package_uri_resolver.dart
@@ -26,7 +26,7 @@ class PackageUriResolver {
     } catch (e) {
       throw new UsageException(
           'Error when reading $_dotPackagesFilePath, '
-          'please run pub get first.',
+              'please run pub get first.',
           '');
     }
 
@@ -49,7 +49,7 @@ class PackageUriResolver {
     if (_packageMap[packageName] == null) {
       throw new UsageException(
           'Cannot locate $packageName, '
-          'probably you need to run pub get again',
+              'probably you need to run pub get again',
           '');
     }
 
diff --git a/lib/src/project_model.dart b/lib/src/project_model.dart
index ba08874..06102d3 100644
--- a/lib/src/project_model.dart
+++ b/lib/src/project_model.dart
@@ -105,8 +105,8 @@ String _getProjectName(String pubspecFilePath) {
   } catch (e) {
     throw new UsageException(
         'Error happened when reading pubspec.yaml. '
-        'Command generate test should be run '
-        'under root directory of the project.',
+            'Command generate test should be run '
+            'under root directory of the project.',
         '');
   }
   var namePrefix = 'name:';
diff --git a/lib/templates/project/pubspec.yaml.mustache b/lib/templates/project/pubspec.yaml.mustache
index 8c2e3f7..0884d09 100644
--- a/lib/templates/project/pubspec.yaml.mustache
+++ b/lib/templates/project/pubspec.yaml.mustache
@@ -4,11 +4,11 @@ version: 0.0.1
 environment:
   sdk: ">=2.0.0-dev.64.2 <3.0.0"
 dependencies:
-  angular: ^5.0.0-beta+2
+  angular: ">=5.3.0"
 dev_dependencies:
-  angular_test: ^2.0.0-beta+2
-  build_runner: ^0.9.2
-  build_test: ^0.10.3+1
-  build_web_compilers: ^0.4.1
-  pageloader: ^3.0.0-beta
-  test: ^1.3.0
+  angular_test: ^2.4.0
+  build_runner: ^1.8.1
+  build_test: ^1.0.0
+  build_web_compilers: ^2.10.0
+  pageloader: ^3.3.0
+  test: ^1.14.2
diff --git a/test/page_object_data_test.dart b/test/page_object_data_test.dart
index 0feb8ef..1b6f9b6 100644
--- a/test/page_object_data_test.dart
+++ b/test/page_object_data_test.dart
@@ -33,7 +33,7 @@ void main() {
     test('should generate items in parents list', () {
       var po = new PageObjectData(
         '<p *ngFor="xxx"><action-button class="good">'
-            '</action-button></p>',
+        '</action-button></p>',
       );
       expect(po.variables.first.getterString,
           'Future<List<PageLoaderElement>> get good => _getGood();');
@@ -53,13 +53,13 @@ void main() {
     test('should sort generated items', () {
       var po1 = new PageObjectData(
         '<action-button class="good"></action-button>'
-            '<action-button class="bad"></action-button>',
+        '<action-button class="bad"></action-button>',
       );
       expect(po1.variables.first.name, 'Bad');
       expect(po1.variables.last.name, 'Good');
       var po2 = new PageObjectData(
         '<action-button class="good"></action-button>'
-            '<action-button class="bad"></action-button>',
+        '<action-button class="bad"></action-button>',
       );
       expect(po2.variables.first.name, 'Bad');
       expect(po2.variables.last.name, 'Good');
@@ -91,8 +91,8 @@ void main() {
     test('should choose correct selector.', () {
       var po = new PageObjectData(
         '<some-widget class="cool"></some-widget>'
-            '<some-widget class="cool" id="cooler"></some-widget>'
-            '<some-widget></some-widget>',
+        '<some-widget class="cool" id="cooler"></some-widget>'
+        '<some-widget></some-widget>',
       );
       expect(po.variables.length, 3);
       expect(po.variables[0].selector.toString(), "@ByClass('cool')");
@@ -103,7 +103,7 @@ void main() {
     test('should work with selectors with attributes', () {
       var po = new PageObjectData(
         '<some-cell class="field-class"></some-cell>'
-            '<some-cell id="fieldWithId"></some-cell>',
+        '<some-cell id="fieldWithId"></some-cell>',
       );
       expect(po.variables[0].selector.toString(), "@ByClass('field-class')");
       expect(po.variables[1].selector.toString(), "@ById('fieldWithId')");