diff --git a/components/automate-ui/src/app/modules/infra-proxy/cookbooks/cookbooks.component.spec.ts b/components/automate-ui/src/app/modules/infra-proxy/cookbooks/cookbooks.component.spec.ts
index e47e303125aa..aa8671263406 100644
--- a/components/automate-ui/src/app/modules/infra-proxy/cookbooks/cookbooks.component.spec.ts
+++ b/components/automate-ui/src/app/modules/infra-proxy/cookbooks/cookbooks.component.spec.ts
@@ -1,4 +1,3 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { CookbooksComponent } from './cookbooks.component';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -15,6 +14,7 @@ describe('CookbooksComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
+        MockComponent({ selector: 'a', inputs: ['routerLink'] }),
         MockComponent({ selector: 'chef-th' }),
         MockComponent({ selector: 'chef-td' }),
         MockComponent({ selector: 'chef-error' }),
@@ -22,8 +22,6 @@ describe('CookbooksComponent', () => {
         MockComponent({ selector: 'chef-heading' }),
         MockComponent({ selector: 'chef-icon' }),
         MockComponent({ selector: 'chef-loading-spinner' }),
-        MockComponent({ selector: 'mat-select' }),
-        MockComponent({ selector: 'mat-option' }),
         MockComponent({ selector: 'chef-page-header' }),
         MockComponent({ selector: 'chef-subheading' }),
         MockComponent({ selector: 'chef-toolbar' }),
@@ -33,8 +31,9 @@ describe('CookbooksComponent', () => {
         MockComponent({ selector: 'chef-tr' }),
         MockComponent({ selector: 'chef-th' }),
         MockComponent({ selector: 'chef-td' }),
-        MockComponent({ selector: 'a', inputs: ['routerLink'] }),
         MockComponent({ selector: 'input', inputs: ['resetOrigin'] }),
+        MockComponent({ selector: 'mat-select' }),
+        MockComponent({ selector: 'mat-option' }),
         CookbooksComponent
       ],
       providers: [
@@ -45,8 +44,7 @@ describe('CookbooksComponent', () => {
         ReactiveFormsModule,
         RouterTestingModule,
         StoreModule.forRoot(ngrxReducers, { runtimeChecks })
-      ],
-      schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
+      ]
     })
     .compileComponents();
   }));
diff --git a/components/automate-ui/src/app/modules/infra-proxy/infra-roles/infra-roles.component.html b/components/automate-ui/src/app/modules/infra-proxy/infra-roles/infra-roles.component.html
index ce5c26ca3f67..7ec6a6442c86 100644
--- a/components/automate-ui/src/app/modules/infra-proxy/infra-roles/infra-roles.component.html
+++ b/components/automate-ui/src/app/modules/infra-proxy/infra-roles/infra-roles.component.html
@@ -14,7 +14,7 @@
           <chef-td>
             <a [routerLink]="['/infrastructure','chef-servers', serverId, 'org', orgId, 'roles', role.name]">{{ role.name }}</a>
           </chef-td>
-          <chef-td>{{ role.description == '' ?  'N/A' : role.description }}</chef-td>
+          <chef-td>{{ role.description === '' ?  'N/A' : role.description }}</chef-td>
           <chef-td>{{ role.environments.join(", ") }}</chef-td>
         </chef-tr>
       </chef-tbody>
diff --git a/components/automate-ui/src/app/modules/infra-proxy/infra-roles/infra-roles.component.spec.ts b/components/automate-ui/src/app/modules/infra-proxy/infra-roles/infra-roles.component.spec.ts
index 49549b372808..137b436e39d6 100644
--- a/components/automate-ui/src/app/modules/infra-proxy/infra-roles/infra-roles.component.spec.ts
+++ b/components/automate-ui/src/app/modules/infra-proxy/infra-roles/infra-roles.component.spec.ts
@@ -1,4 +1,3 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { InfraRolesComponent } from './infra-roles.component';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -15,11 +14,10 @@ describe('InfraRolesComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
+        MockComponent({ selector: 'a', inputs: ['routerLink'] }),
         MockComponent({ selector: 'chef-heading' }),
         MockComponent({ selector: 'chef-icon' }),
         MockComponent({ selector: 'chef-loading-spinner' }),
-        MockComponent({ selector: 'mat-select' }),
-        MockComponent({ selector: 'mat-option' }),
         MockComponent({ selector: 'chef-page-header' }),
         MockComponent({ selector: 'chef-subheading' }),
         MockComponent({ selector: 'chef-toolbar' }),
@@ -29,8 +27,9 @@ describe('InfraRolesComponent', () => {
         MockComponent({ selector: 'chef-tr' }),
         MockComponent({ selector: 'chef-th' }),
         MockComponent({ selector: 'chef-td' }),
-        MockComponent({ selector: 'a', inputs: ['routerLink'] }),
         MockComponent({ selector: 'input', inputs: ['resetOrigin'] }),
+        MockComponent({ selector: 'mat-select' }),
+        MockComponent({ selector: 'mat-option' }),
         InfraRolesComponent
       ],
       providers: [
@@ -41,8 +40,7 @@ describe('InfraRolesComponent', () => {
         ReactiveFormsModule,
         RouterTestingModule,
         StoreModule.forRoot(ngrxReducers, { runtimeChecks })
-      ],
-      schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
+      ]
     })
     .compileComponents();
   }));
diff --git a/components/automate-ui/src/app/modules/infra-proxy/org-details/org-details.component.spec.ts b/components/automate-ui/src/app/modules/infra-proxy/org-details/org-details.component.spec.ts
index ecc276a792bc..97b0888e41d5 100644
--- a/components/automate-ui/src/app/modules/infra-proxy/org-details/org-details.component.spec.ts
+++ b/components/automate-ui/src/app/modules/infra-proxy/org-details/org-details.component.spec.ts
@@ -1,4 +1,3 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async,
   ComponentFixtureAutoDetect,
   ComponentFixture,
@@ -24,11 +23,11 @@ describe('OrgDetailsComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
+        MockComponent({ selector: 'a', inputs: ['routerLink'] }),
+        MockComponent({ selector: 'app-tabs' }),
         MockComponent({ selector: 'chef-heading' }),
         MockComponent({ selector: 'chef-icon' }),
         MockComponent({ selector: 'chef-loading-spinner' }),
-        MockComponent({ selector: 'mat-select' }),
-        MockComponent({ selector: 'mat-option' }),
         MockComponent({ selector: 'chef-page-header' }),
         MockComponent({ selector: 'chef-subheading' }),
         MockComponent({ selector: 'chef-toolbar' }),
@@ -38,9 +37,9 @@ describe('OrgDetailsComponent', () => {
         MockComponent({ selector: 'chef-tr' }),
         MockComponent({ selector: 'chef-th' }),
         MockComponent({ selector: 'chef-td' }),
-        MockComponent({ selector: 'app-tabs' }),
-        MockComponent({ selector: 'a', inputs: ['routerLink'] }),
         MockComponent({ selector: 'input', inputs: ['resetOrigin'] }),
+        MockComponent({ selector: 'mat-select' }),
+        MockComponent({ selector: 'mat-option' }),
         OrgDetailsComponent
       ],
       providers: [
@@ -52,8 +51,7 @@ describe('OrgDetailsComponent', () => {
         RouterTestingModule,
         HttpClientTestingModule,
         StoreModule.forRoot(ngrxReducers, { runtimeChecks })
-      ],
-      schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
+      ]
     })
     .compileComponents();
   }));
diff --git a/components/automate-ui/src/app/modules/infra-proxy/org-edit/org-edit.component.spec.ts b/components/automate-ui/src/app/modules/infra-proxy/org-edit/org-edit.component.spec.ts
index b3e67bcd1237..9183095b5a7e 100644
--- a/components/automate-ui/src/app/modules/infra-proxy/org-edit/org-edit.component.spec.ts
+++ b/components/automate-ui/src/app/modules/infra-proxy/org-edit/org-edit.component.spec.ts
@@ -1,4 +1,3 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { OrgEditComponent } from './org-edit.component';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -15,6 +14,8 @@ describe('OrgEditComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
+        MockComponent({ selector: 'a', inputs: ['routerLink'] }),
+        MockComponent({ selector: 'chef-button', inputs: ['disabled'] }),
         MockComponent({ selector: 'chef-th' }),
         MockComponent({ selector: 'chef-td' }),
         MockComponent({ selector: 'chef-error' }),
@@ -22,8 +23,6 @@ describe('OrgEditComponent', () => {
         MockComponent({ selector: 'chef-heading' }),
         MockComponent({ selector: 'chef-icon' }),
         MockComponent({ selector: 'chef-loading-spinner' }),
-        MockComponent({ selector: 'mat-select' }),
-        MockComponent({ selector: 'mat-option' }),
         MockComponent({ selector: 'chef-page-header' }),
         MockComponent({ selector: 'chef-subheading' }),
         MockComponent({ selector: 'chef-toolbar' }),
@@ -33,8 +32,9 @@ describe('OrgEditComponent', () => {
         MockComponent({ selector: 'chef-tr' }),
         MockComponent({ selector: 'chef-th' }),
         MockComponent({ selector: 'chef-td' }),
-        MockComponent({ selector: 'a', inputs: ['routerLink'] }),
         MockComponent({ selector: 'input', inputs: ['resetOrigin'] }),
+        MockComponent({ selector: 'mat-select' }),
+        MockComponent({ selector: 'mat-option' }),
         OrgEditComponent
       ],
       providers: [
@@ -45,8 +45,7 @@ describe('OrgEditComponent', () => {
         ReactiveFormsModule,
         RouterTestingModule,
         StoreModule.forRoot(ngrxReducers, { runtimeChecks })
-      ],
-      schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
+      ]
     })
     .compileComponents();
   }));