diff --git a/src/lib/flexbox/api/flex.spec.ts b/src/lib/flexbox/api/flex.spec.ts
index 07af2844b..f15710d85 100644
--- a/src/lib/flexbox/api/flex.spec.ts
+++ b/src/lib/flexbox/api/flex.spec.ts
@@ -1,6 +1,6 @@
 import {Component, OnInit, DebugElement} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {ComponentFixture, TestBed, async } from '@angular/core/testing';
+import {ComponentFixture, TestBed } from '@angular/core/testing';
 
 import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
 import {MatchMedia} from '../../media-query/match-media';
@@ -8,20 +8,15 @@ import {BreakPointsProvider} from '../../media-query/providers/break-points-prov
 import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
 import {FlexLayoutModule} from '../_module';
 
-import {customMatchers, expect} from '../../utils/testing/custom-matchers';
+import {customMatchers} from '../../utils/testing/custom-matchers';
 import {makeCreateTestComponent, makeExpectDOMFrom, makeExpectDOMForQuery} from '../../utils/testing/helpers';
 
 describe('flex directive', () => {
   let fixture: ComponentFixture<any>;
-  let createTestComponent = makeCreateTestComponent(()=> TestFlexComponent);
   let expectDOMFrom = makeExpectDOMFrom(()=> TestFlexComponent);
   let expectDomForQuery = makeExpectDOMForQuery(()=> TestFlexComponent);
-  let activateMediaQuery = (alias, allowOverlaps?:boolean) => {
-        let matchMedia : MockMatchMedia = fixture.debugElement.injector.get(MatchMedia);
-        matchMedia.activate(alias,allowOverlaps);
-      };
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     jasmine.addMatchers(customMatchers);
 
     // Configure testbed to prepare services
@@ -33,7 +28,7 @@ describe('flex directive', () => {
         {provide: MatchMedia, useClass: MockMatchMedia}
       ]
     })
-  }));
+  });
   afterEach(() => {
     if ( fixture ) {
       fixture.debugElement.injector.get(MatchMedia).clearAll();
diff --git a/src/lib/flexbox/api/hide.spec.ts b/src/lib/flexbox/api/hide.spec.ts
index b2bf392e6..24062667e 100644
--- a/src/lib/flexbox/api/hide.spec.ts
+++ b/src/lib/flexbox/api/hide.spec.ts
@@ -1,6 +1,6 @@
-import {Component, OnInit, DebugElement} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {ComponentFixture, TestBed, async } from '@angular/core/testing';
+import {ComponentFixture, TestBed } from '@angular/core/testing';
 
 import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
 import {MatchMedia} from '../../media-query/match-media';
@@ -8,8 +8,8 @@ import {BreakPointsProvider} from '../../media-query/providers/break-points-prov
 import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
 import {FlexLayoutModule} from '../_module';
 
-import {customMatchers, expect} from '../../utils/testing/custom-matchers';
-import {makeCreateTestComponent, makeExpectDOMFrom, expectNativeEl} from '../../utils/testing/helpers';
+import {customMatchers} from '../../utils/testing/custom-matchers';
+import {makeCreateTestComponent, expectNativeEl} from '../../utils/testing/helpers';
 
 describe('show directive', () => {
   let fixture: ComponentFixture<any>;
@@ -19,7 +19,7 @@ describe('show directive', () => {
         matchMedia.activate(alias);
       };
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     jasmine.addMatchers(customMatchers);
 
     // Configure testbed to prepare services
@@ -31,7 +31,7 @@ describe('show directive', () => {
         {provide: MatchMedia, useClass: MockMatchMedia}
       ]
     })
-  }));
+  });
   afterEach(() => {
     if ( fixture ) {
       fixture.debugElement.injector.get(MatchMedia).clearAll();
diff --git a/src/lib/flexbox/api/layout-align.spec.ts b/src/lib/flexbox/api/layout-align.spec.ts
index ee04631d7..111335a45 100644
--- a/src/lib/flexbox/api/layout-align.spec.ts
+++ b/src/lib/flexbox/api/layout-align.spec.ts
@@ -1,6 +1,6 @@
 import {Component, OnInit} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {ComponentFixture, TestBed, async } from '@angular/core/testing';
+import {ComponentFixture, TestBed } from '@angular/core/testing';
 
 import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
 import {MatchMedia} from '../../media-query/match-media';
@@ -17,7 +17,7 @@ describe('layout-align directive', () => {
   let createTestComponent = makeCreateTestComponent(()=> TestLayoutAlignComponent);
   let expectDOMFrom = makeExpectDOMFrom(()=> TestLayoutAlignComponent);
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     jasmine.addMatchers(customMatchers);
 
     // Configure testbed to prepare services
@@ -29,7 +29,7 @@ describe('layout-align directive', () => {
         {provide: MatchMedia, useClass: MockMatchMedia}
       ]
     })
-  }));
+  });
   afterEach(() => {
     if ( fixture ) {
       fixture.debugElement.injector.get(MatchMedia).clearAll();
diff --git a/src/lib/flexbox/api/layout.spec.ts b/src/lib/flexbox/api/layout.spec.ts
index 77889f07f..aedb78a1a 100644
--- a/src/lib/flexbox/api/layout.spec.ts
+++ b/src/lib/flexbox/api/layout.spec.ts
@@ -1,6 +1,6 @@
 import {Component, OnInit} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {ComponentFixture, TestBed, async } from '@angular/core/testing';
+import {ComponentFixture, TestBed } from '@angular/core/testing';
 
 import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
 import {MatchMedia} from '../../media-query/match-media';
@@ -20,7 +20,7 @@ describe('layout directive', () => {
         matchMedia.activate(alias,allowOverlaps);
       };
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     jasmine.addMatchers(customMatchers);
 
     // Configure testbed to prepare services
@@ -32,7 +32,7 @@ describe('layout directive', () => {
         {provide: MatchMedia, useClass: MockMatchMedia}
       ]
     })
-  }));
+  });
   afterEach(() => {
     if ( fixture ) {
       fixture.debugElement.injector.get(MatchMedia).clearAll();
diff --git a/src/lib/flexbox/api/show.spec.ts b/src/lib/flexbox/api/show.spec.ts
index eb0966a79..03a62601b 100644
--- a/src/lib/flexbox/api/show.spec.ts
+++ b/src/lib/flexbox/api/show.spec.ts
@@ -1,6 +1,6 @@
-import {Component, OnInit, DebugElement} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {ComponentFixture, TestBed, async } from '@angular/core/testing';
+import {ComponentFixture, TestBed } from '@angular/core/testing';
 
 import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
 import {MatchMedia} from '../../media-query/match-media';
@@ -8,8 +8,8 @@ import {BreakPointsProvider} from '../../media-query/providers/break-points-prov
 import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
 import {FlexLayoutModule} from '../_module';
 
-import {customMatchers, expect} from '../../utils/testing/custom-matchers';
-import {makeCreateTestComponent, makeExpectDOMFrom, expectNativeEl} from '../../utils/testing/helpers';
+import {customMatchers} from '../../utils/testing/custom-matchers';
+import {makeCreateTestComponent, expectNativeEl} from '../../utils/testing/helpers';
 
 describe('show directive', () => {
   let fixture: ComponentFixture<any>;
@@ -19,7 +19,7 @@ describe('show directive', () => {
         matchMedia.activate(alias, enableOverlaps);
       };
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     jasmine.addMatchers(customMatchers);
 
     // Configure testbed to prepare services
@@ -31,7 +31,7 @@ describe('show directive', () => {
         {provide: MatchMedia, useClass: MockMatchMedia}
       ]
     })
-  }));
+  });
   afterEach(() => {
     if ( fixture ) {
       fixture.debugElement.injector.get(MatchMedia).clearAll();
diff --git a/src/lib/flexbox/responsive/responsive-activation.spec.ts b/src/lib/flexbox/responsive/responsive-activation.spec.ts
index 264aea2a3..4bc5b5840 100644
--- a/src/lib/flexbox/responsive/responsive-activation.spec.ts
+++ b/src/lib/flexbox/responsive/responsive-activation.spec.ts
@@ -4,7 +4,7 @@ import 'rxjs/add/operator/filter';
 import 'rxjs/add/operator/map';
 import {Observable} from 'rxjs/Observable';
 
-import { TestBed, inject, async } from '@angular/core/testing';
+import { TestBed, inject } from '@angular/core/testing';
 
 import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
 import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
@@ -46,14 +46,14 @@ describe('responsive-activation', () => {
   });
 
   // Single async inject to save references; which are used in all tests below
-  beforeEach( async(inject(
+  beforeEach(inject(
     [ BreakPointRegistry, MatchMedia, MediaMonitor ],
     (_breakPoints_, _matchMedia_, _mediaMonitor_) => {
       breakPoints = _breakPoints_;    // Only used to look up mediaQuery by aliases
       matchMedia = _matchMedia_;      // Only used to manual/simulate activate a mediaQuery
       monitor = _mediaMonitor_;
     }
-  )));
+  ));
 
   it('does not report mediaQuery changes for static usages', () => {
       let value;