diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 74f811fb84217979b7f4490cbf721abf19bcef7a..797af8d39201d19688467347ea6abd91e8e91b89 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -10,7 +10,7 @@ const routes: Routes = [
   {path: 'start', component: StartComponent},
   {path: 'about', component: AboutComponent},
   {path: 'check', loadChildren: './sys-check/sys-check.module#SysCheckModule'},
-  {path: 't', component: TestControllerComponent}
+  {path: 't', loadChildren: './test-controller/test-controller.module#TestControllerModule'}
 ];
 
 @NgModule({
diff --git a/src/app/app.component.html b/src/app/app.component.html
index c6ba6583cbbf4ec39b434df7ea44b4346989f45d..0be6ebdc3b59ac9c7e85651eb3189ce51cb39f72 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -4,8 +4,6 @@
   </a>
   <span>{{ title }}</span>
   <span class="itp-fill-remaining-space"></span>
-
-  <tc-menu-buttons></tc-menu-buttons>
 </mat-toolbar>
 
 <router-outlet></router-outlet>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index de1ed07fc0d008e06ffe204f31972f5e4816aeb9..dfda01744cbfe7f1830e90f07ce6c8dd0a68596f 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,7 +11,6 @@ import { MatButtonModule, MatCheckboxModule, MatMenuModule, MatTooltipModule, Ma
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 
-import { TestControllerModule } from './test-controller';
 import { IqbCommonModule } from './iqb-common';
 import { BackendService } from './backend.service';
 import { StartComponent } from './start/start.component';
@@ -46,7 +45,6 @@ import { ErrormsgComponent } from './errormsg/errormsg.component';
     FlexLayoutModule,
     ReactiveFormsModule,
     HttpClientModule,
-    TestControllerModule,
     AppRoutingModule,
     IqbCommonModule
   ],
diff --git a/src/app/test-controller/test-controller-routing.module.ts b/src/app/test-controller/test-controller-routing.module.ts
index 04356deb0ff30d91e0d480ae77500342cd564651..ca91174e3a33841e32e8a73b908d4772e0568002 100644
--- a/src/app/test-controller/test-controller-routing.module.ts
+++ b/src/app/test-controller/test-controller-routing.module.ts
@@ -8,19 +8,15 @@ import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
   {
-    path: 't',
-    component: TestControllerComponent,
-    children: [
-      {path: 'u/:u',
-        component: UnithostComponent,
-        canActivate: [UnitActivateGuard],
-         canDeactivate: [UnitDeactivateGuard]
+    path: 'u/:u',
+      component: UnithostComponent,
+      canActivate: [UnitActivateGuard],
+      canDeactivate: [UnitDeactivateGuard]
         // resolve: {
         //   unitData: UnitResolver
         // }
-      }
-    ]
-  }];
+  }
+];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/test-controller/test-controller.component.html b/src/app/test-controller/test-controller.component.html
index f0d2e2c2281ac2574d36863b3ad2d034f635901e..a30ae86acb69d7ea66b111b0527040cfdeaa2467 100644
--- a/src/app/test-controller/test-controller.component.html
+++ b/src/app/test-controller/test-controller.component.html
@@ -1,3 +1,4 @@
+<!-- <tc-menu-buttons></tc-menu-buttons> -->
 <tc-navi-buttons></tc-navi-buttons>
 <div class="spinner-container" *ngIf="dataLoading">
   <mat-spinner></mat-spinner>
diff --git a/src/app/test-controller/unithost/unithost.component.ts b/src/app/test-controller/unithost/unithost.component.ts
index 1e41a49049c36abfda1c6721165ddf4f2d1198f2..0cf55464cb694dc362b534135788b2aedc2c6fd8 100644
--- a/src/app/test-controller/unithost/unithost.component.ts
+++ b/src/app/test-controller/unithost/unithost.component.ts
@@ -81,7 +81,7 @@ export class UnithostComponent implements OnInit, OnDestroy {
 
               this.itemplayerSessionId = Math.floor(Math.random() * 20000000 + 10000000).toString();
               this.log$.next({'unitName': this.myUnitName, 'logEntry': 'start'});
-              this.postMessageTarget = m.source;
+              this.postMessageTarget = m.source as Window;
               this.postMessageTarget.postMessage({
                 type: 'OpenCBA.ToItemPlayer.DataTransfer',
                 sessionId: this.itemplayerSessionId,
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 50ce032506acf3e19931c5eb9d37c03ae74b6cbf..cebbbc75392603139c16e6fbd46f3d8b97ddc4e3 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  testcenterUrl: 'https://www.iqb-testcenter.de/',
+  testcenterUrl: 'https://itemdb2.iqb.hu-berlin.de/',
   appName: 'IQB-Testcenter',
   appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
   appVersion: '0 (dev)'