diff --git a/.eslintrc b/.eslintrc
index ffa3fb0e977..0ba27fd484e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -129,8 +129,8 @@
             "zones": [
               {
                 "target": "./public/app/plugins",
-                "from": "./public/app",
-                "except": ["./plugins"],
+                "from": "./public",
+                "except": ["./app/plugins"],
                 "message": "Core plugins are not allowed to depend on Grafana core packages"
               }
             ]
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx
index 2aa15de1027..59dc781fb24 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx
@@ -2,7 +2,6 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { openMenu } from 'react-select-event';
 
-import { TemplateSrvStub } from '../../../../../test/specs/helpers';
 import { MetricKind, ValueTypes } from '../types/query';
 import { MetricDescriptor } from '../types/types';
 
@@ -10,8 +9,6 @@ import { Aggregation, Props } from './Aggregation';
 
 const props: Props = {
   onChange: () => {},
-  // @ts-ignore
-  templateSrv: new TemplateSrvStub(),
   metricDescriptor: {
     valueType: '',
     metricKind: '',
@@ -19,6 +16,7 @@ const props: Props = {
   crossSeriesReducer: '',
   groupBys: [],
   templateVariableOptions: [],
+  refId: 'A',
 };
 
 describe('Aggregation', () => {