diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/CSharp.vstemplate
similarity index 86%
rename from TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/CSharp.vstemplate
rename to TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/CSharp.vstemplate
index ef43c51d..e8b9a01d 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/CSharp.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/CSharp.vstemplate	
@@ -1,8 +1,8 @@
 <VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
   <TemplateData>
     <DefaultName>controller.js</DefaultName>
-    <Name>AngularJs Controller using 'Controller as'</Name>
-    <Description>AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net</Description>
+    <Name>AngularJs Controller</Name>
+    <Description>AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net </Description>
     <ProjectType>CSharp</ProjectType>
     <Icon>icon.png</Icon>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/VB.vstemplate
similarity index 86%
rename from TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/VB.vstemplate
rename to TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/VB.vstemplate
index 277eee52..6ab9111f 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/VB.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/VB.vstemplate	
@@ -1,8 +1,8 @@
 <VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
   <TemplateData>
     <DefaultName>controller.js</DefaultName>
-    <Name>AngularJs Controller using 'Controller as'</Name>
-    <Description>AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net</Description>
+    <Name>AngularJs Controller</Name>
+    <Description>AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net </Description>
     <ProjectType>VisualBasic</ProjectType>
     <Icon>icon.png</Icon>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/Web.csharp.vstemplate
similarity index 87%
rename from TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/Web.csharp.vstemplate
rename to TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/Web.csharp.vstemplate
index 0f3a5cf3..ae4f3d72 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/_Definitions/Web.csharp.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/_Definitions/Web.csharp.vstemplate	
@@ -1,8 +1,8 @@
 <VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
   <TemplateData>
     <DefaultName>controller.js</DefaultName>
-    <Name>AngularJs Controller using 'Controller as'</Name>
-    <Description>AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net</Description>
+    <Name>AngularJs Controller</Name>
+    <Description>AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net </Description>
     <ProjectType>Web</ProjectType>
     <ProjectSubType>CSharp</ProjectSubType>
     <Icon>icon.png</Icon>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/controller.js b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/controller.js
similarity index 100%
rename from TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/controller.js
rename to TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/controller.js
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/icon.png b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/icon.png
similarity index 100%
rename from TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller/icon.png
rename to TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller As/icon.png
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/CSharp.vstemplate
index ceb87854..654f8fa7 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/CSharp.vstemplate	
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/CSharp.vstemplate	
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>controller.js</DefaultName>
     <Name>AngularJs Controller using $scope</Name>
-    <Description>AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net </Description>
     <ProjectType>CSharp</ProjectType>
     <Icon>icon.png</Icon>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/VB.vstemplate
index ac29bd05..7147255d 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/VB.vstemplate	
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/VB.vstemplate	
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>controller.js</DefaultName>
     <Name>AngularJs Controller using $scope</Name>
-    <Description>AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net </Description>
     <ProjectType>VisualBasic</ProjectType>
     <Icon>icon.png</Icon>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/Web.csharp.vstemplate
index 8bd3396d..25c03048 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/Web.csharp.vstemplate	
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Controller using $scope/_Definitions/Web.csharp.vstemplate	
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>controller.js</DefaultName>
     <Name>AngularJs Controller using $scope</Name>
-    <Description>AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net </Description>
     <ProjectType>Web</ProjectType>
     <ProjectSubType>CSharp</ProjectSubType>
     <Icon>icon.png</Icon>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/CSharp.vstemplate
index 9e3aabed..85c1d584 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/CSharp.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/CSharp.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>directive.js</DefaultName>
     <Name>AngularJs Directive</Name>
-    <Description>AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net </Description>
     <ProjectType>CSharp</ProjectType>
     <Icon>icon.png</Icon>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/VB.vstemplate
index 8bd43d0f..af8afd9f 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/VB.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/VB.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>directive.js</DefaultName>
     <Name>AngularJs Directive</Name>
-    <Description>AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net </Description>
     <ProjectType>VisualBasic</ProjectType>
     <Icon>icon.png</Icon>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/Web.csharp.vstemplate
index d23593d7..1f5dfcb0 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/Web.csharp.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/_Definitions/Web.csharp.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>directive.js</DefaultName>
     <Name>AngularJs Directive</Name>
-    <Description>AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net </Description>
     <ProjectType>Web</ProjectType>
     <ProjectSubType>CSharp</ProjectSubType>
     <Icon>icon.png</Icon>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/directive.js b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/directive.js
index cb9b9594..a94f6cfb 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/directive.js
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Directive/directive.js
@@ -9,7 +9,7 @@
     
     function $safeitemname$ ($window) {
         // Usage:
-        // 
+        //     <$safeitemname$></$safeitemname$>
         // Creates:
         // 
         var directive = {
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/CSharp.vstemplate
index 3d5d0035..1517f71e 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/CSharp.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/CSharp.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>factory.js</DefaultName>
     <Name>AngularJs Factory</Name>
-    <Description>AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net </Description>
     <ProjectType>CSharp</ProjectType>
     <Icon>icon.png</Icon>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/VB.vstemplate
index 98f851e5..9ccc291b 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/VB.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/VB.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>factory.js</DefaultName>
     <Name>AngularJs Factory</Name>
-    <Description>AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net </Description>
     <ProjectType>VisualBasic</ProjectType>
     <Icon>icon.png</Icon>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/Web.csharp.vstemplate
index 5d516d00..32a21e41 100644
--- a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/Web.csharp.vstemplate
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Factory/_Definitions/Web.csharp.vstemplate
@@ -2,7 +2,7 @@
   <TemplateData>
     <DefaultName>factory.js</DefaultName>
     <Name>AngularJs Factory</Name>
-    <Description>AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net</Description>
+    <Description>AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net </Description>
     <ProjectType>Web</ProjectType>
     <ProjectSubType>CSharp</ProjectSubType>
     <Icon>icon.png</Icon>
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/CSharp.vstemplate
new file mode 100644
index 00000000..2e7fd684
--- /dev/null
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/CSharp.vstemplate
@@ -0,0 +1,14 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
+  <TemplateData>
+    <DefaultName>service.js</DefaultName>
+    <Name>AngularJs Service</Name>
+    <Description>AngularJs Service: minification ready with starter dependencies. By John Papa, http://johnpapa.net </Description>
+    <ProjectType>CSharp</ProjectType>
+    <Icon>icon.png</Icon>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+    <References />
+    <ProjectItem ReplaceParameters="true">service.js</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/VB.vstemplate
new file mode 100644
index 00000000..b04b0824
--- /dev/null
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/VB.vstemplate
@@ -0,0 +1,14 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
+  <TemplateData>
+    <DefaultName>service.js</DefaultName>
+    <Name>AngularJs Service</Name>
+    <Description>AngularJs Service: minification ready with starter dependencies. By John Papa, http://johnpapa.net </Description>
+    <ProjectType>VisualBasic</ProjectType>
+    <Icon>icon.png</Icon>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+    <References />
+    <ProjectItem ReplaceParameters="true">service.js</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/Web.csharp.vstemplate
new file mode 100644
index 00000000..846388b3
--- /dev/null
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/_Definitions/Web.csharp.vstemplate
@@ -0,0 +1,15 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
+  <TemplateData>
+    <DefaultName>service.js</DefaultName>
+    <Name>AngularJs Service</Name>
+    <Description>AngularJs Service: minification ready with starter dependencies. By John Papa, http://johnpapa.net </Description>
+    <ProjectType>Web</ProjectType>
+    <ProjectSubType>CSharp</ProjectSubType>
+    <Icon>icon.png</Icon>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+    <References />
+    <ProjectItem ReplaceParameters="true">service.js</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/icon.png b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/icon.png
new file mode 100644
index 00000000..008e5f25
Binary files /dev/null and b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/icon.png differ
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/service.js b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/service.js
new file mode 100644
index 00000000..630fdb04
--- /dev/null
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Service/service.js
@@ -0,0 +1,15 @@
+(function () {
+    'use strict';
+
+    angular
+        .module('app')
+        .service('$safeitemname$', $safeitemname$);
+
+    $safeitemname$.$inject = ['$http'];
+
+    function $safeitemname$($http) {
+        this.getData = getData;
+
+        function getData() { }
+    }
+})();
\ No newline at end of file
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/CSharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/CSharp.vstemplate
new file mode 100644
index 00000000..aedbae3a
--- /dev/null
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/CSharp.vstemplate
@@ -0,0 +1,14 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
+  <TemplateData>
+    <DefaultName>spec.js</DefaultName>
+    <Name>AngularJs Test Spec</Name>
+    <Description>AngularJs Test Spec. By John Papa, http://johnpapa.net  </Description>
+    <ProjectType>CSharp</ProjectType>
+    <Icon>icon.png</Icon>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+    <References />
+    <ProjectItem ReplaceParameters="true">spec.js</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/VB.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/VB.vstemplate
new file mode 100644
index 00000000..23ff1b81
--- /dev/null
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/VB.vstemplate
@@ -0,0 +1,14 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
+  <TemplateData>
+    <DefaultName>spec.js</DefaultName>
+    <Name>AngularJs Test Spec</Name>
+    <Description>AngularJs Test Spec. By John Papa, http://johnpapa.net </Description>
+    <ProjectType>VisualBasic</ProjectType>
+    <Icon>icon.png</Icon>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+    <References />
+    <ProjectItem ReplaceParameters="true">spec.js</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/Web.csharp.vstemplate b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/Web.csharp.vstemplate
new file mode 100644
index 00000000..f0160edc
--- /dev/null
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/_Definitions/Web.csharp.vstemplate
@@ -0,0 +1,15 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Item">
+  <TemplateData>
+    <DefaultName>spec.js</DefaultName>
+    <Name>AngularJs Test Spec</Name>
+    <Description>AngularJs Test Spec. By John Papa, http://johnpapa.net </Description>
+    <ProjectType>Web</ProjectType>
+    <ProjectSubType>CSharp</ProjectSubType>
+    <Icon>icon.png</Icon>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+    <References />
+    <ProjectItem ReplaceParameters="true">spec.js</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/icon.png b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/icon.png
new file mode 100644
index 00000000..008e5f25
Binary files /dev/null and b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/icon.png differ
diff --git a/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/spec.js b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/spec.js
new file mode 100644
index 00000000..47d8a1f1
--- /dev/null
+++ b/TemplatePack/ItemTemplates/Web/JavaScript/AngularJs/Test/spec.js
@@ -0,0 +1,18 @@
+describe('$safeitemname$', function () {
+    var $controller,
+        $httpBackend,
+        $rootScope;
+
+    beforeEach(function () {
+        module('app');
+        inject(function (_$controller_, _$httpBackend_, _$rootScope_) {
+            $controller = _$controller_;
+            $httpBackend = _$httpBackend_;
+            $rootScope = _$rootScope_;
+        });
+    });
+
+    it('should exist', function () {
+        //TODO: expectation goes here
+    });
+});
diff --git a/TemplatePack/TemplatePack.csproj b/TemplatePack/TemplatePack.csproj
index ef38e313..ef6f7b88 100644
--- a/TemplatePack/TemplatePack.csproj
+++ b/TemplatePack/TemplatePack.csproj
@@ -80,6 +80,16 @@
     <Content Include="ItemTemplates\Extensibility\BrowserLink\_Definitions\CSharp.vstemplate" />
     <Content Include="ItemTemplates\Extensibility\JsonSchemaSelector\icon.png" />
     <Content Include="ItemTemplates\Extensibility\JsonSchemaSelector\_Definitions\CSharp.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Service\icon.png" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Service\service.js" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Service\_Definitions\CSharp.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Service\_Definitions\VB.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Service\_Definitions\Web.csharp.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Test\icon.png" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Test\spec.js" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Test\_Definitions\CSharp.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Test\_Definitions\VB.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Test\_Definitions\Web.csharp.vstemplate" />
     <Content Include="ItemTemplates\Web\JavaScript\Mocha\icon.png" />
     <Content Include="ItemTemplates\Web\JavaScript\Mocha\template.js" />
     <Content Include="ItemTemplates\Web\JavaScript\Mocha\_Definitions\CSharp.vstemplate">
@@ -544,11 +554,11 @@
     <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller using %24scope\_Definitions\VB.vstemplate" />
     <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller using %24scope\_Definitions\Web.csharp.vstemplate" />
     <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller using %24scope\icon.png" />
-    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller\controller.js" />
-    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller\_Definitions\CSharp.vstemplate" />
-    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller\_Definitions\VB.vstemplate" />
-    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller\_Definitions\Web.csharp.vstemplate" />
-    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller\icon.png" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller As\controller.js" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller As\_Definitions\CSharp.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller As\_Definitions\VB.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller As\_Definitions\Web.csharp.vstemplate" />
+    <Content Include="ItemTemplates\Web\JavaScript\AngularJs\Controller As\icon.png" />
     <Content Include="ItemTemplates\TypeScript\AngularJs\TypeScript Directive\_Definitions\CSharp.vstemplate" />
     <Content Include="ItemTemplates\TypeScript\AngularJs\TypeScript Directive\_Definitions\VB.vstemplate" />
     <Content Include="ItemTemplates\TypeScript\AngularJs\TypeScript Directive\_Definitions\Web.csharp.vstemplate" />
diff --git a/TemplatePack/template-report.xml b/TemplatePack/template-report.xml
index 51432f01..6e66f822 100644
--- a/TemplatePack/template-report.xml
+++ b/TemplatePack/template-report.xml
@@ -4,11 +4,13 @@
     <ItemTemplate Path="ItemTemplates\Extensibility\SideWaffle\SideWaffle-PreprocessXml\_Definitions\CSharp.vstemplate" Name="_preprocess.xml" Description="Creates a _preprocess.xml file which is used by SideWaffle/TemplateBuilder." ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Build and NuGet\NuGet\Basic .nuspec file\_Definitions\CSharp.vstemplate" Name="A basic NuGet .nuspec file" Description="A basic NuGet .nuspec file" ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Build and NuGet\NuGet\Advanced .nuspec file\_Definitions\CSharp.vstemplate" Name="An advanced NuGet .nuspec file" Description="An advanced NuGet .nuspec file" ProjectType="CSharp" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller using $scope\_Definitions\CSharp.vstemplate" Name="AngularJs Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net" ProjectType="CSharp" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller\_Definitions\CSharp.vstemplate" Name="AngularJs Controller using 'Controller as'" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net" ProjectType="CSharp" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Directive\_Definitions\CSharp.vstemplate" Name="AngularJs Directive" Description="AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net" ProjectType="CSharp" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Factory\_Definitions\CSharp.vstemplate" Name="AngularJs Factory" Description="AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net" ProjectType="CSharp" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller As\_Definitions\CSharp.vstemplate" Name="AngularJs Controller" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net " ProjectType="CSharp" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller using $scope\_Definitions\CSharp.vstemplate" Name="AngularJs Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net " ProjectType="CSharp" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Directive\_Definitions\CSharp.vstemplate" Name="AngularJs Directive" Description="AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net " ProjectType="CSharp" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Factory\_Definitions\CSharp.vstemplate" Name="AngularJs Factory" Description="AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net " ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Module\_Definitions\CSharp.vstemplate" Name="AngularJs Module" Description="AngularJs Module: ready with common modules and starter dependencies. By John Papa, http://johnpapa.net" ProjectType="CSharp" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Service\_Definitions\CSharp.vstemplate" Name="AngularJs Service" Description="AngularJs Service: minification ready with starter dependencies. By John Papa, http://johnpapa.net " ProjectType="CSharp" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Test\_Definitions\CSharp.vstemplate" Name="AngularJs Test Spec" Description="AngularJs Test Spec. By John Papa, http://johnpapa.net  " ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Controller using $scope\_Definitions\CSharp.vstemplate" Name="AngularJs TypeScript Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Controller\_Definitions\CSharp.vstemplate" Name="AngularJs TypeScript Controller using 'Controller as'" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Directive\_Definitions\CSharp.vstemplate" Name="AngularJs TypeScript Directive" Description="AngularJs Directive: minification ready and starter dependencies. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="CSharp" ProjectSubType="" />
@@ -51,7 +53,7 @@
     <ItemTemplate Path="ItemTemplates\Web\_Samples\_Sample Multi Files\_Definitions\CSharp.vstemplate" Name="Multi file template sample" Description="Adds a few different files in one item template" ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Web\Nancy\NancyBootstrapper\_Definitions\CSharp.vstemplate" Name="Nancy bootstrapper" Description="The bootstrapper enables you to reconfigure the composition of the framework, by overriding the various methods and properties." ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Web\Nancy\NancyModule\_Definitions\CSharp.vstemplate" Name="Nancy module" Description="Modules are the one thing you simply cannot avoid because they are where you define the behavior of your application. In fact declaring a single module is the bare minimum requirement for any Nancy application." ProjectType="CSharp" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\Mvc\NinjectControllerFactory\_Definitions\CSharp.vstemplate" Name="Ninect Controller Factory" Description="Adds an MVC Controller Factory class backed by a Ninject IoC container to any existing VSIX project." ProjectType="CSharp" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\Mvc\NinjectControllerFactory\_Definitions\CSharp.vstemplate" Name="Ninject Controller Factory" Description="Adds an MVC Controller Factory class backed by a Ninject IoC container to any existing VSIX project." ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Test\NUnitFixture\Definitions\CSharp.vstemplate" Name="NUnit Fixture" Description="NUnit test fixture" ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Web\Misc\AppCacheManifest\_Definitions\CSharp.vstemplate" Name="Offline Application Cache Manifest" Description="Provide offline support for your website using HTML5 App Cache." ProjectType="CSharp" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Extensibility\Package Definition\_Definitions\CSharp.vstemplate" Name="Package Definition (.pkgdef)" Description="Package Definition files lets you add registry keys to the VS hive." ProjectType="CSharp" ProjectSubType="" />
@@ -79,11 +81,13 @@
     <ItemTemplate Path="ItemTemplates\Extensibility\SideWaffle\SideWaffle-PreprocessXml\_Definitions\VB.vstemplate" Name="_preprocess.xml" Description="Creates a _preprocess.xml file which is used by SideWaffle/TemplateBuilder." ProjectType="VisualBasic" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Build and NuGet\NuGet\Advanced .nuspec file\_Definitions\VB.vstemplate" Name="A basic NuGet .nuspec file" Description="A basic NuGet .nuspec file" ProjectType="VisualBasic" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Build and NuGet\NuGet\Basic .nuspec file\_Definitions\VB.vstemplate" Name="A basic NuGet .nuspec file" Description="A basic NuGet .nuspec file" ProjectType="VisualBasic" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller using $scope\_Definitions\VB.vstemplate" Name="AngularJs Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net" ProjectType="VisualBasic" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller\_Definitions\VB.vstemplate" Name="AngularJs Controller using 'Controller as'" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net" ProjectType="VisualBasic" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Directive\_Definitions\VB.vstemplate" Name="AngularJs Directive" Description="AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net" ProjectType="VisualBasic" ProjectSubType="" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Factory\_Definitions\VB.vstemplate" Name="AngularJs Factory" Description="AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net" ProjectType="VisualBasic" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller As\_Definitions\VB.vstemplate" Name="AngularJs Controller" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net " ProjectType="VisualBasic" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller using $scope\_Definitions\VB.vstemplate" Name="AngularJs Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net " ProjectType="VisualBasic" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Directive\_Definitions\VB.vstemplate" Name="AngularJs Directive" Description="AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net " ProjectType="VisualBasic" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Factory\_Definitions\VB.vstemplate" Name="AngularJs Factory" Description="AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net " ProjectType="VisualBasic" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Module\_Definitions\VB.vstemplate" Name="AngularJs Module" Description="AngularJs Module: ready with common modules and starter dependencies. By John Papa, http://johnpapa.net" ProjectType="VisualBasic" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Service\_Definitions\VB.vstemplate" Name="AngularJs Service" Description="AngularJs Service: minification ready with starter dependencies. By John Papa, http://johnpapa.net " ProjectType="VisualBasic" ProjectSubType="" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Test\_Definitions\VB.vstemplate" Name="AngularJs Test Spec" Description="AngularJs Test Spec. By John Papa, http://johnpapa.net " ProjectType="VisualBasic" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Controller using $scope\_Definitions\VB.vstemplate" Name="AngularJs TypeScript Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="VisualBasic" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Controller\_Definitions\VB.vstemplate" Name="AngularJs TypeScript Controller using 'Controller as'" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="VisualBasic" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Directive\_Definitions\VB.vstemplate" Name="AngularJs TypeScript Directive" Description="AngularJs Directive: minification ready and starter dependencies. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="VisualBasic" ProjectSubType="" />
@@ -130,11 +134,13 @@
     <ItemTemplate Path="ItemTemplates\Web\Misc\WebVTT\_Definitions\VB.vstemplate" Name="WebVTT File" Description="A file for adding subtitles to HTML 5 video." ProjectType="VisualBasic" ProjectSubType="" />
     <ItemTemplate Path="ItemTemplates\Build and NuGet\NuGet\Advanced .nuspec file\_Definitions\Web.csharp.vstemplate" Name="A basic NuGet .nuspec file" Description="A basic NuGet .nuspec file" ProjectType="Web" ProjectSubType="CSharp" />
     <ItemTemplate Path="ItemTemplates\Build and NuGet\NuGet\Basic .nuspec file\_Definitions\Web.csharp.vstemplate" Name="A basic NuGet .nuspec file" Description="A basic NuGet .nuspec file" ProjectType="Web" ProjectSubType="CSharp" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller using $scope\_Definitions\Web.csharp.vstemplate" Name="AngularJs Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net" ProjectType="Web" ProjectSubType="CSharp" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller\_Definitions\Web.csharp.vstemplate" Name="AngularJs Controller using 'Controller as'" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net" ProjectType="Web" ProjectSubType="CSharp" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Directive\_Definitions\Web.csharp.vstemplate" Name="AngularJs Directive" Description="AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net" ProjectType="Web" ProjectSubType="CSharp" />
-    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Factory\_Definitions\Web.csharp.vstemplate" Name="AngularJs Factory" Description="AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net" ProjectType="Web" ProjectSubType="CSharp" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller As\_Definitions\Web.csharp.vstemplate" Name="AngularJs Controller" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By John Papa, http://johnpapa.net " ProjectType="Web" ProjectSubType="CSharp" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Controller using $scope\_Definitions\Web.csharp.vstemplate" Name="AngularJs Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By John Papa, http://johnpapa.net " ProjectType="Web" ProjectSubType="CSharp" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Directive\_Definitions\Web.csharp.vstemplate" Name="AngularJs Directive" Description="AngularJs Directive: minification ready and starter dependencies. By John Papa, http://johnpapa.net " ProjectType="Web" ProjectSubType="CSharp" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Factory\_Definitions\Web.csharp.vstemplate" Name="AngularJs Factory" Description="AngularJs Factory: minification ready with starter dependencies. By John Papa, http://johnpapa.net " ProjectType="Web" ProjectSubType="CSharp" />
     <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Module\_Definitions\Web.csharp.vstemplate" Name="AngularJs Module" Description="AngularJs Module: ready with common modules and starter dependencies. By John Papa, http://johnpapa.net" ProjectType="Web" ProjectSubType="CSharp" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Service\_Definitions\Web.csharp.vstemplate" Name="AngularJs Service" Description="AngularJs Service: minification ready with starter dependencies. By John Papa, http://johnpapa.net " ProjectType="Web" ProjectSubType="CSharp" />
+    <ItemTemplate Path="ItemTemplates\Web\JavaScript\AngularJs\Test\_Definitions\Web.csharp.vstemplate" Name="AngularJs Test Spec" Description="AngularJs Test Spec. By John Papa, http://johnpapa.net " ProjectType="Web" ProjectSubType="CSharp" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Controller using $scope\_Definitions\Web.csharp.vstemplate" Name="AngularJs TypeScript Controller using $scope" Description="AngularJs Controller $scope: minification ready, starter dependencies, using 'Classic' $scope syntax. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="Web" ProjectSubType="CSharp" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Controller\_Definitions\Web.csharp.vstemplate" Name="AngularJs TypeScript Controller using 'Controller as'" Description="AngularJs Controller: minification ready, starter dependencies, using 'Controller As' syntax. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="Web" ProjectSubType="CSharp" />
     <ItemTemplate Path="ItemTemplates\TypeScript\AngularJs\TypeScript Directive\_Definitions\Web.csharp.vstemplate" Name="AngularJs TypeScript Directive" Description="AngularJs Directive: minification ready and starter dependencies. By James McLachlan, http://jamesmclachlan.blogspot.ca, inspired by John Papa, http://johnpapa.net" ProjectType="Web" ProjectSubType="CSharp" />