diff --git a/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts b/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
index ad0b048713b..72f3ca47a13 100644
--- a/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
+++ b/public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
@@ -17,10 +17,6 @@ export class StackdriverAggregation {
 }
 
 export class StackdriverAggregationCtrl {
-  target: any;
-  alignOptions: any[];
-  aggOptions: any[];
-
   constructor(private $scope) {
     $scope.aggOptions = options.aggOptions;
     this.setAggOptions();
diff --git a/public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts b/public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
index bf32f1978cd..af8d8aee3c7 100644
--- a/public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
+++ b/public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
@@ -3,78 +3,60 @@ import { StackdriverAggregationCtrl } from '../query_aggregation_ctrl';
 describe('StackdriverAggregationCtrl', () => {
   let ctrl;
   describe('aggregation and alignment options', () => {
-    beforeEach(() => {
-      ctrl = createCtrlWithFakes();
-    });
     describe('when new query result is returned from the server', () => {
       describe('and result is double and gauge', () => {
         beforeEach(async () => {
-          ctrl.target.valueType = 'DOUBLE';
-          ctrl.target.metricKind = 'GAUGE';
+          ctrl = new StackdriverAggregationCtrl({
+            $on: () => {},
+            target: { valueType: 'DOUBLE', metricKind: 'GAUGE', aggregation: { crossSeriesReducer: '' } },
+          });
         });
 
         it('should populate all aggregate options except two', () => {
-          const result = ctrl.getAggOptions();
-          expect(result.length).toBe(11);
-          expect(result.map(o => o.value)).toEqual(
+          ctrl.setAggOptions();
+          expect(ctrl.$scope.aggOptions.length).toBe(11);
+          expect(ctrl.$scope.aggOptions.map(o => o.value)).toEqual(
             expect.not.arrayContaining(['REDUCE_COUNT_TRUE', 'REDUCE_COUNT_FALSE'])
           );
         });
 
         it('should populate all alignment options except two', () => {
-          const result = ctrl.getAlignOptions();
-          expect(result.length).toBe(10);
-          expect(result.map(o => o.value)).toEqual(
+          ctrl.setAlignOptions();
+          expect(ctrl.$scope.alignOptions.length).toBe(10);
+          expect(ctrl.$scope.alignOptions.map(o => o.value)).toEqual(
             expect.not.arrayContaining(['REDUCE_COUNT_TRUE', 'REDUCE_COUNT_FALSE'])
           );
         });
       });
     });
 
-    describe('when a user a user select ALIGN_NONE and a reducer is selected', () => {
+    describe('when a user selects ALIGN_NONE and a reducer is selected', () => {
       beforeEach(async () => {
-        ctrl.target.aggregation.crossSeriesReducer = 'RANDOM_REDUCER';
+        ctrl = new StackdriverAggregationCtrl({
+          $on: () => {},
+          refresh: () => {},
+          target: { aggregation: { crossSeriesReducer: 'RANDOM_REDUCER' } },
+        });
         ctrl.onAlignmentChange('ALIGN_NONE');
       });
       it('should set REDUCE_NONE as selected aggregation', () => {
-        expect(ctrl.target.aggregation.crossSeriesReducer).toBe('REDUCE_NONE');
+        expect(ctrl.$scope.target.aggregation.crossSeriesReducer).toBe('REDUCE_NONE');
       });
     });
 
     describe('when a user a user select a reducer and no alignment is selected', () => {
       beforeEach(async () => {
-        ctrl.target.aggregation.crossSeriesReducer = 'REDUCE_NONE';
-        ctrl.target.aggregation.perSeriesAligner = 'ALIGN_NONE';
+        ctrl = new StackdriverAggregationCtrl({
+          $on: () => {},
+          refresh: () => {},
+          target: { aggregation: { crossSeriesReducer: 'REDUCE_NONE', perSeriesAligner: 'ALIGN_NONE' } },
+        });
         ctrl.onAggregationChange('ALIGN_NONE');
       });
 
       it('should set an alignment', () => {
-        expect(ctrl.target.aggregation.perSeriesAligner).not.toBe('ALIGN_NONE');
+        expect(ctrl.$scope.target.aggregation.perSeriesAligner).not.toBe('ALIGN_NONE');
       });
     });
   });
 });
-
-function createCtrlWithFakes() {
-  StackdriverAggregationCtrl.prototype.target = createTarget();
-  return new StackdriverAggregationCtrl({ refresh: () => {} });
-}
-
-function createTarget(existingFilters?: string[]) {
-  return {
-    project: {
-      id: '',
-      name: '',
-    },
-    metricType: 'ametric',
-    refId: 'A',
-    aggregation: {
-      crossSeriesReducer: '',
-      alignmentPeriod: '',
-      perSeriesAligner: '',
-      groupBys: [],
-    },
-    filters: existingFilters || [],
-    aliasBy: '',
-  };
-}