diff --git a/client/e2e/app.po.ts b/client/e2e/app.po.ts
index 82ea75b..8226173 100644
--- a/client/e2e/app.po.ts
+++ b/client/e2e/app.po.ts
@@ -6,6 +6,6 @@ export class AppPage {
   }
 
   getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+    return element(by.css('app-root mat-toolbar span')).getText();
   }
 }
diff --git a/client/src/app/app.component.spec.ts b/client/src/app/app.component.spec.ts
index bcbdf36..6a08934 100644
--- a/client/src/app/app.component.spec.ts
+++ b/client/src/app/app.component.spec.ts
@@ -1,11 +1,17 @@
-import { TestBed, async } from '@angular/core/testing';
+import { async, TestBed } from '@angular/core/testing';
 import { AppComponent } from './app.component';
+import { MatToolbarModule } from '@angular/material';
+import { RouterTestingModule } from '@angular/router/testing';
+import { OktaAuthModule } from '@okta/okta-angular';
+
 describe('AppComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
         AppComponent
       ],
+      imports: [MatToolbarModule, RouterTestingModule,
+        OktaAuthModule.initAuth({issuer: 'foo', clientId: 'bar', redirectUri: 'baz'})]
     }).compileComponents();
   }));
   it('should create the app', async(() => {
@@ -22,6 +28,6 @@ describe('AppComponent', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
+    expect(compiled.querySelector('mat-toolbar span').textContent).toContain('Welcome to app!');
   }));
 });
diff --git a/client/src/app/car-edit/car-edit.component.spec.ts b/client/src/app/car-edit/car-edit.component.spec.ts
index 16523ee..aab28f0 100644
--- a/client/src/app/car-edit/car-edit.component.spec.ts
+++ b/client/src/app/car-edit/car-edit.component.spec.ts
@@ -1,6 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CarEditComponent } from './car-edit.component';
+import { MatCardModule, MatInputModule } from '@angular/material';
+import { RouterTestingModule } from '@angular/router/testing';
+import { FormsModule } from '@angular/forms';
+import { CarService } from '../shared/car/car.service';
+import { HttpClientModule } from '@angular/common/http';
+import { GiphyService } from '../shared/giphy/giphy.service';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('CarEditComponent', () => {
   let component: CarEditComponent;
@@ -8,9 +15,11 @@ describe('CarEditComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CarEditComponent ]
+      declarations: [CarEditComponent],
+      imports: [RouterTestingModule, MatCardModule, MatInputModule, FormsModule, HttpClientModule, NoopAnimationsModule],
+      providers: [CarService, GiphyService]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/client/src/app/car-list/car-list.component.spec.ts b/client/src/app/car-list/car-list.component.spec.ts
index 99aa318..bcfc5a7 100644
--- a/client/src/app/car-list/car-list.component.spec.ts
+++ b/client/src/app/car-list/car-list.component.spec.ts
@@ -1,6 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CarListComponent } from './car-list.component';
+import { MatCardModule, MatListModule } from '@angular/material';
+import { RouterTestingModule } from '@angular/router/testing';
+import { CarService } from '../shared/car/car.service';
+import { HttpClientModule } from '@angular/common/http';
+import { GiphyService } from '../shared/giphy/giphy.service';
 
 describe('CarListComponent', () => {
   let component: CarListComponent;
@@ -8,9 +13,11 @@ describe('CarListComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CarListComponent ]
+      declarations: [CarListComponent],
+      imports: [HttpClientModule, MatCardModule, MatListModule, RouterTestingModule],
+      providers: [CarService, GiphyService]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/client/src/app/home/home.component.spec.ts b/client/src/app/home/home.component.spec.ts
index 490e81b..1a4d347 100644
--- a/client/src/app/home/home.component.spec.ts
+++ b/client/src/app/home/home.component.spec.ts
@@ -1,16 +1,26 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { HomeComponent } from './home.component';
+import { MatCardModule } from '@angular/material';
+import { RouterTestingModule } from '@angular/router/testing';
+import { OktaAuthModule, OktaAuthService } from '@okta/okta-angular';
 
 describe('HomeComponent', () => {
   let component: HomeComponent;
   let fixture: ComponentFixture<HomeComponent>;
 
+  const config = {
+    issuer: 'https://dev-158606.oktapreview.com/oauth2/default',
+    redirectUri: 'http://localhost:4200/implicit/callback',
+    clientId: 'not-important'
+  };
+
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ HomeComponent ]
+      declarations: [HomeComponent],
+      imports: [MatCardModule, RouterTestingModule, OktaAuthModule.initAuth(config)],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/client/src/app/shared/car/car.service.spec.ts b/client/src/app/shared/car/car.service.spec.ts
index e36baff..75d0600 100644
--- a/client/src/app/shared/car/car.service.spec.ts
+++ b/client/src/app/shared/car/car.service.spec.ts
@@ -1,10 +1,13 @@
 import { TestBed, inject } from '@angular/core/testing';
 
 import { CarService } from './car.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { HttpClientModule } from '@angular/common/http';
 
 describe('CarService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
+      imports: [RouterTestingModule, HttpClientModule],
       providers: [CarService]
     });
   });