diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 3ceaec96c..0cd8ef78a 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -151,6 +151,7 @@
     <TypeScriptCompile Include="apps\orientation-demo\main-page.ts" />
     <TypeScriptCompile Include="apps\tests\navigation-tests.ts" />
     <TypeScriptCompile Include="apps\tests\pages\page21.ts">
+    <TypeScriptCompile Include="apps\tests\ui\page\page21.ts">
       <DependentUpon>page21.xml</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="apps\tests\pages\page20.ts">
@@ -166,7 +167,7 @@
     <TypeScriptCompile Include="apps\tests\ui\repeaterItems-bindingToGestures.ts" />
     <TypeScriptCompile Include="apps\tests\xml-declaration\inherited-base-page.ts" />
     <TypeScriptCompile Include="apps\tests\xml-declaration\inherited-page.ts" />
-    <Content Include="apps\tests\pages\page21.xml">
+    <Content Include="apps\tests\ui\page\page21.xml">
       <SubType>Designer</SubType>
     </Content>
     <Content Include="apps\tests\pages\page20.xml">
@@ -1982,6 +1983,7 @@
       </FlavorProperties>
       <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
       <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
+      <UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/CrossPlatformModules.sln b/CrossPlatformModules.sln
index 065ae6bab..646061d34 100644
--- a/CrossPlatformModules.sln
+++ b/CrossPlatformModules.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22310.1
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrossPlatformModules", "CrossPlatformModules.csproj", "{2313F1BF-1F2D-4F11-806A-87927FA6A7C0}"
 EndProject
diff --git a/apps/tests/TKUnit.ts b/apps/tests/TKUnit.ts
index 2e11ce19f..119986f1e 100644
--- a/apps/tests/TKUnit.ts
+++ b/apps/tests/TKUnit.ts
@@ -156,6 +156,12 @@ export function assert(test: any, message?: string) {
     }
 };
 
+export function assertTrue(test: boolean, message?: string) {
+    if (test !== true) {
+        throw new Error(message);
+    }
+};
+
 export function assertNotEqual(actual: any, expected: any, message?: string) {
 
     var equals = false;
diff --git a/apps/tests/ui/page/page-tests-common.ts b/apps/tests/ui/page/page-tests-common.ts
index 30ff43f16..9bd3e3e9d 100644
--- a/apps/tests/ui/page/page-tests-common.ts
+++ b/apps/tests/ui/page/page-tests-common.ts
@@ -366,4 +366,41 @@ export function test_page_backgroundColor_is_white() {
         var page = <PageModule.Page>views[0];
         TKUnit.assertEqual(page.style.backgroundColor.hex.toLowerCase(), "#ffffff", "page background-color");
     });
-}
\ No newline at end of file
+}
+
+//export function test_ModalPage_Layout_is_Correct() {
+//    var testPage: PageModule.Page;
+//    var label: LabelModule.Label;
+//    var pageFactory = function () {
+//        testPage = new PageModule.Page();
+//        label = new LabelModule.Label();
+//        label.text = "Will Show modal page";
+//        testPage.content = label;
+//        return testPage;
+//    };
+
+//    helper.navigate(pageFactory);
+//    var basePath = "ui/page/";
+//    testPage.showModal(basePath + "page21", testPage, () => { }, false);
+
+//    // TODO: Remove this once navigate and showModal returns Promise<Page>.
+//    TKUnit.wait(0.350);
+//    var childPage = (<any>testPage).childPage;
+//    var closeCallback: Function = (<any>testPage).close;
+
+//    try {
+//        var layout = <stackLayoutModule.StackLayout>childPage.content;
+//        var repeater = layout.getChildAt(1);
+//        TKUnit.assertTrue(repeater.isLayoutValid, "layout should be valid.");
+//        var bounds = repeater._getCurrentLayoutBounds();
+//        var height = bounds.bottom - bounds.top;
+//        TKUnit.assertTrue(height > 0, "Layout should be >0.");
+
+//        closeCallback();
+//        TKUnit.wait(0.150);
+//    }
+//    finally {
+//        helper.goBack
+//        helper.goBack();
+//    }
+//}
\ No newline at end of file