diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts
index 031590c71..fe26d72d3 100644
--- a/ng-sample/app/app.ts
+++ b/ng-sample/app/app.ts
@@ -23,7 +23,7 @@ import {ListTestAsync} from "./examples/list/list-test-async";
 import {ImageTest} from "./examples/image/image-test";
 import {NavigationTest} from "./examples/navigation/navigation-test";
 import {ActionBarTest} from "./examples/action-bar/action-bar-test";
-
+import {ModalTest} from "./examples/modal/modal-test";
 
 nativeScriptBootstrap(RendererTest);
 //nativeScriptBootstrap(Benchmark);
@@ -35,3 +35,4 @@ nativeScriptBootstrap(RendererTest);
 //nativeScriptBootstrap(ImageTest);
 //nativeScriptBootstrap(NavigationTest, [NS_ROUTER_PROVIDERS]);
 //nativeScriptBootstrap(ActionBarTest, [NS_ROUTER_PROVIDERS], { startPageActionBarHidden: false });
+// nativeScriptBootstrap(ModalTest);
diff --git a/ng-sample/app/examples/action-bar/action-bar-test.ts b/ng-sample/app/examples/action-bar/action-bar-test.ts
index f35fe62e5..493416e94 100644
--- a/ng-sample/app/examples/action-bar/action-bar-test.ts
+++ b/ng-sample/app/examples/action-bar/action-bar-test.ts
@@ -31,7 +31,7 @@ class FirstComponent {
 
 
 @Component({
-    selector: "nested-componenet",
+    selector: "nested-component",
     directives: [NS_ROUTER_DIRECTIVES, NS_DIRECTIVES],
     template: `
 
@@ -65,7 +65,7 @@ class NestedComponent {
 
     <StackLayout verticalAlignment="center">
         <Label text="Second Page is Here" class="title"></Label>
-        <nested-componenet></nested-componenet>
+        <nested-component></nested-component>
     </StackLayout>
     `,
 })
diff --git a/ng-sample/app/examples/modal/modal-content.ts b/ng-sample/app/examples/modal/modal-content.ts
new file mode 100644
index 000000000..132a422b5
--- /dev/null
+++ b/ng-sample/app/examples/modal/modal-content.ts
@@ -0,0 +1,35 @@
+import {Component} from 'angular2/core';
+import {ModalDialogParams} from "../../nativescript-angular/directives/dialogs";
+
+@Component({
+    selector: 'modal-content',
+    template: `
+    <StackLayout margin="24" horizontalAlignment="center" verticalAlignment="center">
+        <Label [text]="prompt"></Label>
+        <StackLayout orientation="horizontal" marginTop="12">
+            <Button text="ok" (tap)="close('OK')"></Button>
+            <Button text="cancel" (tap)="close('Cancel')"></Button>
+        </StackLayout>
+    </StackLayout>
+    `
+})
+export class ModalContent {
+    public prompt: string;
+    constructor(private params: ModalDialogParams) {
+        console.log("ModalContent.constructor: " + JSON.stringify(params))
+        this.prompt = params.context.promptMsg;
+    }
+
+    public close(res: string) {
+        this.params.closeCallback(res);
+    }
+
+    ngOnInit() {
+        console.log("ModalContent.ngOnInit");
+
+    }
+
+    ngOnDestroy() {
+        console.log("ModalContent.ngOnDestroy");
+    }
+}
\ No newline at end of file
diff --git a/ng-sample/app/examples/modal/modal-test.ts b/ng-sample/app/examples/modal/modal-test.ts
new file mode 100644
index 000000000..c174c1bc3
--- /dev/null
+++ b/ng-sample/app/examples/modal/modal-test.ts
@@ -0,0 +1,104 @@
+import {Component} from 'angular2/core';
+import * as dialogs from "ui/dialogs";
+import {ModalDialogService, ModalDialogOptions, ModalDialogHost} from "../../nativescript-angular/directives/dialogs";
+import {ModalContent} from "./modal-content";
+
+@Component({
+    selector: 'modal-test',
+    directives: [ModalDialogHost],
+    providers: [ModalDialogService],
+    template: `
+    <GridLayout rows="*, auto" modal-dialog-host>
+        <StackLayout verticalAlignment="top" margin="12">
+            <Button text="show component" (tap)="showModal(false)"></Button>
+            <Button text="show component fullscreen" (tap)="showModal(true)"></Button>
+            
+            <Button text="alert" (tap)="showAlert()"></Button>
+            <Button text="confirm" (tap)="showConfirm()"></Button>
+            <Button text="prompt" (tap)="showPrompt()"></Button>
+            
+            <Button text="action" (tap)="showAction()"></Button>
+            <Button text="login" (tap)="showLogin()"></Button>
+        </StackLayout>
+        
+        <Label [text]="'RESULT: ' + result" row="1" margin="12"></Label>
+    </GridLayout>
+    `
+})
+export class ModalTest {
+    public result: string = "result";
+
+    constructor(private modal: ModalDialogService) {
+    }
+
+    public showModal(fullscreen: boolean) {
+        var options: ModalDialogOptions = {
+            context: { promptMsg: "This is the prompt message!" },
+            fullscreen: fullscreen
+        };
+
+        this.modal.showModal(ModalContent, options).then((res: string) => {
+            this.result = res || "empty result";
+        })
+    }
+
+    public showAlert() {
+        dialogs.alert({
+            title: "Alert Title",
+            message: "The name will change.",
+            okButtonText: "OK"
+        }).then(() => {
+            this.result = "alert closed";
+        });
+    }
+
+    public showConfirm() {
+        dialogs.confirm({
+            title: "Name",
+            message: "Do you want to change the name?",
+            cancelButtonText: "No",
+            neutralButtonText: "Ignore",
+            okButtonText: "Yes"
+        }).then((confirmResult) => {
+            this.result = confirmResult + "";
+        });
+    }
+
+    public showPrompt() {
+        dialogs.prompt({
+            title: "Name",
+            message: "Enter name:",
+            cancelButtonText: "Cancel",
+            neutralButtonText: "Ignore",
+            okButtonText: "OK",
+            defaultText: "John Reese",
+            inputType: dialogs.inputType.text
+        }).then((promptResult) => {
+            this.result = promptResult.result ? promptResult.text : "no result";
+        });
+    }
+
+    public showAction() {
+        dialogs.action({
+            message: "Choose action:",
+            cancelButtonText: "Close",
+            actions: ["Foo", "Bar"]
+        }).then((actionResult) => {
+            this.result = actionResult;
+        });
+    }
+
+    public showLogin() {
+        dialogs.login({
+            title: "Name",
+            message: "Enter name:",
+            cancelButtonText: "Cancel",
+            neutralButtonText: "Ignore",
+            okButtonText: "OK",
+            userName: "John",
+            password: "Reese"
+        }).then((loginResult) => {
+            this.result = loginResult.result ? ("user: " + loginResult.userName + " pass: " + loginResult.password) : "no result";
+        });
+    }
+}
diff --git a/ng-sample/app/examples/navigation/nav-component.ts b/ng-sample/app/examples/navigation/nav-component.ts
index 115b941cb..10f94a9ae 100644
--- a/ng-sample/app/examples/navigation/nav-component.ts
+++ b/ng-sample/app/examples/navigation/nav-component.ts
@@ -73,7 +73,7 @@ class DetailComponent {
     directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES],
     template: `
 <GridLayout rows="auto, auto, auto, *" columns="*, *" margin="10" backgroundColor="lightgreen">
-    <Label [text]="'Componenet ID: ' + compId" colSpan="2" row="0"
+    <Label [text]="'Component ID: ' + compId" colSpan="2" row="0"
         style="font-size: 30; horizontal-align: center"></Label>
         
     <Label [text]="'Depth: ' + depth" colSpan="2" row="1"
@@ -108,7 +108,7 @@ export class NavComponent implements OnActivate, OnDeactivate {
         this.compId = NavComponent.counter;
         this.depth = parseInt(params.get("depth"));
 
-        console.log("NavComponent.constructor() componenetID: " + this.compId)
+        console.log("NavComponent.constructor() componentID: " + this.compId)
     }
 
     public goBack() {
@@ -116,21 +116,21 @@ export class NavComponent implements OnActivate, OnDeactivate {
     }
 
     routerOnActivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any {
-        console.log("NavComponent.routerOnActivate() componenetID: " + this.compId)
+        console.log("NavComponent.routerOnActivate() componentID: " + this.compId)
     }
 
     routerOnDeactivate(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any {
-        console.log("NavComponent.routerOnDeactivate() componenetID: " + this.compId)
+        console.log("NavComponent.routerOnDeactivate() componentID: " + this.compId)
     }
 
     routerCanReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any {
         // Reuse if depth is the same.
         var reuse = (prevInstruction.params["depth"] === nextInstruction.params["depth"]);
-        console.log("NavComponent.routerCanReuse() componenetID: " + this.compId + " return: " + reuse);
+        console.log("NavComponent.routerCanReuse() componentID: " + this.compId + " return: " + reuse);
         return reuse;
     }
 
     routerOnReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any {
-        console.log("NavComponent.routerOnReuse() componenetID: " + this.compId);
+        console.log("NavComponent.routerOnReuse() componentID: " + this.compId);
     }
 }
\ No newline at end of file
diff --git a/ng-sample/package.json b/ng-sample/package.json
index d9d069d78..b16240321 100644
--- a/ng-sample/package.json
+++ b/ng-sample/package.json
@@ -23,7 +23,7 @@
 	},
 	"homepage": "https://github.com/NativeScript/template-hello-world",
 	"dependencies": {
-		"tns-core-modules": "^2.0.0-angular-0",
+		"tns-core-modules": "^2.0.0-angular-1",
 		"angular2": "2.0.0-beta.9",
 		"parse5": "1.4.2",
 		"punycode": "1.3.2",
diff --git a/package.json b/package.json
index 9a940d0a9..15dc05a0f 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   },
   "scripts": {},
   "dependencies": {
-      "tns-core-modules": "^2.0.0-angular-0",
+      "tns-core-modules": "^2.0.0-angular-1",
       "angular2": "2.0.0-beta.9",
       "es6-shim": "^0.33.3",
       "parse5": "1.4.2",
diff --git a/src/nativescript-angular/common/detached-loader.ts b/src/nativescript-angular/common/detached-loader.ts
new file mode 100644
index 000000000..1db287389
--- /dev/null
+++ b/src/nativescript-angular/common/detached-loader.ts
@@ -0,0 +1,21 @@
+import {DynamicComponentLoader, ComponentRef, ElementRef, Component, Type} from 'angular2/core';
+
+/**
+ * Wrapper component used for loading compnenets when navigating
+ * It uses DetachedContainer as selector so that it is elementRef is not attached to the visual tree.
+ */
+@Component({
+    selector: 'DetachedContainer', 
+    template: `<Placeholder #loader></Placeholder>`
+})
+export class DetachedLoader {
+    constructor(
+        private element: ElementRef,
+        private loader: DynamicComponentLoader
+    ) {
+    }
+
+    public loadComponent(componentType: Type): Promise<ComponentRef> {
+        return this.loader.loadIntoLocation(componentType, this.element, 'loader');
+    }
+}
\ No newline at end of file
diff --git a/src/nativescript-angular/directives/dialogs.ts b/src/nativescript-angular/directives/dialogs.ts
new file mode 100644
index 000000000..9ab1101d1
--- /dev/null
+++ b/src/nativescript-angular/directives/dialogs.ts
@@ -0,0 +1,77 @@
+import {DynamicComponentLoader, ElementRef, Injector, provide, Type, Injectable, ComponentRef, Directive} from 'angular2/core';
+import {Page} from 'ui/page';
+import {View} from 'ui/core/view';
+import {DetachedLoader} from '../common/detached-loader';
+
+export interface ModalDialogOptions {
+    context?: any;
+    fullscreen?: boolean;
+}
+
+export class ModalDialogParams {
+    constructor(
+        public context: any = {},
+        public closeCallback: (...args) => any) {
+    }
+}
+
+@Injectable()
+export class ModalDialogService {
+    private elementRef: ElementRef;
+
+    constructor(
+        private page: Page,
+        private loader: DynamicComponentLoader) {
+    }
+
+    public registerElementRef(ref: ElementRef) {
+        this.elementRef = ref;
+    }
+
+    public showModal(type: Type, options: ModalDialogOptions): Promise<any> {
+        if (!this.elementRef) {
+            throw new Error("No elementRef: Make sure you have the modal-dialog-host directive inside your component.");
+        }
+        return new Promise((resove, reject) => {
+            const page = new Page();
+
+            var detachedLoaderRef: ComponentRef;
+            const closeCallback = (...args) => {
+                resove.apply(undefined, args);
+                page.closeModal();
+                detachedLoaderRef.dispose();
+            }
+            const modalParams = new ModalDialogParams(options.context, closeCallback);
+
+            const providers = Injector.resolve([
+                provide(Page, { useValue: page }),
+                provide(ModalDialogParams, { useValue: modalParams }),
+            ]);
+
+            this.loader.loadNextToLocation(DetachedLoader, this.elementRef, providers)
+                .then((loaderRef) => {
+                    detachedLoaderRef = loaderRef;
+                    return (<DetachedLoader>loaderRef.instance).loadComponent(type)
+                })
+                .then((compRef) => {
+                    //Component loaded. Find its root native view.
+                    const componentView = <View>compRef.location.nativeElement;
+                    if (componentView.parent) {
+                        (<any>componentView.parent).removeChild(componentView);
+                    }
+                    page.content = componentView;
+                    this.page.showModal(page, options.context, closeCallback, options.fullscreen);
+                });
+        })
+    }
+}
+
+
+@Directive({
+    selector: "[modal-dialog-host]"
+})
+export class ModalDialogHost {
+    constructor(elementRef: ElementRef, modalService: ModalDialogService) {
+        modalService.registerElementRef(elementRef);
+    }
+} 
diff --git a/src/nativescript-angular/modal-dialog.d.ts b/src/nativescript-angular/modal-dialog.d.ts
new file mode 100644
index 000000000..850fd3ce0
--- /dev/null
+++ b/src/nativescript-angular/modal-dialog.d.ts
@@ -0,0 +1,18 @@
+import {Type} from 'angular2/core';
+
+export interface ModalDialogOptions {
+    context?: any;
+    fullscreen?: boolean;
+}
+
+export class ModalDialogParams {
+    public context: any;
+    public closeCallback: (...args) => any;
+}
+
+export class ModalDialogService {
+    public showModal(type: Type, options: ModalDialogOptions): Promise<any>;
+}
+
+export class ModalDialogHost {
+} 
diff --git a/src/nativescript-angular/modal-dialog.ts b/src/nativescript-angular/modal-dialog.ts
new file mode 100644
index 000000000..0aa0ee079
--- /dev/null
+++ b/src/nativescript-angular/modal-dialog.ts
@@ -0,0 +1,6 @@
+export {
+    ModalDialogHost,
+    ModalDialogOptions,
+    ModalDialogParams,
+    ModalDialogService
+} from "./directives/dialogs";
diff --git a/src/nativescript-angular/router/page-router-outlet.ts b/src/nativescript-angular/router/page-router-outlet.ts
index a67036fc7..d1bdedb5a 100644
--- a/src/nativescript-angular/router/page-router-outlet.ts
+++ b/src/nativescript-angular/router/page-router-outlet.ts
@@ -2,8 +2,8 @@ import {PromiseWrapper} from 'angular2/src/facade/async';
 import {isBlank, isPresent} from 'angular2/src/facade/lang';
 import {StringMapWrapper} from 'angular2/src/facade/collection';
 
-import {Attribute, DynamicComponentLoader, ComponentRef, ElementRef,
-    Injector, provide, Type, Component, OpaqueToken, Inject} from 'angular2/core';
+import {Attribute, DynamicComponentLoader, ComponentRef,
+    ElementRef, Injector, provide, Type, Component} from 'angular2/core';
 
 import * as routerHooks from 'angular2/src/router/lifecycle/lifecycle_annotations';
 import {hasLifecycleHook} from 'angular2/src/router/lifecycle/route_lifecycle_reflector';
@@ -18,12 +18,13 @@ import {topmost} from "ui/frame";
 import {Page, NavigatedData} from "ui/page";
 import {log} from "./common";
 import {NSLocationStrategy} from "./ns-location-strategy";
+import {DetachedLoader} from "../common/detached-loader";
 
 let _resolveToTrue = PromiseWrapper.resolve(true);
 
 interface CacheItem {
     componentRef: ComponentRef;
-    pageShimRef?: ComponentRef;
+    loaderRef?: ComponentRef;
     router: Router;
 }
 
@@ -33,8 +34,8 @@ interface CacheItem {
 class RefCache {
     private cache: Array<CacheItem> = new Array<CacheItem>();
 
-    public push(comp: ComponentRef, router: Router, pageShimRef?: ComponentRef) {
-        this.cache.push({ componentRef: comp, router: router, pageShimRef: pageShimRef });
+    public push(comp: ComponentRef, router: Router, loaderRef?: ComponentRef) {
+        this.cache.push({ componentRef: comp, router: router, loaderRef: loaderRef });
     }
 
     public pop(): CacheItem {
@@ -46,30 +47,6 @@ class RefCache {
     }
 }
 
-/**
- * Page shim used for loadin compnenets when navigating
- */
-@Component({
-    selector: 'nativescript-page-shim',
-    template: `
-        <DetachedContainer>
-            <Placeholder #loader></Placeholder>
-        </DetachedContainer>
-        `
-})
-class PageShim {
-    constructor(
-        private element: ElementRef,
-        private loader: DynamicComponentLoader
-    ) {
-    }
-
-    public loadComponent(componentType: Type): Promise<ComponentRef> {
-        return this.loader.loadIntoLocation(componentType, this.element, 'loader');
-    }
-}
-
-
 /**
  * A router outlet that does page navigation in NativeScript
  *
@@ -136,7 +113,7 @@ export class PageRouterOutlet extends RouterOutlet {
     private activateOnGoForward(nextInstruction: ComponentInstruction, previousInstruction: ComponentInstruction): Promise<any> {
         let componentType = nextInstruction.componentType;
         let resultPromise: Promise<any>;
-        let pageShimRef: ComponentRef = undefined;
+        let loaderRef: ComponentRef = undefined;
         const childRouter = this.parentRouter.childRouter(componentType);
 
         const providersArray = [
@@ -150,14 +127,14 @@ export class PageRouterOutlet extends RouterOutlet {
             this.isInitalPage = false;
             resultPromise = this.loader.loadNextToLocation(componentType, this.elementRef, Injector.resolve(providersArray));
         } else {
-            log("PageRouterOutlet.activate() forward navigation - create page shim in the loader container: " + componentType.name);
+            log("PageRouterOutlet.activate() forward navigation - create detached loader in the loader container: " + componentType.name);
 
             const page = new Page();
             providersArray.push(provide(Page, { useValue: page }));
-            resultPromise = this.loader.loadIntoLocation(PageShim, this.elementRef, "loader", Injector.resolve(providersArray))
+            resultPromise = this.loader.loadIntoLocation(DetachedLoader, this.elementRef, "loader", Injector.resolve(providersArray))
                 .then((pageComponentRef) => {
-                    pageShimRef = pageComponentRef;
-                    return (<PageShim>pageShimRef.instance).loadComponent(componentType);
+                    loaderRef = pageComponentRef;
+                    return (<DetachedLoader>loaderRef.instance).loadComponent(componentType);
                 })
                 .then((actualCoponenetRef) => {
                     return this.loadComponentInPage(page, actualCoponenetRef);
@@ -166,7 +143,7 @@ export class PageRouterOutlet extends RouterOutlet {
 
         return resultPromise.then((componentRef) => {
             this.componentRef = componentRef;
-            this.refCache.push(componentRef, childRouter, pageShimRef);
+            this.refCache.push(componentRef, childRouter, loaderRef);
 
             if (hasLifecycleHook(routerHooks.routerOnActivate, componentType)) {
                 return (<OnActivate>this.componentRef.instance)
@@ -178,13 +155,13 @@ export class PageRouterOutlet extends RouterOutlet {
 
     private loadComponentInPage(page: Page, componentRef: ComponentRef): Promise<ComponentRef> {
         //Component loaded. Find its root native view.
-        const componenetView = componentRef.location.nativeElement;
+        const componentView = componentRef.location.nativeElement;
         //Remove it from original native parent.
-        if (<any>componenetView.parent) {
-            (<any>componenetView.parent).removeChild(componenetView);
+        if (<any>componentView.parent) {
+            (<any>componentView.parent).removeChild(componentView);
         }
         //Add it to the new page
-        page.content = componenetView;
+        page.content = componentView;
 
         this.location.navigateToNewPage();
         return new Promise((resolve, reject) => {
@@ -238,8 +215,8 @@ export class PageRouterOutlet extends RouterOutlet {
                     this.componentRef = null;
                 }
 
-                if (isPresent(popedItem.pageShimRef)) {
-                    popedItem.pageShimRef.dispose();
+                if (isPresent(popedItem.loaderRef)) {
+                    popedItem.loaderRef.dispose();
                 }
             });
         } else {
diff --git a/src/nativescript-angular/view-util.ts b/src/nativescript-angular/view-util.ts
index b141002ba..d9550903e 100644
--- a/src/nativescript-angular/view-util.ts
+++ b/src/nativescript-angular/view-util.ts
@@ -117,7 +117,6 @@ export function createText(value: string): NgView {
 }
 
 export function createViewContainer(name: string, parentElement: NgView, beforeAttach: BeforeAttachAction) {
-    //HACK: Using a ContentView here, so that it creates a native View object
     traceLog('Creating view container in:' + parentElement);
 
     const layout = createView('ProxyViewContainer', parentElement, beforeAttach);
diff --git a/tests/app/tests/modal-dialog.ts b/tests/app/tests/modal-dialog.ts
new file mode 100644
index 000000000..f60dbf554
--- /dev/null
+++ b/tests/app/tests/modal-dialog.ts
@@ -0,0 +1,104 @@
+//make sure you import mocha-config before angular2/core
+import {assert} from "./test-config";
+import {Component, ComponentRef} from "angular2/core";
+import {TestApp} from "./test-app";
+import {Page} from "ui/page";
+import {topmost} from "ui/frame";
+import {ModalDialogHost, ModalDialogOptions, ModalDialogParams, ModalDialogService} from "../nativescript-angular/directives/dialogs";
+
+@Component({
+    selector: "modal-comp",
+    template: `<Label text="this is modal component"></Label>`
+})
+export class ModalComponent {
+    constructor(public params: ModalDialogParams, private page: Page) {
+        page.on("shownModally", () => {
+            var result = this.params.context;
+            this.params.closeCallback(result);
+        });
+    }
+}
+
+@Component({
+    selector: "fail-comp",
+    providers: [ModalDialogService],
+    template: `<Label text="This app is doomed"></Label>`
+
+})
+export class FailComponent {
+    constructor(public service: ModalDialogService) {
+    }
+}
+
+@Component({
+    selector: "sucess-comp",
+    directives: [ModalDialogHost],
+    providers: [ModalDialogService],
+    template: `
+    <GridLayout modal-dialog-host margin="20">
+        <Label text="Modal dialogs"></Label>
+    </GridLayout>`
+})
+export class SuccessComponent {
+    constructor(public service: ModalDialogService) {
+    }
+}
+
+describe('modal-dialog', () => {
+    let testApp: TestApp = null;
+
+    before(() => {
+        return TestApp.create().then((app) => {
+            testApp = app;
+        })
+    });
+
+    after(() => {
+        testApp.dispose();
+    });
+
+    afterEach(() => {
+        var page = topmost().currentPage;
+        if (page && page.modal) {
+            console.log("Warning: closing a leftover modal page!");
+            page.modal.closeModal();
+        }
+        testApp.disposeComponents();
+    });
+
+
+    it("showModal throws when there is no modal-dialog-host", (done) => {
+        testApp.loadComponent(FailComponent)
+            .then((ref) => {
+                var service = <ModalDialogService>ref.instance.service;
+                assert.throws(() => service.showModal(ModalComponent, {}), "No elementRef: Make sure you have the modal-dialog-host directive inside your component.");
+                done();
+            })
+            .catch(done)
+    });
+
+    it("showModal succeeds when there is modal-dialog-host", (done) => {
+        testApp.loadComponent(SuccessComponent)
+            .then((ref) => {
+                var service = <ModalDialogService>ref.instance.service;
+                return service.showModal(ModalComponent, {});
+            })
+            .then((res) => done())
+            .catch(done)
+    });
+
+
+    it("showModal passes modal params and gets result when resolved", (done) => {
+        var context = { property: "my context" };
+        testApp.loadComponent(SuccessComponent)
+            .then((ref) => {
+                var service = <ModalDialogService>ref.instance.service;
+                return service.showModal(ModalComponent, { context: context });
+            })
+            .then((res) => {
+                assert.strictEqual(res, context);
+                done();
+            })
+            .catch(done);
+    })
+});
diff --git a/tests/app/tests/renderer-tests.ts b/tests/app/tests/renderer-tests.ts
index f5a937c2d..1804033e2 100644
--- a/tests/app/tests/renderer-tests.ts
+++ b/tests/app/tests/renderer-tests.ts
@@ -120,7 +120,7 @@ describe('Renderer E2E', () => {
     });
 
     afterEach(() => {
-        testApp.disposeComponenets();
+        testApp.disposeComponents();
     });
 
     it("component with a layout", () => {
diff --git a/tests/app/tests/router.ts b/tests/app/tests/router.ts
index 8fbdb89c6..97c7c233d 100644
--- a/tests/app/tests/router.ts
+++ b/tests/app/tests/router.ts
@@ -203,7 +203,7 @@ describe('page-router-outlet', () => {
     }
 
     it("loads default path", () => {
-        //             App-Root   app-componenet       first-componenet        
+        //             App-Root   app-component       first-component        
         //                |           |                     | 
         var expected = "(ROOT (ProxyViewContainer), (ProxyViewContainer (Label[text=First])))";
         assert.equal(expected, dumpView(testApp.elementRef.nativeElement, true));
diff --git a/tests/app/tests/test-app.ts b/tests/app/tests/test-app.ts
index 18519ba08..1ebabae6b 100644
--- a/tests/app/tests/test-app.ts
+++ b/tests/app/tests/test-app.ts
@@ -31,7 +31,7 @@ export class TestApp {
         });
     }
 
-    public disposeComponenets() {
+    public disposeComponents() {
         while (this._pendingDispose.length > 0) {
             const componentRef = this._pendingDispose.pop()
             componentRef.dispose();
@@ -43,7 +43,7 @@ export class TestApp {
     }
 
     public dispose() {
-        this.disposeComponenets();
+        this.disposeComponents();
         destroyTestApp(this);
     }
 }
diff --git a/tests/package.json b/tests/package.json
index 853da0587..db77f93be 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -30,7 +30,7 @@
 	},
 	"homepage": "http://nativescript.org",
 	"dependencies": {
-		"tns-core-modules": "^2.0.0-angular-0",
+		"tns-core-modules": "2.0.0-angular-1",
 		"angular2": "2.0.0-beta.9",
 		"nativescript-unit-test-runner": "^0.3.3",
 		"parse5": "1.4.2",