diff --git a/src/components/checkbox/test/checkbox-default/index.html b/src/components/checkbox/test/checkbox-default/index.html
index c71a566d49..da28569684 100644
--- a/src/components/checkbox/test/checkbox-default/index.html
+++ b/src/components/checkbox/test/checkbox-default/index.html
@@ -1,70 +1 @@
-
-<div class="pane">
-
-  <div class="pane-container">
-
-    <div class="bar">
-      Checkbox Default CSS Tests
-    </div>
-
-    <div class="content">
-
-      <div class="list">
-
-        <div class="list-content">
-
-
-
-          <div class="item checkbox"
-               role="checkbox"
-               aria-checked="true"
-               aria-invalid="false">
-
-            <div class="item-media">
-              <div class="checkbox-off">Off</div>
-              <div class="checkbox-on">On</div>
-            </div>
-
-            <div class="item-content">
-
-              <div class="item-title">
-                I am pleased
-              </div>
-
-            </div>
-
-          </div>
-
-
-
-          <div class="item checkbox"
-               role="checkbox"
-               aria-checked="false"
-               aria-invalid="false">
-
-            <div class="item-media">
-              <div class="checkbox-off">Off</div>
-              <div class="checkbox-on">On</div>
-            </div>
-
-            <div class="item-content">
-
-              <div class="item-title">
-                Hello
-              </div>
-
-            </div>
-
-          </div>
-
-
-
-        </div>
-
-      </div>
-
-    </div>
-
-  </div>
-
-</div>
+Loading...
diff --git a/src/components/checkbox/test/checkbox-ios-default/index.html b/src/components/checkbox/test/checkbox-default/main.html
similarity index 94%
rename from src/components/checkbox/test/checkbox-ios-default/index.html
rename to src/components/checkbox/test/checkbox-default/main.html
index deadee46df..bb1f0b6d9c 100644
--- a/src/components/checkbox/test/checkbox-ios-default/index.html
+++ b/src/components/checkbox/test/checkbox-default/main.html
@@ -4,12 +4,12 @@
   <div class="pane-container">
 
     <div class="bar">
-      iOS Checkbox Default CSS Tests
+      Default Checkbox Tests
     </div>
 
     <div class="content">
 
-      <div class="list list-ios">
+      <div class="list">
 
         <div class="list-content">
 
diff --git a/src/components/checkbox/test/checkbox-default/main.js b/src/components/checkbox/test/checkbox-default/main.js
index e69de29bb2..7c2f5654c5 100644
--- a/src/components/checkbox/test/checkbox-default/main.js
+++ b/src/components/checkbox/test/checkbox-default/main.js
@@ -0,0 +1,19 @@
+import {bootstrap} from 'angular2/core';
+import {Component, Template} from 'angular2/angular2';
+import {View} from 'ionic2/components/view/view';
+import {Content} from 'ionic2/components/content/content';
+import {Icon} from 'ionic2/components/icon/icon';
+
+
+@Component({ selector: '[ion-app]' })
+@Template({
+  url: 'main.html',
+  directives: [View, Content, Icon]
+})
+class IonicApp {
+  constructor() {
+    console.log('IonicApp Start')
+  }
+}
+
+bootstrap(IonicApp)
diff --git a/src/components/checkbox/test/checkbox-ios-default/main.js b/src/components/checkbox/test/checkbox-ios-default/main.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/components/checkbox/test/checkbox-ios/index.html b/src/components/checkbox/test/checkbox-ios/index.html
new file mode 100644
index 0000000000..da28569684
--- /dev/null
+++ b/src/components/checkbox/test/checkbox-ios/index.html
@@ -0,0 +1 @@
+Loading...
diff --git a/src/components/checkbox/test/checkbox-ios/main.html b/src/components/checkbox/test/checkbox-ios/main.html
new file mode 100644
index 0000000000..590c933193
--- /dev/null
+++ b/src/components/checkbox/test/checkbox-ios/main.html
@@ -0,0 +1,48 @@
+
+<div class="pane">
+
+  <div class="pane-container">
+
+    <div class="bar">
+      iOS Checkbox Tests
+    </div>
+
+    <div class="content">
+
+      <div class="list list-ios">
+
+        <div class="list-content">
+
+
+
+          <div class="item checkbox ios-checkbox"
+               role="checkbox"
+               aria-checked="true"
+               aria-invalid="false">
+
+            <div class="item-media">
+              <div class="checkbox-off">Off</div>
+              <div class="checkbox-on">On</div>
+            </div>
+
+            <div class="item-content">
+
+              <div class="item-title">
+                I am pleased
+              </div>
+
+            </div>
+
+          </div>
+
+
+
+        </div>
+
+      </div>
+
+    </div>
+
+  </div>
+
+</div>
diff --git a/src/components/checkbox/test/checkbox-ios/main.js b/src/components/checkbox/test/checkbox-ios/main.js
new file mode 100644
index 0000000000..7c2f5654c5
--- /dev/null
+++ b/src/components/checkbox/test/checkbox-ios/main.js
@@ -0,0 +1,19 @@
+import {bootstrap} from 'angular2/core';
+import {Component, Template} from 'angular2/angular2';
+import {View} from 'ionic2/components/view/view';
+import {Content} from 'ionic2/components/content/content';
+import {Icon} from 'ionic2/components/icon/icon';
+
+
+@Component({ selector: '[ion-app]' })
+@Template({
+  url: 'main.html',
+  directives: [View, Content, Icon]
+})
+class IonicApp {
+  constructor() {
+    console.log('IonicApp Start')
+  }
+}
+
+bootstrap(IonicApp)