diff --git a/apps/ui-tests-app/css/clip-path.xml b/apps/ui-tests-app/css/clip-path.xml
index 33a64e9d9..f567cd119 100644
--- a/apps/ui-tests-app/css/clip-path.xml
+++ b/apps/ui-tests-app/css/clip-path.xml
@@ -1,5 +1,5 @@
 <Page>
-    <GridLayout rows="*,*,*,*,*">
+    <GridLayout rows="*,*,*,*,*" automationText="clipPath">
         <Button text="circle" style="background-color: red; border-width:2; border-color: blue; clip-path: circle(100% at 50% 50%);"/>
         <Button text="ellipse" style="background-color: orange; border-width:2; border-color: green; clip-path: ellipse(50% 50% at 50% 50%);" row="1" />
         <Button text="rect" style="background-color: red; border-width:2; border-color: blue; clip-path: rect(0, 0, 100%, 100%);" row="2" />
diff --git a/apps/ui-tests-app/css/zindex.xml b/apps/ui-tests-app/css/zindex.xml
index 5e6defca9..2ec43223f 100644
--- a/apps/ui-tests-app/css/zindex.xml
+++ b/apps/ui-tests-app/css/zindex.xml
@@ -1,10 +1,36 @@
 <Page>
-    <StackLayout automationText="zIndex">
-      <AbsoluteLayout style="background-color: green;">
-        <Button text="button 1" style="height: 100; width: 100; z-index: 999; background-color: red;" />
-        <Button text="button 2" left="20" top="70" style="height: 100; width: 100; z-index:1; background-color: yellow;"/>
-        <Button text="button 3" left="60" top="130" style="height: 100; width: 100; z-index:0; background-color: blue; color: black;"/>
-        <Button text="button 4" left="90" top="190" style="height: 100; width: 100; z-index:-1; background-color: orange;"/>
+  <GridLayout automationText="zIndex" columns="*,*" rows="*, *">
+    <AbsoluteLayout style="background-color: green;">
+      <Button text="button 1" style="height: 100; width: 100; z-index: 999; background-color: red;" />
+      <Button text="button 2" left="20" top="70" style="height: 100; width: 100; z-index:1; background-color: yellow;"/>
+      <Button text="button 3" left="60" top="130" style="height: 100; width: 100; z-index:0; background-color: blue; color: black;"/>
+      <Button text="button 4" left="90" top="190" style="height: 100; width: 100; z-index:-1; background-color: orange;"/>
+    </AbsoluteLayout>
+    <AbsoluteLayout style="background-color: black;" col="1">
+      <Label text="label 1" style="height: 100; width: 100; z-index: 999; background-color: red;" />
+      <Label text="label 2" left="20" top="70" style="height: 100; width: 100; z-index:1; background-color: yellow;"/>
+      <Label text="label 3" left="60" top="130" style="height: 100; width: 100; z-index:0; background-color: blue; color: black;"/>
+      <Label text="label 4" left="90" top="190" style="height: 100; width: 100; z-index:-1; background-color: orange;"/>
+    </AbsoluteLayout>
+    <AbsoluteLayout style="background-color: brown;" row="1">
+      <TextField text="TextField" style="height: 100; width: 100; z-index: 999; background-color: red;" />
+      <TextView text="TextView" left="20" top="70" style="height: 100; width: 100; z-index:1; background-color: yellow;"/>
+      <Image src="~/ui-tests-app/image-view/gravatar.png" left="60" top="130" style="height: 100; width: 100; z-index:0; background-color: blue; color: black;"/>
+      <TimePicker hour="5" minute="30" minHour="3" maxHour="7" left="90" top="190" style="z-index:-1; background-color: orange; width: 100;"/>
+    </AbsoluteLayout>
+    <AbsoluteLayout row="1" col="1" style="background-color: grey;">
+      <StackLayout style="background-color: green; z-index: 999;">
+        <TextField text="stacklayout1" style="height: 100; width: 100;"/>
+      </StackLayout>
+      <StackLayout left="20" top="70" style="z-index: 1; background-color: yellow">
+        <TextField text="stacklayout2" style="height: 100; width: 100;"/>
+      </StackLayout>
+      <WrapLayout left="60" top="130" style="z-index: 0; background-color: blue">
+        <TextField text="wraplayout" style="height: 100; width: 100;"/>
+      </WrapLayout>
+      <AbsoluteLayout left="90" top="190" style="height: 100; width: 100; z-index: -1; background-color: orange;">
+        <Label text="absolutelayout" top="40"/>
       </AbsoluteLayout>
-  </StackLayout>
+    </AbsoluteLayout>
+  </GridLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index 448d6a8f1..19d380815 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -48,7 +48,7 @@ examples.set("transform", "css/text-transform");
 examples.set("whitespace", "css/white-space");
 examples.set("switch", "css/views");
 examples.set("zindex", "css/zindex");
-
+examples.set("clipPath", "css/clip-path");
 examples.set("dialogs", "dialogs/dialogs");
 
 examples.set("fontbtn", "font/button");
@@ -83,7 +83,7 @@ examples.set("modalview", "modal-view/modal-view");
 examples.set("nordic", "nordic/nordic");
 
 examples.set("padding", "padding/padding");
-
+examples.set("timePicker", "time-picker/time-picker");
 examples.set("gestures", "pages/gestures");
 examples.set("touch", "pages/touch-event");
 examples.set("handlers", "pages/handlers");
diff --git a/apps/ui-tests-app/padding/padding.xml b/apps/ui-tests-app/padding/padding.xml
index 4610be989..d9f3a8c63 100644
--- a/apps/ui-tests-app/padding/padding.xml
+++ b/apps/ui-tests-app/padding/padding.xml
@@ -1,5 +1,5 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" >
-  <StackLayout>
+  <StackLayout automationText="padding">
     <Label id="label" text="Label" backgroundColor="red"/>
     <TextField id="textField" text="TextField" backgroundColor="green"/>
     <TextView id="textView" text="TextView" backgroundColor="blue"/>
diff --git a/apps/ui-tests-app/time-picker/time-picker.xml b/apps/ui-tests-app/time-picker/time-picker.xml
index a69da67ee..e17ad108e 100644
--- a/apps/ui-tests-app/time-picker/time-picker.xml
+++ b/apps/ui-tests-app/time-picker/time-picker.xml
@@ -1,3 +1,3 @@
 <Page>
-   <TimePicker hour="5" minute="30" minHour="3" maxHour="7" />
+   <TimePicker automationText="timePicker" hour="5" minute="30" minHour="3" maxHour="7" />
 </Page>
\ No newline at end of file