diff --git a/ui/src/app/metadata/manager/container/manager.component.spec.ts b/ui/src/app/metadata/manager/container/manager.component.spec.ts
index 1bb6488cb..7d92250bd 100644
--- a/ui/src/app/metadata/manager/container/manager.component.spec.ts
+++ b/ui/src/app/metadata/manager/container/manager.component.spec.ts
@@ -116,12 +116,12 @@ describe('Metadata Manager Page', () => {
         it('should route to the edit page', () => {
             spyOn(router, 'navigate');
             instance.edit(resolver);
-            expect(router.navigate).toHaveBeenCalledWith(['resolver', resolver.id, 'edit']);
+            expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', resolver.id, 'edit']);
         });
         it('should route to the wizard page', () => {
             spyOn(router, 'navigate');
             instance.edit(draft);
-            expect(router.navigate).toHaveBeenCalledWith(['resolver', draft.entityId, 'wizard']);
+            expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', draft.entityId, 'wizard']);
         });
     });
 
diff --git a/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts b/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
index f10a14115..9a57ad2fc 100644
--- a/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
+++ b/ui/src/app/metadata/manager/reducer/manager.reducer.spec.ts
@@ -23,7 +23,7 @@ describe('Dashboard Reducer', () => {
             const result = reducer(initialState, action);
 
             expect(result).toEqual(
-                Object.assign({}, initialState, { providersOpen: { foo: true } })
+                Object.assign({}, initialState, { resolversOpen: { foo: true } })
             );
         });
     });
diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts b/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
index 9d94ea088..0a8f01d1f 100644
--- a/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.spec.ts
@@ -7,7 +7,6 @@ import { WizardNavComponent } from './wizard-nav.component';
 import * as fromEditor from '../reducer';
 import { ProviderEditorFormModule } from '../../domain/component';
 import { DomainModule } from '../../domain/domain.module';
-import { InputDefaultsDirective } from '../../../shared/directive/input-defaults.directive';
 import { SharedModule } from '../../../shared/shared.module';
 
 @Component({
diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.ts b/ui/src/app/metadata/resolver/component/wizard-nav.component.ts
index 5131b5771..ab9dd677e 100644
--- a/ui/src/app/metadata/resolver/component/wizard-nav.component.ts
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.ts
@@ -1,9 +1,7 @@
 import { Component, Input, Output, EventEmitter, OnChanges } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-
 import { Store } from '@ngrx/store';
-
 import * as fromEditor from '../reducer';
 import { WIZARD as WizardDef, EditorFlowDefinition } from '../editor-definition.const';
 
diff --git a/ui/src/app/metadata/resolver/container/copy-provider.component.spec.ts b/ui/src/app/metadata/resolver/container/copy-provider.component.spec.ts
deleted file mode 100644
index 18d819a03..000000000
--- a/ui/src/app/metadata/resolver/container/copy-provider.component.spec.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ViewChild, Component } from '@angular/core';
-import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { ReactiveFormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import * as fromCollections from '../reducer';
-import * as fromProvider from '../reducer';
-import { CopyResolverComponent } from './copy-resolver.component';
-import { SharedModule } from '../../../shared/shared.module';
-import { NavigatorService } from '../../../core/service/navigator.service';
-import { I18nTextComponent } from '../../domain/component/i18n-text.component';
-
-@Component({
-    template: `<copy-resolver-form
-                (save)="onSave($event)"></copy-resolver-form>`
-})
-class TestHostComponent {
-    @ViewChild(CopyResolverComponent)
-    public formUnderTest: CopyResolverComponent;
-
-    onSave(event: any): void {}
-}
-
-describe('Copy Resolver Page', () => {
-    let fixture: ComponentFixture<TestHostComponent>;
-    let store: Store<fromCollections.State>;
-    let instance: CopyResolverComponent;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                NoopAnimationsModule,
-                StoreModule.forRoot({
-                    collections: combineReducers(fromCollections.reducers),
-                    resolver: combineReducers(fromProvider.reducers)
-                }),
-                ReactiveFormsModule,
-                SharedModule
-            ],
-            declarations: [
-                CopyResolverComponent,
-                I18nTextComponent,
-                TestHostComponent
-            ],
-            providers: [
-                NavigatorService
-            ]
-        });
-
-        fixture = TestBed.createComponent(TestHostComponent);
-        instance = fixture.componentInstance.formUnderTest;
-        store = TestBed.get(Store);
-        fixture.detectChanges();
-
-        spyOn(store, 'dispatch').and.callThrough();
-    });
-
-    it('should compile', () => {
-        expect(fixture).toBeDefined();
-    });
-
-    describe('next method', () => {
-        it('should dispatch an action to create a copy', () => {
-            instance.next();
-            expect(store.dispatch).toHaveBeenCalled();
-        });
-    });
-
-    describe('onChange method', () => {
-        it('should dispatch an action to update the selected sections to copy', () => {
-            instance.onChange('relyingPartyOverrides');
-            expect(store.dispatch).toHaveBeenCalled();
-            instance.onChange('relyingPartyOverrides');
-            expect(store.dispatch).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts b/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
index e85cfbe0f..ee432a7f4 100644
--- a/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.spec.ts
@@ -7,7 +7,7 @@ import * as fromResolver from '../reducer';
 import { CopyResolverComponent } from './copy-resolver.component';
 import { SharedModule } from '../../../shared/shared.module';
 import { NavigatorService } from '../../../core/service/navigator.service';
-import { I18nTextComponent } from '../../domain/component/i18n-text.component';
+import { I18nTextComponent } from '../../../shared/component/i18n-text.component';
 
 @Component({
     template: `<copy-resolver-form
@@ -37,7 +37,6 @@ describe('Copy Resolver Page', () => {
             ],
             declarations: [
                 CopyResolverComponent,
-                I18nTextComponent,
                 TestHostComponent
             ],
             providers: [
diff --git a/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts b/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts
index 4a565dcfe..ec374d4d8 100644
--- a/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/new-resolver.component.spec.ts
@@ -14,7 +14,7 @@ import { SharedModule } from '../../../shared/shared.module';
 import { NavigatorService } from '../../../core/service/navigator.service';
 import * as fromResolver from '../reducer';
 import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
-import { I18nTextComponent } from '../../domain/component/i18n-text.component';
+import { I18nTextComponent } from '../../../shared/component/i18n-text.component';
 
 describe('New Resolver Page', () => {
     let fixture: ComponentFixture<NewResolverComponent>;
@@ -36,8 +36,7 @@ describe('New Resolver Page', () => {
                 NewResolverComponent,
                 BlankResolverComponent,
                 UploadResolverComponent,
-                CopyResolverComponent,
-                I18nTextComponent
+                CopyResolverComponent
             ],
             providers: [
                 NavigatorService,