diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 830006310..c5b06c394 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -223,8 +223,18 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="apps\ui-tests-app\app.css" />
-    <TypeScriptCompile Include="apps\ui-tests-app\action-bar\all.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\action-bar\color.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\action-bar\all.ts">
+      <DependentUpon>all.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\action-bar\background.ts">
+      <DependentUpon>background.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\action-bar\clean.ts">
+      <DependentUpon>clean.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\action-bar\color.ts">
+      <DependentUpon>color.xml</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\html-view\html-view.ts">
       <DependentUpon>html-view.xml</DependentUpon>
     </TypeScriptCompile>
diff --git a/apps/ui-tests-app/tab-view/all.xml b/apps/ui-tests-app/tab-view/all.xml
index 5825d3d9b..f0dc8fad2 100644
--- a/apps/ui-tests-app/tab-view/all.xml
+++ b/apps/ui-tests-app/tab-view/all.xml
@@ -1,5 +1,5 @@
 <Page>
-  <TabView style="color: yellow; background-color: green;" selectedColor="red" tabsBackgroundColor="blue">
+  <TabView selectedIndex="1" style="color: yellow; background-color: green;" selectedColor="red" tabsBackgroundColor="blue">
     <TabView.items>
       <TabViewItem title="First">
         <TabViewItem.view>