diff --git a/public/app/features/templating/constant_variable.ts b/public/app/features/templating/constant_variable.ts
index 9fe2acfdfb2..bf31dba96f9 100644
--- a/public/app/features/templating/constant_variable.ts
+++ b/public/app/features/templating/constant_variable.ts
@@ -18,7 +18,7 @@ export class ConstantVariable implements Variable {
     current: {},
   };
 
-  /** @ngInject */
+  /** @ngInject **/
   constructor(private model, private variableSrv) {
     assignModelProperties(this, model, this.defaults);
   }
diff --git a/public/app/features/templating/datasource_variable.ts b/public/app/features/templating/datasource_variable.ts
index 96776c31163..3a297002900 100644
--- a/public/app/features/templating/datasource_variable.ts
+++ b/public/app/features/templating/datasource_variable.ts
@@ -22,7 +22,7 @@ export class DatasourceVariable implements Variable {
     query: '',
   };
 
-  /** @ngInject */
+  /** @ngInject **/
   constructor(private model, private datasourceSrv, private variableSrv) {
     assignModelProperties(this, model, this.defaults);
   }
diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts
index 3c0410e1316..489625c16f8 100644
--- a/public/app/features/templating/editor_ctrl.ts
+++ b/public/app/features/templating/editor_ctrl.ts
@@ -6,7 +6,7 @@ import {variableTypes} from './variable';
 
 export class VariableEditorCtrl {
 
-  /** @ngInject */
+  /** @ngInject **/
   constructor(private $scope, private datasourceSrv, private variableSrv, templateSrv) {
     $scope.variableTypes = variableTypes;
     $scope.ctrl = {};
diff --git a/public/app/features/templating/interval_variable.ts b/public/app/features/templating/interval_variable.ts
index d53e44ae533..30b056e1c60 100644
--- a/public/app/features/templating/interval_variable.ts
+++ b/public/app/features/templating/interval_variable.ts
@@ -28,7 +28,7 @@ export class IntervalVariable implements Variable {
     auto_count: 30,
   };
 
-  /** @ngInject */
+  /** @ngInject **/
   constructor(private model, private timeSrv, private templateSrv, private variableSrv) {
     assignModelProperties(this, model, this.defaults);
     this.refresh = 2;
diff --git a/public/app/features/templating/query_variable.ts b/public/app/features/templating/query_variable.ts
index 96766d1bbfb..5ee9f0609bc 100644
--- a/public/app/features/templating/query_variable.ts
+++ b/public/app/features/templating/query_variable.ts
@@ -40,6 +40,7 @@ export class QueryVariable implements Variable {
     tagValuesQuery: null,
   };
 
+  /** @ngInject **/
   constructor(private model, private datasourceSrv, private templateSrv, private variableSrv, private $q)  {
     // copy model properties to this instance
     assignModelProperties(this, model, this.defaults);
diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js
deleted file mode 100644
index f1d5375361e..00000000000
--- a/public/test/specs/templateValuesSrv-specs.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define([
-  '../mocks/dashboard-mock',
-  './helpers',
-  'app/features/templating/templateValuesSrv'
-], function(dashboardMock, helpers) {
-  'use strict';
-
-  describe('templateValuesSrv', function() {
-    var ctx = new helpers.ServiceTestContext();
-
-    beforeEach(module('grafana.services'));
-    beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv', '$location']));
-    beforeEach(ctx.createService('templateValuesSrv'));
-
-    describe('when template variable is present in url', function() {
-      describe('and setting simple variable', function() {
-        var variable = {
-          name: 'apps',
-          current: {text: "test", value: "test"},
-          options: [{text: "test", value: "test"}]
-        };
-
-        beforeEach(function(done) {
-          var dashboard = { templating: { list: [variable] } };
-          var urlParams = {};
-          urlParams["var-apps"] = "new";
-          ctx.$location.search = sinon.stub().returns(urlParams);
-          ctx.service.init(dashboard).then(function() { done(); });
-          ctx.$rootScope.$digest();
-        });
-
-        it('should update current value', function() {
-          expect(variable.current.value).to.be("new");
-          expect(variable.current.text).to.be("new");
-        });
-      });
-
-      // describe('and setting adhoc variable', function() {
-      //   var variable = {name: 'filters', type: 'adhoc'};
-      //
-      //   beforeEach(function(done) {
-      //     var dashboard = { templating: { list: [variable] } };
-      //     var urlParams = {};
-      //     urlParams["var-filters"] = "hostname|gt|server2";
-      //     ctx.$location.search = sinon.stub().returns(urlParams);
-      //     ctx.service.init(dashboard).then(function() { done(); });
-      //     ctx.$rootScope.$digest();
-      //   });
-      //
-      //   it('should update current value', function() {
-      //     expect(variable.tags[0]).to.eq({tag: 'hostname', value: 'server2'});
-      //   });
-      // });
-    });
-
-
-  });
-});