diff --git a/karma-test-shim.js b/karma-test-shim.js
index 66768fb..d63fcb0 100644
--- a/karma-test-shim.js
+++ b/karma-test-shim.js
@@ -30,44 +30,38 @@ System.config({
 
 System.config(
 {
+  paths: {
+    // paths serve as alias
+    'npm:': 'node_modules/'
+  },
   map: {
-    'rxjs': 'node_modules/rxjs',
-    '@angular': 'node_modules/@angular',
-    'app': 'built'
+    'app': 'built',
+    '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
+    '@angular/common': 'npm:@angular/common/bundles/common.umd.js',
+    '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
+    '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
+    '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
+    '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
+    '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
+    '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
+
+    // angular testing umd bundles
+    '@angular/core/testing': 'npm:@angular/core/bundles/core-testing.umd.js',
+    '@angular/common/testing': 'npm:@angular/common/bundles/common-testing.umd.js',
+    '@angular/compiler/testing': 'npm:@angular/compiler/bundles/compiler-testing.umd.js',
+    '@angular/platform-browser/testing': 'npm:@angular/platform-browser/bundles/platform-browser-testing.umd.js',
+    '@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
+    '@angular/http/testing': 'npm:@angular/http/bundles/http-testing.umd.js',
+    '@angular/router/testing': 'npm:@angular/router/bundles/router-testing.umd.js',
+    '@angular/forms/testing': 'npm:@angular/forms/bundles/forms-testing.umd.js',
+
+    // other libraries
+    'rxjs': 'npm:rxjs',
   },
   packages: {
     'app': {
-      main: 'main.js',
-      defaultExtension: 'js'
-    },
-    '@angular/core': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/compiler': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/common': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-browser': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-browser-dynamic': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    // '@angular/router-deprecated': {
-    //   main: 'index.js',
-    //   defaultExtension: 'js'
-    // },
-    // '@angular/router': {
-    //   main: 'index.js',
-    //   defaultExtension: 'js'
-    // },
+       defaultExtension: 'js'
+     },
     'rxjs': {
       defaultExtension: 'js'
     }
diff --git a/karma.conf.js b/karma.conf.js
index 85a4da3..ba7a99b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -17,6 +17,9 @@ module.exports = function(config) {
 
       // Zone.js dependencies
       'node_modules/zone.js/dist/zone.js',
+      'node_modules/zone.js/dist/long-stack-trace-zone.js',
+      'node_modules/zone.js/dist/proxy.js',
+      'node_modules/zone.js/dist/sync-test.js',
       'node_modules/zone.js/dist/jasmine-patch.js',
       'node_modules/zone.js/dist/async-test.js',
       'node_modules/zone.js/dist/fake-async-test.js',
@@ -56,7 +59,7 @@ module.exports = function(config) {
     reporters: ['progress'],
     port: 9876,
     colors: true,
-    logLevel: config.LOG_INFO,
+    logLevel: config.DEBUG,
     autoWatch: true,
     browsers: ['Chrome'],
     singleRun: false
diff --git a/package.json b/package.json
index 6cc3cb5..fed33e8 100644
--- a/package.json
+++ b/package.json
@@ -18,26 +18,26 @@
     "test": "karma start karma.conf.js"
   },
   "dependencies": {
-    "@angular/common": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/platform-browser": "2.0.0-rc.5",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.5",
+    "@angular/common": "2.0.0-rc.6",
+    "@angular/compiler": "2.0.0-rc.6",
+    "@angular/core": "2.0.0-rc.6",
+    "@angular/platform-browser": "2.0.0-rc.6",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.6",
     "clang-format": "^1.0.35",
     "es6-promise": "^3.0.2",
     "es6-shim": "^0.35.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.6",
-    "systemjs": "0.19.26",
-    "zone.js": "0.6.12"
+    "reflect-metadata": "0.1.3",
+    "rxjs": "5.0.0-beta.11",
+    "systemjs": "0.19.37",
+    "zone.js": "0.6.17"
   },
   "devDependencies": {
     "http-server": "^0.8.5",
     "jasmine": "2.3.2",
-    "karma": "^0.13.22",
-    "karma-chrome-launcher": "^0.2.1",
-    "karma-cli": "^0.0.4",
-    "karma-jasmine": "^0.3.6",
+    "karma": "^1.2.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-cli": "^1.0.1",
+    "karma-jasmine": "^1.0.2",
     "rimraf": "^2.4.3",
     "typescript": "1.8.10",
     "typings": "^0.6.6"
diff --git a/src/app/app-component.ts b/src/app/app-component.ts
index e2fe6ff..7925426 100644
--- a/src/app/app-component.ts
+++ b/src/app/app-component.ts
@@ -1,6 +1,4 @@
 import {Component} from '@angular/core';
-import {GreetingComponent} from './greeting-component';
-import {BorderComponent} from './border-component';
 
 @Component({
   selector: 'my-app',
@@ -9,7 +7,6 @@ import {BorderComponent} from './border-component';
       <my-greeting></my-greeting>
     </my-fancy-border>
   `,
-  directives: [GreetingComponent, BorderComponent]
 })
 export class AppComponent {
 }
diff --git a/src/app/bootstrap.ts b/src/app/bootstrap.ts
index 8c8ac0d..403fb75 100644
--- a/src/app/bootstrap.ts
+++ b/src/app/bootstrap.ts
@@ -4,13 +4,13 @@ import {AppComponent} from './app-component';
 import {LoginService} from './login-service';
 import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-
-import {DeprecatedFormsModule} from '@angular/common';
+import {GreetingComponent} from './greeting-component';
+import {BorderComponent} from './border-component';
 
 @NgModule({
-  declarations: [AppComponent],
+  declarations: [AppComponent, GreetingComponent, BorderComponent],
   providers: [LoginService, UserService],
-  imports: [BrowserModule, DeprecatedFormsModule],
+  imports: [BrowserModule],
   bootstrap: [AppComponent],
 })
 export class MyAppModule{}
diff --git a/src/app/greeting-component.ts b/src/app/greeting-component.ts
index 9bd21b4..06c7a1f 100644
--- a/src/app/greeting-component.ts
+++ b/src/app/greeting-component.ts
@@ -4,8 +4,8 @@ import {UserService} from './user-service';
 @Component({
   selector: 'my-greeting',
   template: `
-    <input [(ngModel)]="user.pin" placeholder="1111" type="number"/>
-    <button (click)="enter()">Enter</button>
+    <input #pinbox placeholder="1111" type="number"/>
+    <button (click)="enter(pinbox.value)">Enter</button>
     <h3>Status: {{greeting}}</h3>
   `,
   styles :[`
@@ -20,7 +20,8 @@ export class GreetingComponent {
   constructor(public user: UserService) {
   }
 
-  enter() {
+  enter(pin: number) {
+    this.user.pin = pin;
     this.greeting = 'Processing...';
     this.pending = this.user.getGreeting().then((greeting) => {
       this.greeting = greeting;
diff --git a/src/index.html b/src/index.html
index 58caf0e..35ecacf 100644
--- a/src/index.html
+++ b/src/index.html
@@ -8,13 +8,6 @@
   <script src="../node_modules/reflect-metadata/Reflect.js"></script>
   <script src="../node_modules/zone.js/dist/zone.js"></script>
   <script src="https://code.angularjs.org/tools/system.js"></script>
-  <script src="https://code.angularjs.org/2.0.0-beta.16/Rx.js"></script>
-  <!-- <script src="../node_modules/es6-shim/es6-shim.min.js"></script>
-  <script src="../node_modules/systemjs/dist/system-polyfills.js"></script>
-
-  <script src="../node_modules/systemjs/dist/system.src.js"></script>
-
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script> -->
 
   <script>
     System.import('system-config.js').then(function () {
diff --git a/src/system-config.js b/src/system-config.js
index 9daa635..84f910d 100644
--- a/src/system-config.js
+++ b/src/system-config.js
@@ -1,31 +1,20 @@
 System.config({
+  paths: {
+    'npm:': '../node_modules/'
+  },
   map: {
-    'rxjs': '/node_modules/rxjs',
-    '@angular': '/node_modules/@angular'
+    'app': './app',
+    'rxjs': 'npm:rxjs',
+    '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
+    '@angular/common': 'npm:@angular/common/bundles/common.umd.js',
+    '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
+    '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
+    '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
+    '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
+    '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
   },
   packages: {
     'app': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/core': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/compiler': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/common': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-browser': {
-      main: 'index.js',
-      defaultExtension: 'js'
-    },
-    '@angular/platform-browser-dynamic': {
-      main: 'index.js',
       defaultExtension: 'js'
     },
     'rxjs': {
diff --git a/src/test/border-component_test.ts b/src/test/border-component_test.ts
index 03e4f2c..520fbc9 100644
--- a/src/test/border-component_test.ts
+++ b/src/test/border-component_test.ts
@@ -9,7 +9,6 @@ import { BorderComponent } from '../app/border-component';
 
 @Component({
   template: '',
-  directives: [BorderComponent]
 })
 class TestComponent {
 }
@@ -17,7 +16,7 @@ class TestComponent {
 describe('greeting component', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [TestComponent]
+      declarations: [TestComponent, BorderComponent]
     });
   });
 
diff --git a/src/test/greeting-component_test.ts b/src/test/greeting-component_test.ts
index d3bc25f..919a68f 100644
--- a/src/test/greeting-component_test.ts
+++ b/src/test/greeting-component_test.ts
@@ -6,8 +6,6 @@ import {
   ComponentFixture,
   TestBed
 } from '@angular/core/testing';
-import { DeprecatedFormsModule } from '@angular/common';
-import { provide } from '@angular/core';
 import { UserService } from '../app/user-service';
 import { LoginService } from '../app/login-service';
 import { GreetingComponent } from '../app/greeting-component';
@@ -23,10 +21,9 @@ describe('greeting component', () => {
     TestBed.configureTestingModule({
       declarations: [GreetingComponent],
       providers: [
-        provide(LoginService, { useClass: MockLoginService }),
+        {provide: LoginService, useClass: MockLoginService },
         UserService
-      ],
-      imports: [DeprecatedFormsModule]
+      ]
     });
   });
 
diff --git a/src/test/user-service_test.ts b/src/test/user-service_test.ts
index 2c10833..e6cefe2 100644
--- a/src/test/user-service_test.ts
+++ b/src/test/user-service_test.ts
@@ -1,5 +1,4 @@
 import { inject, async, TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { provide } from '@angular/core';
 import { UserService } from '../app/user-service';
 import { LoginService } from '../app/login-service';
 
@@ -50,7 +49,7 @@ class MockLoginService extends LoginService {
 describe('with mocked login', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [provide(LoginService, { useClass: MockLoginService }), UserService]
+      providers: [{provide: LoginService, useClass: MockLoginService}, UserService]
     });
   });