diff --git a/ionic/components/action-menu/test/basic/index.js b/ionic/components/action-menu/test/basic/index.js
index 4627c9404c..ca98a35c39 100644
--- a/ionic/components/action-menu/test/basic/index.js
+++ b/ionic/components/action-menu/test/basic/index.js
@@ -10,7 +10,7 @@ import {ActionMenu} from 'ionic/components/action-menu/action-menu';
   templateUrl: 'main.html',
   directives: [Content]
 })
-export default class IonicApp {
+class IonicApp {
 
   openMenu() {
     console.log('Opening ActionMenu')
@@ -41,3 +41,7 @@ export default class IonicApp {
   }
 
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/alert/test/basic/index.js b/ionic/components/alert/test/basic/index.js
index bdd37082f3..ed7054c21a 100644
--- a/ionic/components/alert/test/basic/index.js
+++ b/ionic/components/alert/test/basic/index.js
@@ -1,4 +1,3 @@
-import {bootstrap} from 'angular2/angular2'
 import {Component} from 'angular2/src/core/annotations_impl/annotations';
 import {View} from 'angular2/src/core/annotations_impl/view';
 
@@ -22,6 +21,6 @@ class IonicApp {
   }
 }
 
-export function main() {
-  bootstrap(IonicApp);
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
 }
diff --git a/ionic/components/app/test/animations/index.js b/ionic/components/app/test/animations/index.js
index 01dba1067a..24273c8cf0 100644
--- a/ionic/components/app/test/animations/index.js
+++ b/ionic/components/app/test/animations/index.js
@@ -12,7 +12,7 @@ let scale = 0.6;
 @View({
   templateUrl: 'main.html'
 })
-export default class IonicApp {
+class IonicApp {
 
   constructor() {
     this.animation = new Animation();
@@ -75,3 +75,7 @@ export default class IonicApp {
   }
 
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/app/test/barkpark/index.js b/ionic/components/app/test/barkpark/index.js
index fa06cd30b7..dc08c60cc8 100644
--- a/ionic/components/app/test/barkpark/index.js
+++ b/ionic/components/app/test/barkpark/index.js
@@ -141,7 +141,7 @@ class PostDetail {
   templateUrl: 'pages/splash.html',
   directives: [Content]
 })
-export default class SplashPage {
+class SplashPage {
   constructor(nav: NavController) {
     this.nav = nav;
     window.nav = nav;
@@ -151,3 +151,7 @@ export default class SplashPage {
   }
 }
 
+export function main(ionicBootstrap) {
+  ionicBootstrap(SplashPage);
+}
+
diff --git a/ionic/components/app/test/hn/index.js b/ionic/components/app/test/hn/index.js
index 5e1a78b613..e74dfe5633 100644
--- a/ionic/components/app/test/hn/index.js
+++ b/ionic/components/app/test/hn/index.js
@@ -30,7 +30,7 @@ export class Story {
   templateUrl: './pages/top.html',
   directives: [NavbarTemplate, Navbar, Content, NgFor, List, Story, Item]
 })
-export default class HNTopStories {
+class HNTopStories {
   constructor(
     nav: NavController
   ) {
@@ -91,3 +91,7 @@ export default class HNTopStories {
   });
   */
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(HNTopStories);
+}
diff --git a/ionic/components/app/test/music/index.js b/ionic/components/app/test/music/index.js
index d1f428512f..21e9e517a4 100644
--- a/ionic/components/app/test/music/index.js
+++ b/ionic/components/app/test/music/index.js
@@ -35,7 +35,7 @@ class AppPage {
   directives: [Nav, Aside, List, Item, ParallaxEffect],
   templateUrl: 'main.html'
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     this.firstPage = AppPage
 
@@ -100,3 +100,7 @@ export class ParallaxEffect {
     list.style['transform'] = 'translate3d(' + x + 'px, ' + y + 'px, 0) scale(' + scale + ')';
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/app/test/profile/index.js b/ionic/components/app/test/profile/index.js
index ebad849a85..99a07da2e4 100644
--- a/ionic/components/app/test/profile/index.js
+++ b/ionic/components/app/test/profile/index.js
@@ -14,7 +14,7 @@ import {dom} from 'ionic/util';
   templateUrl: 'main.html',
   directives: [formDirectives, Nav, Slides, Slide, Content, List, Item, NgFor, ParallaxEffect]
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
 
     this.items = [];
@@ -57,3 +57,7 @@ export class ParallaxEffect {
     })
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/app/test/sink/index.js b/ionic/components/app/test/sink/index.js
index 9a65c972b1..3ebd56340e 100644
--- a/ionic/components/app/test/sink/index.js
+++ b/ionic/components/app/test/sink/index.js
@@ -1,4 +1,4 @@
-import {bootstrap, QueryList, ElementRef, NgFor, NgIf} from 'angular2/angular2'
+import {QueryList, ElementRef, NgFor, NgIf} from 'angular2/angular2'
 import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
 import {Descendant} from 'angular2/src/core/annotations_impl/visibility';
 import {View} from 'angular2/src/core/annotations_impl/view';
@@ -32,7 +32,7 @@ console.log('Loaded', Nav, NgFor, NgIf, Aside, List, ViewContainer, Item, Conten
   templateUrl: 'main.html',
   directives: [Nav, NgFor, NgIf, Aside, List, ViewContainer, Item, Content]
 })
-export default class IonicApp {
+class IonicApp {
   constructor(elementRef: ElementRef) {//, @Query(Aside) nav: QueryList) {//, @Descendant() aside: Aside) {
     Ionic.setRootElementRef(elementRef);
 
@@ -65,3 +65,7 @@ export default class IonicApp {
     })
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/app/test/snapcat/index.js b/ionic/components/app/test/snapcat/index.js
index 2c7f3b9ab3..1a46ba3b7f 100644
--- a/ionic/components/app/test/snapcat/index.js
+++ b/ionic/components/app/test/snapcat/index.js
@@ -102,7 +102,7 @@ export class FeedPage {
   templateUrl: 'main.html',
   directives: [formDirectives, Nav, Slides, Slide, Content, List, Item]
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     this.feedPage = FeedPage;
     console.log('IonicApp Start');
@@ -153,3 +153,7 @@ export class HeartModal {
     this.modalRef.close();
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/app/test/typography/index.js b/ionic/components/app/test/typography/index.js
index 757943499f..b4bca59a5c 100644
--- a/ionic/components/app/test/typography/index.js
+++ b/ionic/components/app/test/typography/index.js
@@ -6,8 +6,12 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 @View({
   templateUrl: 'main.html'
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     console.log('IonicApp Start')
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/app/test/yerk/index.js b/ionic/components/app/test/yerk/index.js
index 254cdc978c..9f0bdfab5c 100644
--- a/ionic/components/app/test/yerk/index.js
+++ b/ionic/components/app/test/yerk/index.js
@@ -1,4 +1,3 @@
-import {bootstrap} from 'angular2/angular2'
 import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
 import {View} from 'angular2/src/core/annotations_impl/view';
 
@@ -18,6 +17,6 @@ class IonicApp {
   }
 }
 
-export function main() {
-  bootstrap(IonicApp);
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
 }
diff --git a/ionic/components/aside/test/basic/index.js b/ionic/components/aside/test/basic/index.js
index 520debfa22..4da9cd6e3c 100644
--- a/ionic/components/aside/test/basic/index.js
+++ b/ionic/components/aside/test/basic/index.js
@@ -11,4 +11,8 @@ import {Aside, List, Item, Content} from 'ionic/ionic';
   directives: [Aside, Content, List, Item],
   templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/button/test/basic/index.js b/ionic/components/button/test/basic/index.js
index bfce3b0b18..a3d82e2be7 100644
--- a/ionic/components/button/test/basic/index.js
+++ b/ionic/components/button/test/basic/index.js
@@ -4,7 +4,10 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 
 @Component({ selector: 'ion-view' })
 @View({
-  templateUrl: 'main.html',
-  directives: []
+  templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/button/test/block/index.js b/ionic/components/button/test/block/index.js
index bfce3b0b18..a3d82e2be7 100644
--- a/ionic/components/button/test/block/index.js
+++ b/ionic/components/button/test/block/index.js
@@ -4,7 +4,10 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 
 @Component({ selector: 'ion-view' })
 @View({
-  templateUrl: 'main.html',
-  directives: []
+  templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/button/test/clear/index.js b/ionic/components/button/test/clear/index.js
index bfce3b0b18..a3d82e2be7 100644
--- a/ionic/components/button/test/clear/index.js
+++ b/ionic/components/button/test/clear/index.js
@@ -4,7 +4,10 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 
 @Component({ selector: 'ion-view' })
 @View({
-  templateUrl: 'main.html',
-  directives: []
+  templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/button/test/full/index.js b/ionic/components/button/test/full/index.js
index bfce3b0b18..a3d82e2be7 100644
--- a/ionic/components/button/test/full/index.js
+++ b/ionic/components/button/test/full/index.js
@@ -4,7 +4,10 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 
 @Component({ selector: 'ion-view' })
 @View({
-  templateUrl: 'main.html',
-  directives: []
+  templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/button/test/icons/index.js b/ionic/components/button/test/icons/index.js
index bfce3b0b18..a3d82e2be7 100644
--- a/ionic/components/button/test/icons/index.js
+++ b/ionic/components/button/test/icons/index.js
@@ -4,7 +4,10 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 
 @Component({ selector: 'ion-view' })
 @View({
-  templateUrl: 'main.html',
-  directives: []
+  templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/button/test/outline/index.js b/ionic/components/button/test/outline/index.js
index bfce3b0b18..a3d82e2be7 100644
--- a/ionic/components/button/test/outline/index.js
+++ b/ionic/components/button/test/outline/index.js
@@ -4,7 +4,10 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 
 @Component({ selector: 'ion-view' })
 @View({
-  templateUrl: 'main.html',
-  directives: []
+  templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/button/test/sizes/index.js b/ionic/components/button/test/sizes/index.js
index bfce3b0b18..a3d82e2be7 100644
--- a/ionic/components/button/test/sizes/index.js
+++ b/ionic/components/button/test/sizes/index.js
@@ -4,7 +4,10 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 
 @Component({ selector: 'ion-view' })
 @View({
-  templateUrl: 'main.html',
-  directives: []
+  templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/card/test/basic/index.js b/ionic/components/card/test/basic/index.js
index d5ecc596ba..e906c06dd8 100644
--- a/ionic/components/card/test/basic/index.js
+++ b/ionic/components/card/test/basic/index.js
@@ -10,4 +10,8 @@ import {List} from 'ionic/components/list/list';
   templateUrl: 'main.html',
   directives: [Content, List]
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/checkbox/test/basic/index.js b/ionic/components/checkbox/test/basic/index.js
index a27ff2878f..a6e4c463e8 100644
--- a/ionic/components/checkbox/test/basic/index.js
+++ b/ionic/components/checkbox/test/basic/index.js
@@ -10,7 +10,7 @@ import {Checkbox, Content, List} from 'ionic/ionic';
   templateUrl: 'main.html',
   directives: [Checkbox, List, Content]
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     // var fb = new FormBuilder();
     // this.form = fb.group({
@@ -24,3 +24,6 @@ export default class IonicApp {
   }
 }
 
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/content/test/basic/index.js b/ionic/components/content/test/basic/index.js
index 17631097cc..f8afcdeb1f 100644
--- a/ionic/components/content/test/basic/index.js
+++ b/ionic/components/content/test/basic/index.js
@@ -14,7 +14,7 @@ import {Item} from 'ionic/components/item/item';
   templateUrl: 'main.html',
   directives: [Content, Icon, Checkbox, List, Item, NgFor]
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     console.log('IonicApp Start')
 
@@ -29,3 +29,7 @@ export default class IonicApp {
     })
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/content/test/pull-to-refresh/index.js b/ionic/components/content/test/pull-to-refresh/index.js
index ce55ef4256..f8d3c645af 100644
--- a/ionic/components/content/test/pull-to-refresh/index.js
+++ b/ionic/components/content/test/pull-to-refresh/index.js
@@ -1,4 +1,4 @@
-import {bootstrap, NgFor, ProtoViewRef, ViewContainerRef} from 'angular2/angular2'
+import {NgFor, ProtoViewRef, ViewContainerRef} from 'angular2/angular2'
 import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
 import {View} from 'angular2/src/core/annotations_impl/view';
 import {Parent} from 'angular2/src/core/annotations_impl/visibility';
@@ -20,7 +20,6 @@ class IonicApp {
   }
 }
 
-
-export function main() {
-  bootstrap(IonicApp);
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
 }
diff --git a/ionic/components/form/test/basic/index.js b/ionic/components/form/test/basic/index.js
index 6f4417b393..522baa6ade 100644
--- a/ionic/components/form/test/basic/index.js
+++ b/ionic/components/form/test/basic/index.js
@@ -1,4 +1,3 @@
-import {bootstrap} from 'angular2/angular2'
 import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
 import {View} from 'angular2/src/core/annotations_impl/view';
 
@@ -29,7 +28,6 @@ class IonicApp {
   }
 }
 
-
-export function main() {
-  bootstrap(IonicApp);
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
 }
diff --git a/ionic/components/item/test/accessories/index.js b/ionic/components/item/test/accessories/index.js
index 5eb1e2a032..07764edd40 100644
--- a/ionic/components/item/test/accessories/index.js
+++ b/ionic/components/item/test/accessories/index.js
@@ -13,8 +13,12 @@ import {ItemPrimarySwipeButtons} from 'ionic/components/item/item-swipe-buttons'
   templateUrl: 'main.html',
   directives: [Item, List, NgFor, ItemPrimarySwipeButtons]
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     this.items = [1, 2, 3, 4, 5]
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/item/test/basic/index.js b/ionic/components/item/test/basic/index.js
index b3a5c2e62c..3258a3b40a 100644
--- a/ionic/components/item/test/basic/index.js
+++ b/ionic/components/item/test/basic/index.js
@@ -13,8 +13,12 @@ import {ItemPrimarySwipeButtons} from 'ionic/components/item/item-swipe-buttons'
   templateUrl: 'main.html',
   directives: [Item, List, NgFor, ItemPrimarySwipeButtons]
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     this.items = [1, 2, 3, 4, 5]
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/layout/test/basic/index.js b/ionic/components/layout/test/basic/index.js
index dc1d3b901f..1655d240c0 100644
--- a/ionic/components/layout/test/basic/index.js
+++ b/ionic/components/layout/test/basic/index.js
@@ -10,5 +10,9 @@ import {Layout} from 'ionic/components/layout/layout';
   templateUrl: 'main.html',
   directives: [Content, Layout]
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
 
diff --git a/ionic/components/list/test/basic/index.js b/ionic/components/list/test/basic/index.js
index 650abbec7f..efce4ff286 100644
--- a/ionic/components/list/test/basic/index.js
+++ b/ionic/components/list/test/basic/index.js
@@ -9,4 +9,8 @@ import {Content, List, Item} from 'ionic/ionic';
   templateUrl: 'main.html',
   directives: [Content, List, Item]
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/list/test/infinite/index.js b/ionic/components/list/test/infinite/index.js
index 7ab845d265..4e53cde03b 100644
--- a/ionic/components/list/test/infinite/index.js
+++ b/ionic/components/list/test/infinite/index.js
@@ -11,7 +11,7 @@ import {Content, List, Item} from 'ionic/ionic';
   templateUrl: 'main.html',
   directives: [Content, List, Item, ItemCellTemplate, NgFor]
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     console.log('IonicApp Start')
 
@@ -42,3 +42,7 @@ export class ItemCellTemplate {
     list.setItemTemplate(this);
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/modal/test/basic/index.js b/ionic/components/modal/test/basic/index.js
index 5fe3fdc7fb..c202d5dd9f 100644
--- a/ionic/components/modal/test/basic/index.js
+++ b/ionic/components/modal/test/basic/index.js
@@ -15,7 +15,7 @@ import {NavController, NavParams, NavbarTemplate, Navbar} from 'ionic/ionic';
   templateUrl: 'main.html',
   directives: [Content, List, Item]
 })
-export default class IonicApp {
+class IonicApp {
   openModal() {
     console.log('Opening modal');
     Modal.open(ContactModal);
@@ -118,3 +118,7 @@ export class ModalSecondPage {
   }
 
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/nav-bar/test/html-title/index.js b/ionic/components/nav-bar/test/html-title/index.js
index bfce3b0b18..b5d4309b7a 100644
--- a/ionic/components/nav-bar/test/html-title/index.js
+++ b/ionic/components/nav-bar/test/html-title/index.js
@@ -7,4 +7,8 @@ import {View} from 'angular2/src/core/annotations_impl/view';
   templateUrl: 'main.html',
   directives: []
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/nav-bar/test/lopsided-buttons/index.js b/ionic/components/nav-bar/test/lopsided-buttons/index.js
index 2db2eba398..a3d82e2be7 100644
--- a/ionic/components/nav-bar/test/lopsided-buttons/index.js
+++ b/ionic/components/nav-bar/test/lopsided-buttons/index.js
@@ -6,4 +6,8 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 @View({
   templateUrl: 'main.html'
 })
-export default class IonicApp {}
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/radio/test/basic/index.js b/ionic/components/radio/test/basic/index.js
index 5ec7a5274a..6ee7b00ada 100644
--- a/ionic/components/radio/test/basic/index.js
+++ b/ionic/components/radio/test/basic/index.js
@@ -10,7 +10,7 @@ import {RadioGroup, RadioButton, Content, List} from 'ionic/ionic';
   templateUrl: 'main.html',
   directives: [RadioGroup, RadioButton, List, Content]
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     console.log('IonicApp Start')
 
@@ -20,3 +20,7 @@ export default class IonicApp {
     // });
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/search-bar/test/basic/index.js b/ionic/components/search-bar/test/basic/index.js
index c68e4c7aba..be6f5d7f77 100644
--- a/ionic/components/search-bar/test/basic/index.js
+++ b/ionic/components/search-bar/test/basic/index.js
@@ -23,7 +23,7 @@ function randomTitle() {
   templateUrl: 'main.html',
   directives: [formDirectives].concat([Content, List, Item, SearchBar, NgFor])
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
     console.log('IonicApp Start')
 
@@ -56,3 +56,6 @@ export default class IonicApp {
   }
 }
 
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/segment/test/basic/index.js b/ionic/components/segment/test/basic/index.js
index 4dd6248ca7..c9855d2ec2 100644
--- a/ionic/components/segment/test/basic/index.js
+++ b/ionic/components/segment/test/basic/index.js
@@ -11,7 +11,7 @@ import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/fo
   templateUrl: 'main.html',
   directives: [formDirectives].concat([Segment, SegmentButton, Content, NgSwitch, NgSwitchWhen])
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
 
     var fb = new FormBuilder();
@@ -25,3 +25,7 @@ export default class IonicApp {
     event.preventDefault();
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/slides/test/basic/index.js b/ionic/components/slides/test/basic/index.js
index b1a57a8692..afacb81840 100644
--- a/ionic/components/slides/test/basic/index.js
+++ b/ionic/components/slides/test/basic/index.js
@@ -11,7 +11,7 @@ import {Slides, Slide, SlidePager, List, Item, Content} from 'ionic/ionic';
   directives: [Slides, Slide, SlidePager, Content, List, Item],
   templateUrl: 'main.html'
 })
-export default class IonicApp {
+class IonicApp {
   next() {
     console.log('Next');
   }
@@ -19,3 +19,7 @@ export default class IonicApp {
     console.log('Prev');
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/slides/test/continuous/index.js b/ionic/components/slides/test/continuous/index.js
index f579db5e2d..191223997a 100644
--- a/ionic/components/slides/test/continuous/index.js
+++ b/ionic/components/slides/test/continuous/index.js
@@ -30,7 +30,7 @@ import {Slides, Slide, SlidePager, List, Item, Content} from 'ionic/ionic';
     </div>
   `
 })
-export default class IonicApp {
+class IonicApp {
   next() {
     console.log('Next');
   }
@@ -38,3 +38,7 @@ export default class IonicApp {
     console.log('Prev');
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/switch/test/basic/index.js b/ionic/components/switch/test/basic/index.js
index 07f0f2f559..0718b27b5c 100644
--- a/ionic/components/switch/test/basic/index.js
+++ b/ionic/components/switch/test/basic/index.js
@@ -10,7 +10,7 @@ import {Switch, Content, List} from 'ionic/ionic';
   templateUrl: 'main.html',
   directives: [FormDirectives].concat([Switch, List, Content])
 })
-export default class IonicApp {
+class IonicApp {
   constructor() {
 
     var fb = new FormBuilder();
@@ -26,3 +26,7 @@ export default class IonicApp {
     event.preventDefault();
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/tabs/tabs.js b/ionic/components/tabs/tabs.js
index f38c2eb539..7e63849bf6 100644
--- a/ionic/components/tabs/tabs.js
+++ b/ionic/components/tabs/tabs.js
@@ -17,9 +17,9 @@ import {IonicComponent} from '../../config/component';
 @IonicComponent(Tabs)
 @View({
   template: `
-    <nav class="navbar-container tab-bar-container">
+    <nav class="tab-bar-container">
       <div class="tab-bar" role="tablist">
-        <button *ng-for="#t of tabs" class="tab-button" role="tab">
+        <button *ng-for="#t of tabs" [tab]="t" class="tab-button" role="tab">
           <icon [name]="t.tabIcon" class="tab-button-icon"></icon>
           <span class="tab-button-text">{{t.tabTitle}}</span>
         </button>
diff --git a/ionic/components/tabs/tabs.scss b/ionic/components/tabs/tabs.scss
index c6889d86e9..0f1194dbef 100644
--- a/ionic/components/tabs/tabs.scss
+++ b/ionic/components/tabs/tabs.scss
@@ -54,6 +54,7 @@ ion-tab {
 }
 
 .tab-bar-container {
+  position: relative;
   order: $flex-order-tab-bar-bottom;
 }
 
@@ -68,7 +69,7 @@ ion-tab {
   background: $tab-bar-background-color;
 }
 
-.tab-button {
+button.tab-button {
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -88,13 +89,13 @@ ion-tab {
   background: none;
 }
 
-[tab-bar-icons="bottom"] > .tab-bar-container .tab-button {
+[tab-bar-icons="bottom"] > .tab-bar-container button.tab-button {
   .tab-button-icon {
     order: 10;
   }
 }
 
-[tab-bar-icons="left"] > .tab-bar-container .tab-button {
+[tab-bar-icons="left"] > .tab-bar-container button.tab-button {
   flex-direction: row;
 
   .tab-button-icon {
@@ -103,7 +104,7 @@ ion-tab {
   }
 }
 
-[tab-bar-icons="right"] > .tab-bar-container .tab-button {
+[tab-bar-icons="right"] > .tab-bar-container button.tab-button {
   flex-direction: row;
 
   .tab-button-icon {
@@ -130,10 +131,10 @@ ion-tab {
   display: none;
 }
 
-.tab-button:hover {
+button.tab-button:hover {
   opacity: 0.6;
 }
 
-.tab-button[aria-selected="true"] {
+button.tab-button[aria-selected="true"] {
   color: red;
 }
diff --git a/ionic/components/tabs/test/advanced/index.js b/ionic/components/tabs/test/advanced/index.js
index 90662e74f2..24d0762e3f 100644
--- a/ionic/components/tabs/test/advanced/index.js
+++ b/ionic/components/tabs/test/advanced/index.js
@@ -17,7 +17,7 @@ import {Tabs, Tab, NavController, NavbarTemplate, Navbar, Content} from 'ionic/i
     '</ion-content>',
   directives: [NavbarTemplate, Navbar, Content]
 })
-export default class SignInPage {
+class IonicApp {
   constructor(nav: NavController) {
     this.nav = nav;
   }
@@ -183,3 +183,7 @@ class Tab2Page3 {
     this.nav = nav;
   }
 }
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
+}
diff --git a/ionic/components/tabs/test/basic/index.js b/ionic/components/tabs/test/basic/index.js
index 2504f3f58d..839f1b6cc8 100644
--- a/ionic/components/tabs/test/basic/index.js
+++ b/ionic/components/tabs/test/basic/index.js
@@ -11,8 +11,8 @@ import * as util from 'ionic/util'
   templateUrl: 'main.html',
   directives: [Tabs, Tab, Content]
 })
-export default class IonicApp {
-  constructor() {
-    console.log('IonicApp Start');
-  }
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
 }
diff --git a/ionic/components/tabs/test/tab-bar-bottom/index.js b/ionic/components/tabs/test/tab-bar-bottom/index.js
index 0614c59082..15f5a4c4aa 100644
--- a/ionic/components/tabs/test/tab-bar-bottom/index.js
+++ b/ionic/components/tabs/test/tab-bar-bottom/index.js
@@ -9,8 +9,8 @@ import {Tabs, Tab} from 'ionic/ionic';
   templateUrl: 'main.html',
   directives: [Tabs, Tab]
 })
-export default class IonicApp {
-  constructor() {
-    console.log('IonicApp Start')
-  }
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
 }
diff --git a/ionic/components/tabs/test/tab-bar-icons/index.js b/ionic/components/tabs/test/tab-bar-icons/index.js
index 27d99b16df..8483e51a8c 100644
--- a/ionic/components/tabs/test/tab-bar-icons/index.js
+++ b/ionic/components/tabs/test/tab-bar-icons/index.js
@@ -6,8 +6,8 @@ import {View} from 'angular2/src/core/annotations_impl/view';
 @View({
   templateUrl: 'main.html'
 })
-export default class IonicApp {
-  constructor() {
-    console.log('IonicApp Start')
-  }
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
 }
diff --git a/ionic/components/tabs/test/tab-bar-top/index.js b/ionic/components/tabs/test/tab-bar-top/index.js
index 0614c59082..15f5a4c4aa 100644
--- a/ionic/components/tabs/test/tab-bar-top/index.js
+++ b/ionic/components/tabs/test/tab-bar-top/index.js
@@ -9,8 +9,8 @@ import {Tabs, Tab} from 'ionic/ionic';
   templateUrl: 'main.html',
   directives: [Tabs, Tab]
 })
-export default class IonicApp {
-  constructor() {
-    console.log('IonicApp Start')
-  }
+class IonicApp {}
+
+export function main(ionicBootstrap) {
+  ionicBootstrap(IonicApp);
 }