diff --git a/src/atlasViewer/atlasViewer.apiService.service.spec.ts b/src/atlasViewer/atlasViewer.apiService.service.spec.ts
index 5260669fd60eb4e8d2bd69d9484c97239b0456b2..a2c77a18d54841ba51a0fbf8e752763317f972a5 100644
--- a/src/atlasViewer/atlasViewer.apiService.service.spec.ts
+++ b/src/atlasViewer/atlasViewer.apiService.service.spec.ts
@@ -5,7 +5,8 @@ import { defaultRootState } from "src/services/stateStore.service";
 import { AngularMaterialModule } from "src/ui/sharedModules/angularMaterial.module";
 import { HttpClientModule } from '@angular/common/http';
 import { WidgetModule } from './widgetUnit/widget.module';
-import { PluginModule } from './pluginUnit/plugin.module';
+import { HttpClientTestingModule, HttpTestingController } from "@angular/common/http/testing";
+import { PluginServices } from "./pluginUnit";
 
 describe('atlasViewer.apiService.service.ts', () => {
 
@@ -17,15 +18,17 @@ describe('atlasViewer.apiService.service.ts', () => {
     afterEach(() => {
       cancelTokenSpy.calls.reset()
       cancellableDialogSpy.calls.reset()
+
+      const ctrl = TestBed.inject(HttpTestingController)
+      ctrl.verify()
     })
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [
           AngularMaterialModule,
-          HttpClientModule,
+          HttpClientTestingModule,
           WidgetModule,
-          PluginModule,
         ],
         providers: [
           AtlasViewerAPIServices,
@@ -33,6 +36,10 @@ describe('atlasViewer.apiService.service.ts', () => {
           {
             provide: CANCELLABLE_DIALOG,
             useValue: cancellableDialogSpy
+          },
+          {
+            provide: PluginServices,
+            useValue: {}
           }
         ]
       }).compileComponents()
@@ -250,7 +257,6 @@ describe('atlasViewer.apiService.service.ts', () => {
           AngularMaterialModule,
           HttpClientModule,
           WidgetModule,
-          PluginModule,
         ],
         providers: [
           {
@@ -267,6 +273,10 @@ describe('atlasViewer.apiService.service.ts', () => {
               return mockGetMouseOverSegments
             }
           },
+          {
+            provide: PluginServices,
+            useValue: {}
+          },
           AtlasViewerAPIServices,
           provideMockStore({ initialState: defaultRootState }),
         ]
diff --git a/src/atlasViewer/pluginUnit/plugin.module.ts b/src/atlasViewer/pluginUnit/plugin.module.ts
index bfcf28aadae9aaaf49be4274156d8b6ff1058dd5..12763521faa0539bdf7eb38d7b275eba8263dcb7 100644
--- a/src/atlasViewer/pluginUnit/plugin.module.ts
+++ b/src/atlasViewer/pluginUnit/plugin.module.ts
@@ -3,6 +3,8 @@ import { PluginUnit } from "./pluginUnit.component";
 import { PluginServices, registerPluginFactoryDirectiveFactory } from "./atlasViewer.pluginService.service";
 import { PluginFactoryDirective, REGISTER_PLUGIN_FACTORY_DIRECTIVE } from "./pluginFactory.directive";
 import { LoggingModule } from "src/logging";
+import { APPEND_SCRIPT_TOKEN, appendScriptFactory, REMOVE_SCRIPT_TOKEN, removeScriptFactory } from "src/util/constants";
+import { DOCUMENT } from "@angular/common";
 
 @NgModule({
   imports:[
@@ -25,7 +27,17 @@ import { LoggingModule } from "src/logging";
       provide: REGISTER_PLUGIN_FACTORY_DIRECTIVE,
       useFactory: registerPluginFactoryDirectiveFactory,
       deps: [ PluginServices ]
-    }
+    },
+    {
+      provide: APPEND_SCRIPT_TOKEN,
+      useFactory: appendScriptFactory,
+      deps: [ DOCUMENT ]
+    },
+    {
+      provide: REMOVE_SCRIPT_TOKEN,
+      useFactory: removeScriptFactory,
+      deps: [ DOCUMENT ]
+    },
   ]
 })
 
diff --git a/src/main.module.ts b/src/main.module.ts
index d41a762e5168bd8eedc617b2dd040f0596710b05..b7716994d227ae593909b5c19ee19763bbbf3745 100644
--- a/src/main.module.ts
+++ b/src/main.module.ts
@@ -180,16 +180,6 @@ import { APPEND_SCRIPT_TOKEN, appendScriptFactory, REMOVE_SCRIPT_TOKEN, removeSc
       },
       deps: [ UIService ]
     },
-    {
-      provide: APPEND_SCRIPT_TOKEN,
-      useFactory: appendScriptFactory,
-      deps: [ DOCUMENT ]
-    },
-    {
-      provide: REMOVE_SCRIPT_TOKEN,
-      useFactory: removeScriptFactory,
-      deps: [ DOCUMENT ]
-    },
 
 
     /**
diff --git a/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.spec.ts b/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.spec.ts
index 76e62d2f97229bb56498b68ebc5f72c17beaf8ea..a85e3c733286b7fdbe2c7517fb164a9c1c93bdbc 100644
--- a/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.spec.ts
+++ b/src/ui/nehubaContainer/nehubaViewer/nehubaViewer.component.spec.ts
@@ -4,6 +4,7 @@ import { NehubaViewerUnit, IMPORT_NEHUBA_INJECT_TOKEN } from "./nehubaViewer.com
 import { importNehubaFactory } from "../util"
 import { AtlasWorkerService } from "src/atlasViewer/atlasViewer.workerService.service"
 import { LoggingModule } from "src/logging"
+import { APPEND_SCRIPT_TOKEN, appendScriptFactory } from "src/util/constants"
 
 
 describe('nehubaViewer.component,ts', () => {
@@ -21,6 +22,11 @@ describe('nehubaViewer.component,ts', () => {
           {
             provide: IMPORT_NEHUBA_INJECT_TOKEN,
             useFactory: importNehubaFactory,
+            deps: [ APPEND_SCRIPT_TOKEN ]
+          },
+          {
+            provide: APPEND_SCRIPT_TOKEN,
+            useFactory: appendScriptFactory,
             deps: [ DOCUMENT ]
           },
           AtlasWorkerService
diff --git a/src/ui/ui.module.ts b/src/ui/ui.module.ts
index 739066dfa071ae1bc79e8570d58632c91c9b0add..b58d1b66231b6966622ac15e7fd9f6227a310053 100644
--- a/src/ui/ui.module.ts
+++ b/src/ui/ui.module.ts
@@ -88,7 +88,8 @@ import { FabSpeedDialModule } from "src/components/fabSpeedDial";
 import { ActionDialog } from "./actionDialog/actionDialog.component";
 import { NehubaViewerTouchDirective } from "./nehubaContainer/nehubaViewerInterface/nehubaViewerTouch.directive";
 import { importNehubaFactory } from "./nehubaContainer/util";
-import { APPEND_SCRIPT_TOKEN } from "src/util/constants";
+import { APPEND_SCRIPT_TOKEN, appendScriptFactory } from "src/util/constants";
+import { DOCUMENT } from "@angular/common";
 
 
 @NgModule({
@@ -190,6 +191,11 @@ import { APPEND_SCRIPT_TOKEN } from "src/util/constants";
       provide: IMPORT_NEHUBA_INJECT_TOKEN,
       useFactory: importNehubaFactory,
       deps: [ APPEND_SCRIPT_TOKEN ]
+    },
+    {
+      provide: APPEND_SCRIPT_TOKEN,
+      useFactory: appendScriptFactory,
+      deps: [ DOCUMENT ]
     }
   ],
   entryComponents : [