diff --git a/packages/app/package.json b/packages/app/package.json
index cb61e1ed8c..84a8dd361c 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -8,6 +8,7 @@
     "@backstage/cli": "^0.1.1-alpha.22",
     "@backstage/core": "^0.1.1-alpha.22",
     "@backstage/plugin-api-docs": "^0.1.1-alpha.22",
+    "@backstage/plugin-asd": "^0.1.1-alpha.22",
     "@backstage/plugin-catalog": "^0.1.1-alpha.22",
     "@backstage/plugin-circleci": "^0.1.1-alpha.22",
     "@backstage/plugin-explore": "^0.1.1-alpha.22",
diff --git a/packages/app/src/plugins.ts b/packages/app/src/plugins.ts
index b36d0323e0..f7a3834bfc 100644
--- a/packages/app/src/plugins.ts
+++ b/packages/app/src/plugins.ts
@@ -33,3 +33,4 @@ export { plugin as Jenkins } from '@backstage/plugin-jenkins';
 export { plugin as ApiDocs } from '@backstage/plugin-api-docs';
 export { plugin as GithubPullRequests } from '@roadiehq/backstage-plugin-github-pull-requests';
 export { plugin as GcpProjects } from '@backstage/plugin-gcp-projects';
+export { plugin as Asd } from '@backstage/plugin-asd';
diff --git a/packages/cli/src/commands/create-plugin/createPlugin.ts b/packages/cli/src/commands/create-plugin/createPlugin.ts
index 8f75728544..b42edc99ec 100644
--- a/packages/cli/src/commands/create-plugin/createPlugin.ts
+++ b/packages/cli/src/commands/create-plugin/createPlugin.ts
@@ -176,6 +176,7 @@ export async function movePlugin(
 }
 
 export default async ({ backend }: { backend: boolean }) => {
+  console.warn(backend);
   const codeownersPath = await getCodeownersFilePath(paths.targetRoot);
 
   const questions: Question[] = [
diff --git a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
index 37759313ee..4d52fa82b5 100644
--- a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
+++ b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
@@ -1,18 +1,17 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import mockFetch from 'jest-fetch-mock';
 import ExampleComponent from './ExampleComponent';
 import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
 
 describe('ExampleComponent', () => {
   it('should render', () => {
-    mockFetch.mockResponse(() => new Promise(() => {}));
     const rendered = render(
       <ThemeProvider theme={lightTheme}>
-        <ExampleComponent />
+      <ExampleComponent />
       </ThemeProvider>,
-    );
-    expect(rendered.getByText('Welcome to {{ id }}!')).toBeInTheDocument();
+      );
+      expect(rendered.getByText('Welcome to {{ id }}!')).toBeInTheDocument();
   });
 });
+  
\ No newline at end of file
diff --git a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
index cc61c215cd..aad4fac10a 100644
--- a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
+++ b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs
@@ -1,11 +1,9 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import mockFetch from 'jest-fetch-mock';
 import ExampleFetchComponent from './ExampleFetchComponent';
 
 describe('ExampleFetchComponent', () => {
   it('should render', async () => {
-    mockFetch.mockResponse(() => new Promise(() => {}));
     const rendered = render(<ExampleFetchComponent />);
     expect(await rendered.findByTestId('progress')).toBeInTheDocument();
   });
diff --git a/packages/cli/templates/default-plugin/src/setupTests.ts b/packages/cli/templates/default-plugin/src/setupTests.ts
index 3fa8703ac4..7b0828bfa8 100644
--- a/packages/cli/templates/default-plugin/src/setupTests.ts
+++ b/packages/cli/templates/default-plugin/src/setupTests.ts
@@ -1,3 +1 @@
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();