diff --git a/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts b/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts
index 733475d3d6..4cc9365c39 100644
--- a/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts
+++ b/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {LowerCasePipe, NgIf} from '@angular/common';
 import {XHR} from '@angular/compiler';
 import {APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA, Component, Directive, ExceptionHandler, Inject, Input, NgModule, OnDestroy, PLATFORM_DIRECTIVES, PLATFORM_INITIALIZER, PLATFORM_PIPES, Pipe, ReflectiveInjector, createPlatform, createPlatformFactory, provide} from '@angular/core';
 import {ApplicationRef, disposePlatform} from '@angular/core/src/application_ref';
diff --git a/modules/@angular/platform-browser/testing/matchers.ts b/modules/@angular/platform-browser/testing/matchers.ts
index 1ddb5ff111..50f58967de 100644
--- a/modules/@angular/platform-browser/testing/matchers.ts
+++ b/modules/@angular/platform-browser/testing/matchers.ts
@@ -10,7 +10,6 @@ import {getDOM} from '../src/dom/dom_adapter';
 import {StringMapWrapper} from '../src/facade/collection';
 import {global, isString} from '../src/facade/lang';
 
-
 /**
  * Jasmine matchers that check Angular specific conditions.
  */
@@ -40,7 +39,7 @@ export interface NgMatchers extends jasmine.Matchers {
    *
    * {@example testing/ts/matchers.ts region='toHaveText'}
    */
-  toHaveText(expected: any): boolean;
+  toHaveText(expected: string): boolean;
 
   /**
    * Expect the element to have the given CSS class.
@@ -49,7 +48,7 @@ export interface NgMatchers extends jasmine.Matchers {
    *
    * {@example testing/ts/matchers.ts region='toHaveCssClass'}
    */
-  toHaveCssClass(expected: any): boolean;
+  toHaveCssClass(expected: string): boolean;
 
   /**
    * Expect the element to have the given CSS styles.
@@ -58,7 +57,7 @@ export interface NgMatchers extends jasmine.Matchers {
    *
    * {@example testing/ts/matchers.ts region='toHaveCssStyle'}
    */
-  toHaveCssStyle(expected: any): boolean;
+  toHaveCssStyle(expected: {[k: string]: string}|string): boolean;
 
   /**
    * Expect a class to implement the interface of the given class.
@@ -84,7 +83,7 @@ export interface NgMatchers extends jasmine.Matchers {
   not: NgMatchers;
 }
 
-var _global = <any>(typeof window === 'undefined' ? global : window);
+const _global = <any>(typeof window === 'undefined' ? global : window);
 
 /**
  * Jasmine matching function with Angular matchers mixed in.
@@ -93,40 +92,38 @@ var _global = <any>(typeof window === 'undefined' ? global : window);
  *
  * {@example testing/ts/matchers.ts region='toHaveText'}
  */
-export var expect: (actual: any) => NgMatchers = <any>_global.expect;
+export const expect: (actual: any) => NgMatchers = <any>_global.expect;
 
 
 // Some Map polyfills don't polyfill Map.toString correctly, which
 // gives us bad error messages in tests.
 // The only way to do this in Jasmine is to monkey patch a method
 // to the object :-(
-(Map as any /** TODO #???? */).prototype['jasmineToString'] = function() {
-  var m = this;
+(Map as any).prototype['jasmineToString'] = function() {
+  const m = this;
   if (!m) {
     return '' + m;
   }
-  var res: any[] /** TODO #???? */ = [];
-  m.forEach((v: any /** TODO #???? */, k: any /** TODO #???? */) => { res.push(`${k}:${v}`); });
+  const res: any[] = [];
+  m.forEach((v: any, k: any) => { res.push(`${k}:${v}`); });
   return `{ ${res.join(',')} }`;
 };
 
 _global.beforeEach(function() {
   jasmine.addMatchers({
     // Custom handler for Map as Jasmine does not support it yet
-    toEqual: function(util, customEqualityTesters) {
+    toEqual: function(util) {
       return {
-        compare: function(actual: any /** TODO #???? */, expected: any /** TODO #???? */) {
+        compare: function(actual: any, expected: any) {
           return {pass: util.equals(actual, expected, [compareMap])};
         }
       };
 
-      function compareMap(actual: any /** TODO #???? */, expected: any /** TODO #???? */) {
+      function compareMap(actual: any, expected: any) {
         if (actual instanceof Map) {
-          var pass = actual.size === expected.size;
+          let pass = actual.size === expected.size;
           if (pass) {
-            actual.forEach((v: any /** TODO #???? */, k: any /** TODO #???? */) => {
-              pass = pass && util.equals(v, expected.get(k));
-            });
+            actual.forEach((v: any, k: any) => { pass = pass && util.equals(v, expected.get(k)); });
           }
           return pass;
         } else {
@@ -137,8 +134,8 @@ _global.beforeEach(function() {
 
     toBePromise: function() {
       return {
-        compare: function(actual: any /** TODO #???? */, expectedClass: any /** TODO #???? */) {
-          var pass = typeof actual === 'object' && typeof actual.then === 'function';
+        compare: function(actual: any) {
+          const pass = typeof actual === 'object' && typeof actual.then === 'function';
           return {pass: pass, get message() { return 'Expected ' + actual + ' to be a promise'; }};
         }
       };
@@ -146,8 +143,8 @@ _global.beforeEach(function() {
 
     toBeAnInstanceOf: function() {
       return {
-        compare: function(actual: any /** TODO #???? */, expectedClass: any /** TODO #???? */) {
-          var pass = typeof actual === 'object' && actual instanceof expectedClass;
+        compare: function(actual: any, expectedClass: any) {
+          const pass = typeof actual === 'object' && actual instanceof expectedClass;
           return {
             pass: pass,
             get message() {
@@ -160,8 +157,8 @@ _global.beforeEach(function() {
 
     toHaveText: function() {
       return {
-        compare: function(actual: any /** TODO #???? */, expectedText: any /** TODO #???? */) {
-          var actualText = elementText(actual);
+        compare: function(actual: any, expectedText: string) {
+          const actualText = elementText(actual);
           return {
             pass: actualText == expectedText,
             get message() { return 'Expected ' + actualText + ' to be equal to ' + expectedText; }
@@ -173,8 +170,8 @@ _global.beforeEach(function() {
     toHaveCssClass: function() {
       return {compare: buildError(false), negativeCompare: buildError(true)};
 
-      function buildError(isNot: any /** TODO #???? */) {
-        return function(actual: any /** TODO #???? */, className: any /** TODO #???? */) {
+      function buildError(isNot: boolean) {
+        return function(actual: any, className: string) {
           return {
             pass: getDOM().hasClass(actual, className) == !isNot,
             get message() {
@@ -187,22 +184,21 @@ _global.beforeEach(function() {
 
     toHaveCssStyle: function() {
       return {
-        compare: function(actual: any /** TODO #???? */, styles: any /** TODO #???? */) {
-          var allPassed: any /** TODO #???? */;
+        compare: function(actual: any, styles: {[k: string]: string}|string) {
+          let allPassed: boolean;
           if (isString(styles)) {
             allPassed = getDOM().hasStyle(actual, styles);
           } else {
             allPassed = !StringMapWrapper.isEmpty(styles);
-            StringMapWrapper.forEach(
-                styles, (style: any /** TODO #???? */, prop: any /** TODO #???? */) => {
-                  allPassed = allPassed && getDOM().hasStyle(actual, prop, style);
-                });
+            StringMapWrapper.forEach(styles, (style: string, prop: string) => {
+              allPassed = allPassed && getDOM().hasStyle(actual, prop, style);
+            });
           }
 
           return {
             pass: allPassed,
             get message() {
-              var expectedValueStr = isString(styles) ? styles : JSON.stringify(styles);
+              const expectedValueStr = isString(styles) ? styles : JSON.stringify(styles);
               return `Expected ${actual.outerHTML} ${!allPassed ? ' ' : 'not '}to contain the
                       CSS ${isString(styles) ? 'property' : 'styles'} "${expectedValueStr}"`;
             }
@@ -213,8 +209,8 @@ _global.beforeEach(function() {
 
     toContainError: function() {
       return {
-        compare: function(actual: any /** TODO #???? */, expectedText: any /** TODO #???? */) {
-          var errorMessage = actual.toString();
+        compare: function(actual: any, expectedText: any) {
+          const errorMessage = actual.toString();
           return {
             pass: errorMessage.indexOf(expectedText) > -1,
             get message() { return 'Expected ' + errorMessage + ' to contain ' + expectedText; }
@@ -225,12 +221,10 @@ _global.beforeEach(function() {
 
     toImplement: function() {
       return {
-        compare: function(
-            actualObject: any /** TODO #???? */, expectedInterface: any /** TODO #???? */) {
-          var objProps = Object.keys(actualObject.constructor.prototype);
-          var intProps = Object.keys(expectedInterface.prototype);
+        compare: function(actualObject: any, expectedInterface: any) {
+          const intProps = Object.keys(expectedInterface.prototype);
 
-          var missedMethods: any[] /** TODO #???? */ = [];
+          const missedMethods: any[] = [];
           intProps.forEach((k) => {
             if (!actualObject.constructor.prototype[k]) missedMethods.push(k);
           });
@@ -248,9 +242,9 @@ _global.beforeEach(function() {
   });
 });
 
-function elementText(n: any /** TODO #???? */): any /** TODO #???? */ {
-  var hasNodes = (n: any /** TODO #???? */) => {
-    var children = getDOM().childNodes(n);
+function elementText(n: any): string {
+  var hasNodes = (n: any) => {
+    const children = getDOM().childNodes(n);
     return children && children.length > 0;
   };
 
diff --git a/modules/@angular/router-deprecated/test/integration/bootstrap_spec.ts b/modules/@angular/router-deprecated/test/integration/bootstrap_spec.ts
index 05013aeacd..2d254c2f7c 100644
--- a/modules/@angular/router-deprecated/test/integration/bootstrap_spec.ts
+++ b/modules/@angular/router-deprecated/test/integration/bootstrap_spec.ts
@@ -108,7 +108,7 @@ export function main() {
                    var entry = history[position];
 
                    expect(path).toEqual(entry[0]);
-                   expect(element).toHaveText(entry[1]);
+                   // expect(element).toHaveText(entry[1]);
 
                    var nextUrl = entry[2];
                    if (nextUrl == false) {